Security bump and remove all affected versions. Please see Bug #130979 for details.

(Portage version: 2.1_pre10-r2)
 (Unsigned Manifest commit)

5 files changed, 22 insertions, 510 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index dcd6a1251832..1928e05c0756 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -14,6 +14,10 @@ AUX 1.0.99.901-Xprint-xprintdir.patch 447 RMD160 7728ad1173bb6e8fcb73ddcfc3ef29f
 MD5 e4ab51b8df81d9a3be044112dff3736f files/1.0.99.901-Xprint-xprintdir.patch 447
 RMD160 7728ad1173bb6e8fcb73ddcfc3ef29f93cdde4f3 files/1.0.99.901-Xprint-xprintdir.patch 447
 SHA256 4dcd1bcebfccf0b51956ea6f30bae2f0f9b7b1f62e215d16b63ef19b7433d955 files/1.0.99.901-Xprint-xprintdir.patch 447
+AUX CVE-2006-1526-xrender-mitri.patch 819 RMD160 ab993ffd54ec143755f00a2cfc526253fdb7230b SHA1 fe760840ec4d6023f713f9b79b745c7822a37828 SHA256 1558fcaf5f1f6050c6a38023bc4effd8802320c2c6b3c146f19ceb8beb2d367b size 819
+MD5 c51e1f359e9008bd496173a013866343 files/CVE-2006-1526-xrender-mitri.patch 819
+RMD160 ab993ffd54ec143755f00a2cfc526253fdb7230b files/CVE-2006-1526-xrender-mitri.patch 819
+SHA256 1558fcaf5f1f6050c6a38023bc4effd8802320c2c6b3c146f19ceb8beb2d367b files/CVE-2006-1526-xrender-mitri.patch 819
 AUX xorg-server-1.0.2-64bit-fix-for-glx.patch 414 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 SHA1 3464a0f714810d36da11424103550e604f93b22f SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4 size 414
 MD5 900d8194df467de2c86276d446522062 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
@@ -51,25 +55,25 @@ DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f406034465
 DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd size 3062363
 DIST xorg-server-1.0.2.tar.bz2 6006486 RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba size 6006486
 DIST xorg-server-1.0.99.902.tar.bz2 6318145 RMD160 72437131b4dedc281b247c984bd29d1b74d2fe56 SHA256 28af7877dc6b3fcf90d61947f36c30ef0e2a504026872fd50d9e766f332c448c size 6318145
-EBUILD xorg-server-1.0.2-r3.ebuild 5676 RMD160 bd3d7175771e0301511bdb18f8ff2dc61b7e0d74 SHA1 c22b9c76db8a9fd0b372bff65425362c72de80c0 SHA256 01652c5b184d6dae6ed4121e53c126fc174d8ef42dd19e391308e438208fdc5c size 5676
-MD5 af32676eaa7ddc9861e6d36e14eb4620 xorg-server-1.0.2-r3.ebuild 5676
-RMD160 bd3d7175771e0301511bdb18f8ff2dc61b7e0d74 xorg-server-1.0.2-r3.ebuild 5676
-SHA256 01652c5b184d6dae6ed4121e53c126fc174d8ef42dd19e391308e438208fdc5c xorg-server-1.0.2-r3.ebuild 5676
-EBUILD xorg-server-1.0.99.902.ebuild 7747 RMD160 6984b4a86aa0d0fa3040010179c2c06467807d9a SHA1 56cbc1a95bbb1ac055c3c63ff7ee0fe95c9cf569 SHA256 1908acedcff92f2ba03c777c37875305a8d69770f0749a55f1875543b59740bd size 7747
-MD5 2a7289582ea46b6642994ce33702e03c xorg-server-1.0.99.902.ebuild 7747
-RMD160 6984b4a86aa0d0fa3040010179c2c06467807d9a xorg-server-1.0.99.902.ebuild 7747
-SHA256 1908acedcff92f2ba03c777c37875305a8d69770f0749a55f1875543b59740bd xorg-server-1.0.99.902.ebuild 7747
-MISC ChangeLog 23993 RMD160 23aedbc20092d9c2ec662bb92aae8d59ed534372 SHA1 53d3a65be2ec7dc6c40b9fa60c4c22352f015bb5 SHA256 2784894e08d6014fd266a6e207b82659f4a8bca37c92d2e7f44d1083ca0933ac size 23993
-MD5 73713a0d0d92cb8c278f303b170bd0e6 ChangeLog 23993
-RMD160 23aedbc20092d9c2ec662bb92aae8d59ed534372 ChangeLog 23993
-SHA256 2784894e08d6014fd266a6e207b82659f4a8bca37c92d2e7f44d1083ca0933ac ChangeLog 23993
+EBUILD xorg-server-1.0.2-r4.ebuild 5727 RMD160 5c8eeb3971db21ffb2c3ffc9399116c97f2d6b02 SHA1 d559a13b65a9a1814d12def50b8f486336a586d5 SHA256 45370473a24fafd3d645af8efabb6676283bc06632c920aac191c860b70c2155 size 5727
+MD5 7b9958ca37dc95e6108e13eb1fc7bce3 xorg-server-1.0.2-r4.ebuild 5727
+RMD160 5c8eeb3971db21ffb2c3ffc9399116c97f2d6b02 xorg-server-1.0.2-r4.ebuild 5727
+SHA256 45370473a24fafd3d645af8efabb6676283bc06632c920aac191c860b70c2155 xorg-server-1.0.2-r4.ebuild 5727
+EBUILD xorg-server-1.0.99.902-r1.ebuild 7801 RMD160 489455f7841906146434a70137918f5e218200fa SHA1 6520aef69d872dcb5747e232e926244681eb6962 SHA256 8a9182530c33245001d0c01ca445e30b00063822dbf5ca76b2ded5170d07b1d8 size 7801
+MD5 8f1036bd4d6f1dccb61ac91b7098a08d xorg-server-1.0.99.902-r1.ebuild 7801
+RMD160 489455f7841906146434a70137918f5e218200fa xorg-server-1.0.99.902-r1.ebuild 7801
+SHA256 8a9182530c33245001d0c01ca445e30b00063822dbf5ca76b2ded5170d07b1d8 xorg-server-1.0.99.902-r1.ebuild 7801
+MISC ChangeLog 24396 RMD160 f139ef2fb201e5d99452398733801c5e2193ebe6 SHA1 db7594cf075c30a135e75535c08cc3a392a3c91f SHA256 0ca27c9ce4e93ac98a1453f0370dc776db66f81167b1adc5cdb74ed3653668e4 size 24396
+MD5 e243e81de30af7306e7a5c9cc14c262b ChangeLog 24396
+RMD160 f139ef2fb201e5d99452398733801c5e2193ebe6 ChangeLog 24396
+SHA256 0ca27c9ce4e93ac98a1453f0370dc776db66f81167b1adc5cdb74ed3653668e4 ChangeLog 24396
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 size 156
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r3 771
-RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r3 771
-SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r3 771
-MD5 a4519faf6e8252b7b0eed8b16c713221 files/digest-xorg-server-1.0.99.902 515
-RMD160 5a156d372e494ed39ee9697fc2d47ac5dd16a6b2 files/digest-xorg-server-1.0.99.902 515
-SHA256 3f1ef5168a5c5ff484304cc15afb83cdaab0de9451b34f9fca5d6aa2aa43ce1b files/digest-xorg-server-1.0.99.902 515
+MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r4 771
+RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r4 771
+SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r4 771
+MD5 a4519faf6e8252b7b0eed8b16c713221 files/digest-xorg-server-1.0.99.902-r1 515
+RMD160 5a156d372e494ed39ee9697fc2d47ac5dd16a6b2 files/digest-xorg-server-1.0.99.902-r1 515
+SHA256 3f1ef5168a5c5ff484304cc15afb83cdaab0de9451b34f9fca5d6aa2aa43ce1b files/digest-xorg-server-1.0.99.902-r1 515
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r3 b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r3
deleted file mode 100644
index b2e8218ffcfa..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 2f35e003812df5817ebec8fc3c6943e8 1.0.2-overlay-window.patch.bz2 6388
-RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 1.0.2-overlay-window.patch.bz2 6388
-SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67 1.0.2-overlay-window.patch.bz2 6388
-MD5 7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2 2913009
-RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 MesaLib-6.4.2.tar.bz2 2913009
-SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 MesaLib-6.4.2.tar.bz2 2913009
-MD5 5cd3316f07ed32a05cbd69e73a71bc74 xorg-server-1.0.2.tar.bz2 6006486
-RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 xorg-server-1.0.2.tar.bz2 6006486
-SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba xorg-server-1.0.2.tar.bz2 6006486
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.99.902 b/x11-base/xorg-server/files/digest-xorg-server-1.0.99.902
deleted file mode 100644
index d1df5f286323..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.0.99.902
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363
-RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363
-SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363
-MD5 643633bbc7038643b29a373aa3a2413e xorg-server-1.0.99.902.tar.bz2 6318145
-RMD160 72437131b4dedc281b247c984bd29d1b74d2fe56 xorg-server-1.0.99.902.tar.bz2 6318145
-SHA256 28af7877dc6b3fcf90d61947f36c30ef0e2a504026872fd50d9e766f332c448c xorg-server-1.0.99.902.tar.bz2 6318145
diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild
deleted file mode 100644
index 47d8c5c09cc0..000000000000
--- a/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild,v 1.5 2006/04/23 22:32:14 spyderous Exp $
-
-# Must be before x-modular eclass is inherited
-# Hack to make sure autoreconf gets run
-SNAPSHOT="yes"
-
-inherit flag-o-matic x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.4.2"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-PATCHES="${FILESDIR}/${P}-Sbus.patch
-	${FILESDIR}/${P}-sparc64-cfbrrop-fix.patch
-	${FILESDIR}/${P}-64bit-fix-indirect-vertex-array.patch
-	${FILESDIR}/${P}-64bit-fix-have-dix-config.patch
-	${FILESDIR}/${P}-64bit-fix-for-glx.patch
-	${FILESDIR}/${P}-Xprt-build.patch
-	${FILESDIR}/${P}-xprint-init.patch
-	${FILESDIR}/${PV}-Xprint-xprintdir.patch
-	${FILESDIR}/${PV}-try-to-fix-xorgcfg.patch
-	${FILESDIR}/${PV}-fix-xorgconfig-rgbpath-and-mouse.patch
-	${DISTDIR}/${PV}-overlay-window.patch.bz2"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://dev.gentoo.org/~spyderous/xorg-x11/1.0.2/1.0.2-overlay-window.patch.bz2"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dri ipv6 minimal xprint"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	media-libs/mesa
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-misc/xbitmaps
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-apps/xauth
-	x11-apps/xinit
-	app-admin/eselect-opengl
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	!minimal? ( x11-libs/libdmx
-		x11-libs/libXtst
-		x11-libs/libXres )
-	x11-libs/libxkbui
-	x11-libs/liblbxutil"
-	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
-	# Xaw is dmx- and xorgcfg-dependent
-	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-	# Xxf86misc and Xxf86vm are xorgcfg-dependent
-	# liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	>=x11-proto/fixesproto-4
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	>=x11-proto/compositeproto-0.3
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/videoproto
-	x11-proto/scrnsaverproto
-	x11-proto/evieext
-	x11-proto/trapproto
-	>=x11-proto/xineramaproto-1.1-r1
-	x11-proto/fontsproto
-	>=x11-proto/kbproto-1.0-r1
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	>=x11-proto/glproto-1.4.1_pre20051013
-	!minimal? ( x11-proto/dmxproto )
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2 )
-	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
-		x11-apps/mkfontscale )"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-
-	# --enable-xorg needed because darwin defaults off
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable !minimal dmx)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable dri)
-		$(use_enable xprint)
-		--with-mesa-source=${WORKDIR}/${MESA_P}
-		--enable-xorg
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1"
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	use xprint && xprint_src_install
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-xprint_src_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/Xprint/etc/init.d/xprint
-	# Patch init script for fonts location
-	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-		-i ${D}/usr/$(get_libdir)/misc/xprint
-	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
-	# Install profile scripts
-	insinto /etc/profile.d
-	doins ${S}/Xprint/etc/profile.d/xprint*
-	insinto /etc/X11/xinit/xinitrc.d
-	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-		92xprint-xpserverlist.sh
-	# Patch profile scripts
-	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}
diff --git a/x11-base/xorg-server/xorg-server-1.0.99.902.ebuild b/x11-base/xorg-server/xorg-server-1.0.99.902.ebuild
deleted file mode 100644
index 7e104466ccd8..000000000000
--- a/x11-base/xorg-server/xorg-server-1.0.99.902.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.99.902.ebuild,v 1.2 2006/04/30 19:01:09 spyderous Exp $
-
-# Must be before x-modular eclass is inherited
-# Hack to make sure autoreconf gets run
-SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.5"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-PATCHES="${FILESDIR}/${PN}-1.0.2-xprint-init.patch
-	${FILESDIR}/1.0.99.901-Xprint-xprintdir.patch"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://xorg.freedesktop.org/snapshots/individual/xserver/${P}.tar.bz2"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_VIDEO_CARDS="
-	video_cards_chips
-	video_cards_epson
-	video_cards_glint
-	video_cards_i810
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_siliconmotion
-	video_cards_via"
-IUSE="${IUSE_VIDEO_CARDS}
-	dmx dri ipv6 kdrive minimal nptl sdl xorg xprint"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	>=media-libs/mesa-6.5-r2
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-misc/xbitmaps
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-apps/xauth
-	x11-apps/xinit
-	app-admin/eselect-opengl
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	!minimal? ( x11-libs/libdmx
-		x11-libs/libXtst
-		x11-libs/libXres )
-	x11-libs/libxkbui
-	x11-libs/liblbxutil
-	kdrive? ( sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
-	# Xaw is dmx- and xorgcfg-dependent
-	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-	# Xxf86misc and Xxf86vm are xorgcfg-dependent
-	# liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	>=x11-proto/fixesproto-4
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	>=x11-proto/compositeproto-0.3
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/videoproto
-	>=x11-proto/scrnsaverproto-1.1.0
-	x11-proto/evieext
-	x11-proto/trapproto
-	>=x11-proto/xineramaproto-1.1-r1
-	x11-proto/fontsproto
-	>=x11-proto/kbproto-1.0-r1
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	>=x11-proto/glproto-1.4.6
-	!minimal? ( x11-proto/dmxproto )
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2 )
-	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
-		x11-apps/mkfontscale )"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-
-	# --enable-xorg needed because darwin defaults off
-	# --enable-install-setuid needed because sparcs default off
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
-		conf_opts="${conf_opts} --disable-xsdl"
-	fi
-
-	# Only Xorg and Xgl support this, and we won't build Xgl
-	# until it merges to trunk
-	if use xorg; then
-		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-	fi
-
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable dri)
-		$(use_enable xorg)
-		$(use_enable xprint)
-		$(use_enable nptl glx-tls)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1
-		${conf_opts}"
-
-	local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
-	if built_with_use media-libs/mesa nptl; then
-		use nptl || die "${diemsg}"
-	else
-		use nptl && die "${diemsg}"
-	fi
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Nothing else provides new enough glxtokens.h
-	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_unpack() {
-	x-modular_specs_check
-	x-modular_dri_check
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	# Set up kdrive servers to build
-	if use kdrive; then
-		einfo "Removing unused kdrive drivers ..."
-		for card in ${IUSE_VIDEO_CARDS}; do
-			real_card=${card#video_cards_}
-
-			# Differences between VIDEO_CARDS name and kdrive server name
-			real_card=${real_card/glint/pm2}
-			real_card=${real_card/radeon/ati}
-			real_card=${real_card/nv/nvidia}
-			real_card=${real_card/siliconmotion/smi}
-			if ! use ${card}; then
-				ebegin "  ${real_card}"
-				sed -i \
-					-e "s:${real_card}::g" \
-					${S}/hw/kdrive/Makefile.am \
-					|| die "sed of ${real_card} failed"
-				eend
-			fi
-
-		done
-
-		# smi and via are the only things on line 2. If line 2 ends up blank,
-		# we need to get rid of the backslash at the end of line 1.
-		if ! use video_cards_siliconmotion && ! use video_cards_via; then
-			sed -i \
-				-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-				${S}/hw/kdrive/Makefile.am
-		fi
-
-		# Only need to reconf if we're modifying kdrive's Makefile.am
-		x-modular_reconf_source
-	fi
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	use xprint && xprint_src_install
-
-	if ! use xorg; then
-		rm ${D}/usr/share/man/man1/Xserver.1x \
-			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			${D}/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-#		eselect opengl set --use-old ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/Xprint/etc/init.d/xprint
-	# Patch init script for fonts location
-	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-		-i ${D}/usr/$(get_libdir)/misc/xprint
-	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
-	# Install profile scripts
-	insinto /etc/profile.d
-	doins ${S}/Xprint/etc/profile.d/xprint*
-	insinto /etc/X11/xinit/xinitrc.d
-	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-		92xprint-xpserverlist.sh
-	# Patch profile scripts
-	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}