Version bump for 7.2RC3. Includes several more bugfixes.

A patch has been added from upstream Bugzilla that fixes Compiz/AIGLX
operation on the server.  It's unknown if the patch has any negative
side-effects yet, so it's hidden behind USE="aiglx" again.
(Portage version: 2.1.2_rc2-r3)
 (Unsigned Manifest commit)

3 files changed, 16 insertions, 558 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 200289e56684..9826790770bd 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 01-no-move-damage.patch 1149 RMD160 f40d73e020376e1b9603dfa5ceb2fd0b48b45e31 SHA1 b8adef394d05a8769627d71b8da302f7fc3622d5 SHA256 9396f282e3d62927e86c4aa38b0d6245b83ca8e2ea48624f22c3c6d35751d997
 MD5 0faff1bfae0c6378fae5d2875fb3972c files/01-no-move-damage.patch 1149
 RMD160 f40d73e020376e1b9603dfa5ceb2fd0b48b45e31 files/01-no-move-damage.patch 1149
@@ -113,6 +110,10 @@ AUX xorg-server-1.1.1-install-libxf86config-headers.patch 422 RMD160 297df8f5478
 MD5 f17556037156af0294c22e094172d1f6 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
 RMD160 297df8f5478195a8e0c0589436c9dad457c91539 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
 SHA256 85de5a76afb5a6c6ab0ac0d0f7d7decad99035cbbc04362e69a1627f04d86269 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
+AUX xorg-server-1.1.99.901-GetDrawableAttributes.patch 1747 RMD160 fb930b602e9f6f774f2885e11e9caf379594a537 SHA1 60ccfea12bddf6cf0a7f56000472781442b10701 SHA256 353c8abd75ad891696676298735e424e3726b73ac81f5a92276c67a034de2bff
+MD5 ce57ec7f21491975d11f38b346156640 files/xorg-server-1.1.99.901-GetDrawableAttributes.patch 1747
+RMD160 fb930b602e9f6f774f2885e11e9caf379594a537 files/xorg-server-1.1.99.901-GetDrawableAttributes.patch 1747
+SHA256 353c8abd75ad891696676298735e424e3726b73ac81f5a92276c67a034de2bff files/xorg-server-1.1.99.901-GetDrawableAttributes.patch 1747
 AUX xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684 RMD160 8a6142a781d0ee626b4569f2324c6884234c7856 SHA1 287d09b104826c0ac852d401457c230fa96f7296 SHA256 8428c09c0bd11e7db9fbf0807754312cfb7c2659b2c203f8ad9741fc35c356c0
 MD5 f6f3f09436867be5b09782fed580b6f3 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
 RMD160 8a6142a781d0ee626b4569f2324c6884234c7856 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
@@ -129,7 +130,7 @@ DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd
 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
 DIST xorg-server-1.1.1.tar.bz2 6252103 RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 SHA1 eb29dd4fea9f184321cbb5512f68b674ada4daf7 SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c
-DIST xorg-server-1.1.99.902.tar.bz2 6074549 RMD160 8a2e2355e62c686b0cd5f3f5c479323294f92c9a SHA1 1abb8c75ee4d73e69f152b6b60b284691f516732 SHA256 54f53c865fe6dcbebdc8510dbce487df88971476259b1ff199b103efb4d87b41
+DIST xorg-server-1.1.99.903.tar.bz2 5980396 RMD160 f6039cab1f233d2785b147e0963ccb90dcd735cd SHA1 e63ebbd368ca0f962de2f1e6a7720473e12f2d9b SHA256 da42f8b8118bbe6afe8b920c986835bff05923f38bd7adc96534fa7788c25cde
 DIST xorg-server-1.2.99.0.tar.bz2 6170605 RMD160 7c478d911c2c38de7e6fa823168a61d649e0251e SHA1 06bee10153da39f0f3cc89ca92bca766e996ebdf SHA256 f45f35d33cc9bb06c7261ecf3d9cc4fee9464224543be3e4de255d65e0d347b0
 EBUILD xorg-server-1.0.2-r7.ebuild 6207 RMD160 41dda5f10ca8f78c493ae45f6ac2e9b2c3ebabbc SHA1 66a4270e67628e85aad083598ac5ca1f89f1115b SHA256 6aaa82962aea02ed734f0472ef3e34cbed88d5b0c0673bf8bb0e2d5bf2e73c35
 MD5 2d90cbe6238854aa56a67b693a893367 xorg-server-1.0.2-r7.ebuild 6207
@@ -151,18 +152,18 @@ EBUILD xorg-server-1.1.1.ebuild 15382 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a
 MD5 9a5fa768a77f72877ec3303f890f614e xorg-server-1.1.1.ebuild 15382
 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac xorg-server-1.1.1.ebuild 15382
 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb xorg-server-1.1.1.ebuild 15382
-EBUILD xorg-server-1.1.99.902.ebuild 16465 RMD160 f25f8ce3cce3f930409a30a607413a100e173d11 SHA1 f86dbef8f5e7ceef9ca94d13fcf67208c88c7eb9 SHA256 be992b5d5d8771d2f9528fa26425a46a19df9d7d4a6c6dc774b8399826accb56
-MD5 9e905a1435ca50e51c71d1726202b017 xorg-server-1.1.99.902.ebuild 16465
-RMD160 f25f8ce3cce3f930409a30a607413a100e173d11 xorg-server-1.1.99.902.ebuild 16465
-SHA256 be992b5d5d8771d2f9528fa26425a46a19df9d7d4a6c6dc774b8399826accb56 xorg-server-1.1.99.902.ebuild 16465
+EBUILD xorg-server-1.1.99.903.ebuild 16761 RMD160 ab0a36aec4a85234414bbf28cd1eb1dbbd9e6929 SHA1 438cab492d18b8a2595a54d2da910d94be4041af SHA256 852ad7a85050bf7988868258e96fc105bbaf89e047e020f1926d1ac827cfefc2
+MD5 0b13a78b1d2fb00f48eff560e25d9607 xorg-server-1.1.99.903.ebuild 16761
+RMD160 ab0a36aec4a85234414bbf28cd1eb1dbbd9e6929 xorg-server-1.1.99.903.ebuild 16761
+SHA256 852ad7a85050bf7988868258e96fc105bbaf89e047e020f1926d1ac827cfefc2 xorg-server-1.1.99.903.ebuild 16761
 EBUILD xorg-server-1.2.99.0.ebuild 16896 RMD160 a8ae75b0da9cda05098ad5eb63264f4f416e4f5f SHA1 cd9dec071fb01a82bf5cef68369331d92adbced9 SHA256 8a1999f3fe8a936ae8f1e0e172237cc869d83fceb3c9c04359795c7e9c718efe
 MD5 4356e12095e735444acdc5493d3b342e xorg-server-1.2.99.0.ebuild 16896
 RMD160 a8ae75b0da9cda05098ad5eb63264f4f416e4f5f xorg-server-1.2.99.0.ebuild 16896
 SHA256 8a1999f3fe8a936ae8f1e0e172237cc869d83fceb3c9c04359795c7e9c718efe xorg-server-1.2.99.0.ebuild 16896
-MISC ChangeLog 40943 RMD160 6450a14341dc23dbb9a35acc50b2fd63f53413fc SHA1 ef36d24c527dd42fd3fe192c5470f96570c36fba SHA256 ee6b5a1ba2a6701e0923782f6f64cf117d576f326f0d7e95482c43b953aa620a
-MD5 e6cacb2c7593df6f75994a574b8cb510 ChangeLog 40943
-RMD160 6450a14341dc23dbb9a35acc50b2fd63f53413fc ChangeLog 40943
-SHA256 ee6b5a1ba2a6701e0923782f6f64cf117d576f326f0d7e95482c43b953aa620a ChangeLog 40943
+MISC ChangeLog 41439 RMD160 bad81f27715855a656670ede2256c4e75546a0e2 SHA1 720f0d137ce5c02a91d4199a6e07ba54d7feff8e SHA256 b4a08c175b90e3764ed96cd0012198da940a63321d12f205255d27f151bb10f0
+MD5 5257211db24f246395d075e7101ac89d ChangeLog 41439
+RMD160 bad81f27715855a656670ede2256c4e75546a0e2 ChangeLog 41439
+SHA256 b4a08c175b90e3764ed96cd0012198da940a63321d12f205255d27f151bb10f0 ChangeLog 41439
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -182,16 +183,9 @@ SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/di
 MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r2 506
 RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r2 506
 SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r2 506
-MD5 6e5b9a5a0ac3d68af3d045db1b88f401 files/digest-xorg-server-1.1.99.902 521
-RMD160 43f57262e7cf3eaf37372ebfee701f29018a259e files/digest-xorg-server-1.1.99.902 521
-SHA256 da8e6ec5f8014b663c04bdcd101b699fbb6c70365234f8173f447f325e033472 files/digest-xorg-server-1.1.99.902 521
+MD5 b25c3575f294d85fb2f1050f294a77c7 files/digest-xorg-server-1.1.99.903 521
+RMD160 a4fe90a489427ffe36c26e096811ff3fb3f136c0 files/digest-xorg-server-1.1.99.903 521
+SHA256 45d473bb4d7847f5db8b7bd92cfa97b18a3ab04ff44587ce1c184b1dfc99da1b files/digest-xorg-server-1.1.99.903 521
 MD5 bc6e10d7263a5d1a2501320c797ebd3a files/digest-xorg-server-1.2.99.0 551
 RMD160 cb81e047284e4e5c83aacb7f3a89346c3b766e10 files/digest-xorg-server-1.2.99.0 551
 SHA256 fb0edf0badad1adc27c7d5f99a1b5610593c59c0e2682466da5aeb03daae7633 files/digest-xorg-server-1.2.99.0 551
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFcHOEKRy60XGEcJIRAuLWAJwO7E/LInXYdNqXK14bxRawT12uMwCfX+du
-w7Vaky7wtEma82aZ6EOl/1g=
-=wKE5
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.1.99.902 b/x11-base/xorg-server/files/digest-xorg-server-1.1.99.902
deleted file mode 100644
index f85740e9c57b..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.1.99.902
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257
-RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257
-SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257
-MD5 0319aac0baee367529d0605c380281f0 xorg-server-1.1.99.902.tar.bz2 6074549
-RMD160 8a2e2355e62c686b0cd5f3f5c479323294f92c9a xorg-server-1.1.99.902.tar.bz2 6074549
-SHA256 54f53c865fe6dcbebdc8510dbce487df88971476259b1ff199b103efb4d87b41 xorg-server-1.1.99.902.tar.bz2 6074549
diff --git a/x11-base/xorg-server/xorg-server-1.1.99.902.ebuild b/x11-base/xorg-server/xorg-server-1.1.99.902.ebuild
deleted file mode 100644
index 63861811b46e..000000000000
--- a/x11-base/xorg-server/xorg-server-1.1.99.902.ebuild
+++ /dev/null
@@ -1,530 +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.99.902.ebuild,v 1.2 2006/11/14 06:03:06 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.1"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://xorg.freedesktop.org/releases/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_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_impact
-	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_fglrx
-	video_cards_nvidia"
-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
-	dmx? ( x11-libs/libdmx )
-	!minimal? ( x11-libs/libXtst
-		x11-libs/libXres )
-	>=x11-libs/libxkbui-1.0.2
-	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.8
-	dmx? ( x11-proto/dmxproto )
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2 )
-	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
-		x11-apps/mkfontscale
-		x11-apps/xplsprinters )"
-
-# Drivers
-PDEPEND="
-	xorg? (
-		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_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-drivers/linuxwacom )
-
-		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_impact? ( >=x11-drivers/xf86-video-impact-0.2.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_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
-		video_cards_nvidia? ( || (
-				>=x11-drivers/nvidia-drivers-1.0.8774
-				>=x11-drivers/nvidia-legacy-drivers-1.0.7184
-			)
-		)
-	)"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	# 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
-
-	# 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-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable dri)
-		$(use_enable xorg)
-		$(use_enable xprint)
-		$(use_enable nptl glx-tls)
-		$(use_enable !minimal xorgcfg)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontdir=/usr/share/fonts
-		${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
-		kdrive_setup
-	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
-
-	# Install video mode files for system-config-display
-	insinto /usr/share/xorg
-	doins hw/xfree86/common/{extra,vesa}modes \
-		|| die "couldn't install extra modes"
-
-	# Bug #151421 - this file is not built with USE="minimal"
-	# Bug #151670 - this file is also not build if USE="-xorg"
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example
-		insinto /etc/X11
-		doins hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-
-	# Bug #135544
-	ewarn "Users of reduced blanking now need:"
-	ewarn "   Option \"ReducedBlanking\""
-	ewarn "In the relevant Monitor section(s)."
-	ewarn "Make sure your reduced blanking modelines are safe!"
-}
-
-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
-}
-
-kdrive_setup() {
-	local card real_card disable_card kdrive_fbdev kdrive_vesa
-
-	einfo "Removing unused kdrive drivers ..."
-
-	# Some kdrive servers require fbdev and vesa
-	kdrive_fbdev="radeon neomagic sis siliconmotion"
-	# Some kdrive servers require just vesa
-	kdrive_vesa="chips mach64 mga nv glint r128 via"
-
-	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}
-
-		disable_card=0
-
-		# Check whether it's a valid kdrive server before we waste time
-		# on the rest of this
-		if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
-			continue
-		fi
-
-		if ! use ${card}; then
-			if use x86; then
-				# Some kdrive servers require fbdev and vesa
-				for i in ${kdrive_fbdev}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = fbdev ]] \
-							|| [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-						fi
-				done
-
-				# Some kdrive servers require just vesa
-				for i in ${kdrive_vesa}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-					fi
-				done
-			fi
-			disable_card=1
-		# Bug #150052
-		# fbdev is the only VIDEO_CARDS setting that works on non-x86
-		elif ! use x86 \
-			&& [[ ${real_card} != fbdev ]]; then
-			ewarn "  $real_card does not work on your architecture; disabling."
-			disable_card=1
-		fi
-
-		if [[ $disable_card = 1 ]]; 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
-}
-
-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."
-}