Security bump. Failure to check the return value of setuid() in a privileged process could be used by a local user for file overwriting and possible privilege escalation in corner cases. See http://lists.freedesktop.org/archives/xorg/2006-June/016146.html for more information.

(Portage version: 2.1.1_pre1-r1)
 (Unsigned Manifest commit)

7 files changed, 26 insertions, 1124 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index e174a07cdb9f..198c26525706 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -22,6 +22,10 @@ AUX CVE-2006-1526-xrender-mitri.patch 819 RMD160 ab993ffd54ec143755f00a2cfc52625
 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 x11r7.0-setuid.diff 3512 RMD160 00dcecbdcd8323086cb5441111b86e425342bd01 SHA1 15a880590b59332f9de7fa1e66af703c0fecf409 SHA256 aac1cdff3fea210b683326f9360f1e8c91a821a032cc84fc388d41e01f206538
+MD5 888430c6afc2919a12bf2fc05cb3a4cc files/x11r7.0-setuid.diff 3512
+RMD160 00dcecbdcd8323086cb5441111b86e425342bd01 files/x11r7.0-setuid.diff 3512
+SHA256 aac1cdff3fea210b683326f9360f1e8c91a821a032cc84fc388d41e01f206538 files/x11r7.0-setuid.diff 3512
 AUX xorg-server-1.0.2-64bit-fix-for-glx.patch 414 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 SHA1 3464a0f714810d36da11424103550e604f93b22f SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4
 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
@@ -50,6 +54,10 @@ AUX xorg-server-1.0.2-xprint-init.patch 417 RMD160 e29f58581c421724adf09f1df3e99
 MD5 5106c724275e86950e5f4c88913198a1 files/xorg-server-1.0.2-xprint-init.patch 417
 RMD160 e29f58581c421724adf09f1df3e991092f89a017 files/xorg-server-1.0.2-xprint-init.patch 417
 SHA256 89c8e2253b374b2152908dd4514a19ff302b753d6a7c8be272999ad192edc905 files/xorg-server-1.0.2-xprint-init.patch 417
+AUX xorg-server-1.1.0-setuid.diff 3372 RMD160 e9db8b3e9317c75b22b565b57ba00dc2d50fc664 SHA1 e72b50c6434d429abaf0c13d9e78e1d467579fe9 SHA256 f27195e2d8a23d47132d51ae46a4d2fa497b06dec4f15bf0a7164130541aff7e
+MD5 bd7f9871a9142197b8f45ad09969c6c5 files/xorg-server-1.1.0-setuid.diff 3372
+RMD160 e9db8b3e9317c75b22b565b57ba00dc2d50fc664 files/xorg-server-1.1.0-setuid.diff 3372
+SHA256 f27195e2d8a23d47132d51ae46a4d2fa497b06dec4f15bf0a7164130541aff7e files/xorg-server-1.1.0-setuid.diff 3372
 AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13
 MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598
 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598
@@ -59,32 +67,25 @@ DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f406034465
 DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
 DIST xorg-server-1.0.2.tar.bz2 6006486 RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 SHA1 b2257e984c5111093ca80f1f63a7a9befa20b6c0 SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba
 DIST xorg-server-1.1.0.tar.bz2 6322751 RMD160 282007ba280b84701df05ef7b8d03e3f1275f8f0 SHA1 564fbe8ac534c2a0b995f88e919f0eac8dcd5224 SHA256 da1d5ce91098e1187579306275a9664ef6f1cea935fabcbd72f4c77af415a461
-EBUILD xorg-server-1.0.2-r4.ebuild 6052 RMD160 ad2bedfb69a93c5c652b3916c4c0b38fdbdb8bfa SHA1 6c17c4717364f28407e8163d232e1fe61c6d5b7b SHA256 c54b611a79139f18a3263adc9a525ad3c063c4e769a32f8043b2932020c2c9be
-MD5 27e2b115cca585af5c363bcbfed14e61 xorg-server-1.0.2-r4.ebuild 6052
-RMD160 ad2bedfb69a93c5c652b3916c4c0b38fdbdb8bfa xorg-server-1.0.2-r4.ebuild 6052
-SHA256 c54b611a79139f18a3263adc9a525ad3c063c4e769a32f8043b2932020c2c9be xorg-server-1.0.2-r4.ebuild 6052
-EBUILD xorg-server-1.0.2-r5.ebuild 6111 RMD160 7fca485e56158fe1963c9d9fcbd1be6cdfdaa31d SHA1 e61278b55f934fa27aab51ada94a3fd3eb5a585a SHA256 25aa08c324c14972d183eac81791849222be6d8536445c7eec4efaf53307a9ad
-MD5 af4853722d3b94562e537df206d70c75 xorg-server-1.0.2-r5.ebuild 6111
-RMD160 7fca485e56158fe1963c9d9fcbd1be6cdfdaa31d xorg-server-1.0.2-r5.ebuild 6111
-SHA256 25aa08c324c14972d183eac81791849222be6d8536445c7eec4efaf53307a9ad xorg-server-1.0.2-r5.ebuild 6111
-EBUILD xorg-server-1.1.0.ebuild 22871 RMD160 39dc98ee0a4fe07adb1756e855494818ff06110f SHA1 fc041ce39ed0b04e574daa07db87827649afeae4 SHA256 db72d48673bce5bc04a8e80e824c118e10e9c8dd7b68d3b1aff0cbfa47cab7c7
-MD5 253948832ffb52bdf5a87bfa72bb126f xorg-server-1.1.0.ebuild 22871
-RMD160 39dc98ee0a4fe07adb1756e855494818ff06110f xorg-server-1.1.0.ebuild 22871
-SHA256 db72d48673bce5bc04a8e80e824c118e10e9c8dd7b68d3b1aff0cbfa47cab7c7 xorg-server-1.1.0.ebuild 22871
-MISC ChangeLog 27082 RMD160 1593cff087e1c43f5f09047e70b149041a43a245 SHA1 69edc71950b62e2b4dacf907993b4f1a6fdaa623 SHA256 9ac920f2e1196b94e118ec5eb7c227c220a5adb0f298787e74f176a0f411396a
-MD5 4691cbb78315db1ed8ffbe98752b6b2a ChangeLog 27082
-RMD160 1593cff087e1c43f5f09047e70b149041a43a245 ChangeLog 27082
-SHA256 9ac920f2e1196b94e118ec5eb7c227c220a5adb0f298787e74f176a0f411396a ChangeLog 27082
+EBUILD xorg-server-1.0.2-r6.ebuild 6140 RMD160 48eb86bf38ce9029e33d20c504d0be6eb114ef0e SHA1 8a293b532b39f99be09c94a180e0162595e414c3 SHA256 3b10c1c7d6b1cac5b679baf1881107079d945c81c26e75a997ff3ae333ef019c
+MD5 65ebbfe3b11ecbc256d305d02aa215e7 xorg-server-1.0.2-r6.ebuild 6140
+RMD160 48eb86bf38ce9029e33d20c504d0be6eb114ef0e xorg-server-1.0.2-r6.ebuild 6140
+SHA256 3b10c1c7d6b1cac5b679baf1881107079d945c81c26e75a997ff3ae333ef019c xorg-server-1.0.2-r6.ebuild 6140
+EBUILD xorg-server-1.1.0-r1.ebuild 22900 RMD160 6f80ab60ee1166d22247a4d22ebc131d65f817a4 SHA1 1181a682dd2deb2c3c7aa034a64371df43b22b95 SHA256 830c883309262f6725a8282594829d766e5b3d3b3cbf963f891f3161bb54073c
+MD5 706904661a0ce12e163cb32a2e8edde9 xorg-server-1.1.0-r1.ebuild 22900
+RMD160 6f80ab60ee1166d22247a4d22ebc131d65f817a4 xorg-server-1.1.0-r1.ebuild 22900
+SHA256 830c883309262f6725a8282594829d766e5b3d3b3cbf963f891f3161bb54073c xorg-server-1.1.0-r1.ebuild 22900
+MISC ChangeLog 27716 RMD160 b3ebdb150128d32f3fcdc424785a4c7924c307ab SHA1 8d7f4df2ed9757af2f7bdb6707073757fc59b016 SHA256 4520304c8285b65401f4d6c354aa45ac0eb8d2f05be65983af60be9e3997090e
+MD5 08fc52daecd0f5d9833ed5100a66b8bc ChangeLog 27716
+RMD160 b3ebdb150128d32f3fcdc424785a4c7924c307ab ChangeLog 27716
+SHA256 4520304c8285b65401f4d6c354aa45ac0eb8d2f05be65983af60be9e3997090e ChangeLog 27716
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-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 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r5 771
-RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r5 771
-SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r5 771
-MD5 0b4a5b66471e1dcc4176e5e3eac4e47f files/digest-xorg-server-1.1.0 500
-RMD160 5b942d1403fee2bf47c380017eed89ad1bf6121c files/digest-xorg-server-1.1.0 500
-SHA256 356da215b18f2bbfa4e1509d15d26e56ba0372f28390d3c1903375f6c2f7abae files/digest-xorg-server-1.1.0 500
+MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r6 771
+RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r6 771
+SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r6 771
+MD5 0b4a5b66471e1dcc4176e5e3eac4e47f files/digest-xorg-server-1.1.0-r1 500
+RMD160 5b942d1403fee2bf47c380017eed89ad1bf6121c files/digest-xorg-server-1.1.0-r1 500
+SHA256 356da215b18f2bbfa4e1509d15d26e56ba0372f28390d3c1903375f6c2f7abae files/digest-xorg-server-1.1.0-r1 500
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r4 b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r4
deleted file mode 100644
index b2e8218ffcfa..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r4
+++ /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.2-r5 b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r5
deleted file mode 100644
index b2e8218ffcfa..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r5
+++ /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.1.0 b/x11-base/xorg-server/files/digest-xorg-server-1.1.0
deleted file mode 100644
index 33bc25514c8c..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.1.0
+++ /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 d070c58a598fb52c5cb86344725c4ad6 xorg-server-1.1.0.tar.bz2 6322751
-RMD160 282007ba280b84701df05ef7b8d03e3f1275f8f0 xorg-server-1.1.0.tar.bz2 6322751
-SHA256 da1d5ce91098e1187579306275a9664ef6f1cea935fabcbd72f4c77af415a461 xorg-server-1.1.0.tar.bz2 6322751
diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild
deleted file mode 100644
index c350c0e712e4..000000000000
--- a/x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild
+++ /dev/null
@@ -1,204 +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-r4.ebuild,v 1.4 2006/05/14 22:52:32 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}/CVE-2006-1526-xrender-mitri.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"
-# It's suid and has lazy bindings, so FEATURES="stricter" doesn't work
-RESTRICT="stricter"
-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-1.0.2
-	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
-
-	# 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_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}
-		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*
-}
diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r5.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r5.ebuild
deleted file mode 100644
index db8c9c7e9fb9..000000000000
--- a/x11-base/xorg-server/xorg-server-1.0.2-r5.ebuild
+++ /dev/null
@@ -1,205 +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-r5.ebuild,v 1.1 2006/06/11 18:48:39 joshuabaergen 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}/CVE-2006-1526-xrender-mitri.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
-	${FILESDIR}/${PV}-fix-readKernelMapping-overrun.patch"
-
-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"
-# It's suid and has lazy bindings, so FEATURES="stricter" doesn't work
-RESTRICT="stricter"
-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-1.0.2
-	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
-
-	# 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_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}
-		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*
-}
diff --git a/x11-base/xorg-server/xorg-server-1.1.0.ebuild b/x11-base/xorg-server/xorg-server-1.1.0.ebuild
deleted file mode 100644
index c33507b58b0d..000000000000
--- a/x11-base/xorg-server/xorg-server-1.1.0.ebuild
+++ /dev/null
@@ -1,666 +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.1.0.ebuild,v 1.4 2006/06/17 15:21:59 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#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"
-# It's suid and has lazy bindings, so FEATURES="stricter" doesn't work
-RESTRICT="stricter"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_calcomp
-	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_jamstudio
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_magellan
-	input_devices_magictouch
-	input_devices_microtouch
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_palmax
-	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
-	input_devices_ur98
-	input_devices_vmmouse
-	input_devices_void
-
-	input_devices_synaptics
-	input_devices_wacom"
-IUSE_VIDEO_CARDS="
-	video_cards_apm
-	video_cards_ark
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_cyrix
-	video_cards_dummy
-	video_cards_epson
-	video_cards_fbdev
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_i810
-	video_cards_imstt
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_newport
-	video_cards_nsc
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_v4l
-	video_cards_vesa
-	video_cards_vga
-	video_cards_via
-	video_cards_vmware
-	video_cards_voodoo"
-
-#	video_cards_nvidia
-#	video_cards_fglrx"
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_VIDEO_CARDS}
-	${IUSE_INPUT_DEVICES}
-	${IUSE_SERVERS}
-	3dfx
-	dri ipv6 minimal nptl sdl 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-1.0.2
-	x11-libs/liblbxutil
-	kdrive? ( sdl? ( media-libs/libsdl ) )
-	!media-video/nvidia-glx
-	!x11-drivers/ati-drivers"
-	# 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 )"
-
-# Drivers
-###############################################################################
-###############################################################################
-##                                                                           ##
-##   REMEMBER TO EDIT USE.MASK FILES IF CHANGING ARCHITECTURE DEPENDENCIES   ##
-##                                                                           ##
-###############################################################################
-###############################################################################
-PDEPEND="
-	|| (
-			(
-				input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
-				input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-				input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
-				input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
-				input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-				input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-				input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
-				input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
-				input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
-				input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
-				input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
-				input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-				input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
-				input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
-				input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 )
-				input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
-				input_devices_magictouch? ( x11-drivers/xf86-input-magictouch )
-				input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
-				input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
-				input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-				input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
-				input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
-				input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
-				input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-				input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-				input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
-				input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-				input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
-				input_devices_synaptics? ( x11-drivers/synaptics )
-				input_devices_wacom? ( x11-misc/linuxwacom )
-			)
-			(
-				>=x11-drivers/xf86-input-acecad-1.1.0
-				>=x11-drivers/xf86-input-calcomp-1.1.0
-				>=x11-drivers/xf86-input-citron-2.2.0
-				>=x11-drivers/xf86-input-digitaledge-1.1.0
-				>=x11-drivers/xf86-input-dmc-1.1.0
-				>=x11-drivers/xf86-input-dynapro-1.1.0
-				>=x11-drivers/xf86-input-elo2300-1.1.0
-				>=x11-drivers/xf86-input-elographics-1.1.0
-				>=x11-drivers/xf86-input-fpit-1.1.0
-				>=x11-drivers/xf86-input-hyperpen-1.1.0
-				>=x11-drivers/xf86-input-jamstudio-1.1.0
-				>=x11-drivers/xf86-input-joystick-1.1.0
-				>=x11-drivers/xf86-input-keyboard-1.1.0
-				>=x11-drivers/xf86-input-magellan-1.1.0
-				x11-drivers/xf86-input-magictouch
-				>=x11-drivers/xf86-input-microtouch-1.1.0
-				>=x11-drivers/xf86-input-mouse-1.1.0
-				>=x11-drivers/xf86-input-mutouch-1.1.0
-				>=x11-drivers/xf86-input-palmax-1.1.0
-				>=x11-drivers/xf86-input-penmount-1.1.0
-				>=x11-drivers/xf86-input-spaceorb-1.1.0
-				>=x11-drivers/xf86-input-summa-1.1.0
-				>=x11-drivers/xf86-input-tek4957-1.1.0
-				>=x11-drivers/xf86-input-void-1.1.0
-
-				kernel_linux? (
-					>=x11-drivers/xf86-input-aiptek-1.0.1
-					>=x11-drivers/xf86-input-evdev-1.1.1
-					>=x11-drivers/xf86-input-ur98-1.1.0
-				)
-
-				x86? ( >=x11-drivers/xf86-input-vmmouse-12.4.0
-					x11-drivers/synaptics
-					x11-misc/linuxwacom
-				)
-				x86-fbsd? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-				amd64? ( >=x11-drivers/xf86-input-vmmouse-12.4.0
-					x11-drivers/synaptics
-					x11-misc/linuxwacom
-				)
-				ppc? ( x11-drivers/synaptics
-					x11-misc/linuxwacom
-				)
-				ppc64? ( x11-drivers/synaptics
-					x11-misc/linuxwacom
-				)
-			)
-		)
-	input_devices_synaptics? ( >=x11-drivers/synaptics-0.14.4-r2 )
-	|| (
-			(
-				video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
-				video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
-				video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
-				video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
-				video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
-				video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
-				video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
-				video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
-				video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
-				video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
-				video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
-				video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-				video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-				video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
-				video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
-				video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-				video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
-				video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-				video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-				video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-				video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
-				video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
-				video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
-				video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
-				video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
-				video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
-				video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
-				video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
-				video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
-				video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
-				video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
-				video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
-				video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
-				video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
-				video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
-				video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
-				video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
-				video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
-				video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-				video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
-				video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
-				video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
-				video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
-				video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
-
-				video_cards_3dfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-			)
-			(
-				>=x11-drivers/xf86-video-dummy-0.2.0
-				>=x11-drivers/xf86-video-fbdev-0.2.0
-
-				!hppa? (
-					>=x11-drivers/xf86-video-ati-6.6.0
-					>=x11-drivers/xf86-video-mga-1.4.1
-
-					>=x11-drivers/xf86-video-sisusb-0.8.1
-					kernel_linux? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-				)
-
-				3dfx? ( >=media-libs/glide-v3-3.10 )
-
-				alpha? ( >=x11-drivers/xf86-video-cirrus-1.1.0
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-rendition-4.1.0
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-siliconmotion-1.4.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-tga-1.1.0
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				amd64? ( >=x11-drivers/xf86-video-apm-1.1.1
-					>=x11-drivers/xf86-video-ark-0.6.0
-					>=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-cirrus-1.1.0
-					>=x11-drivers/xf86-video-cyrix-1.1.0
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-i128-1.2.0
-					>=x11-drivers/xf86-video-i810-1.6.0
-					>=x11-drivers/xf86-video-neomagic-1.1.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-rendition-4.1.0
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-siliconmotion-1.4.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-tga-1.1.0
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-tseng-1.1.0
-					>=x11-drivers/xf86-video-vesa-1.1.0
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-via-0.2.1
-					>=x11-drivers/xf86-video-vmware-10.13.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				arm? ( >=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				ia64? ( >=x11-drivers/xf86-video-apm-1.1.1
-					>=x11-drivers/xf86-video-ark-0.6.0
-					>=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-cirrus-1.1.0
-					>=x11-drivers/xf86-video-cyrix-1.1.0
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-i128-1.2.0
-					>=x11-drivers/xf86-video-i740-1.1.0
-					>=x11-drivers/xf86-video-i810-1.6.0
-					>=x11-drivers/xf86-video-imstt-1.1.0
-					>=x11-drivers/xf86-video-neomagic-1.1.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-rendition-4.1.0
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-siliconmotion-1.4.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-tga-1.1.0
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-tseng-1.1.0
-					>=x11-drivers/xf86-video-vesa-1.1.0
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-via-0.2.1
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				mips? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-				ppc? ( >=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-imstt-1.1.0
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				ppc64? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-				sparc? (
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-sunbw2-1.1.0
-					>=x11-drivers/xf86-video-suncg14-1.1.0
-					>=x11-drivers/xf86-video-suncg3-1.1.0
-					>=x11-drivers/xf86-video-suncg6-1.1.0
-					>=x11-drivers/xf86-video-sunffb-1.1.0
-					>=x11-drivers/xf86-video-sunleo-1.1.0
-					>=x11-drivers/xf86-video-suntcx-1.1.0
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-vesa-1.1.0
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				x86? ( >=x11-drivers/xf86-video-apm-1.1.1
-					>=x11-drivers/xf86-video-ark-0.6.0
-					>=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-cirrus-1.1.0
-					>=x11-drivers/xf86-video-cyrix-1.1.0
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-i128-1.2.0
-					>=x11-drivers/xf86-video-i740-1.1.0
-					>=x11-drivers/xf86-video-i810-1.6.0
-					>=x11-drivers/xf86-video-imstt-1.1.0
-					>=x11-drivers/xf86-video-neomagic-1.1.1
-					>=x11-drivers/xf86-video-nsc-2.8.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-rendition-4.1.0
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-siliconmotion-1.4.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-tga-1.1.0
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-tseng-1.1.0
-					>=x11-drivers/xf86-video-vesa-1.1.0
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-via-0.2.1
-					>=x11-drivers/xf86-video-vmware-10.13.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				x86-fbsd? (
-					>=x11-drivers/xf86-video-vmware-10.13.0 )
-			)
-		)"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-	ensure_a_server_is_building
-
-	# 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}
-			real_card=${real_card/%sis/sis300}
-			if ! use ${card}; then
-				ebegin "  ${real_card}"
-				sed -i \
-					-e "s:\b${real_card}\b::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
-	fi
-
-	# Make sure eautoreconf gets run if we need the autoconf/make
-	# changes.
-	if [[ ${SNAPSHOT} != "yes" ]]; then
-		if use kdrive || use xprint; then
-			eautoreconf
-		fi
-	fi
-	x-modular_reconf_source
-}
-
-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*
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}