Bump. Bunches of rendering and crasher fixes, incorporates security fix and the 2 xprint patches, and more.

Package-Manager: portage-2.1.1_pre2-r6

4 files changed, 716 insertions, 5 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index bddc9292cd89..b26d792cfedb 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.142 2006/07/07 02:38:04 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.143 2006/07/09 06:36:47 dberkholz Exp $
+
+*xorg-server-1.1.1 (09 Jul 2006)
+
+  09 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-1.1.1.ebuild:
+  Bump. Bunches of rendering and crasher fixes, incorporates security fix and
+  the 2 xprint patches, and more.
 
   07 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
   Update to my new email address.
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index c4c4808e9108..83f6fc1c2444 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -71,6 +71,7 @@ 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
+DIST xorg-server-1.1.1.tar.bz2 6252103 RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 SHA1 eb29dd4fea9f184321cbb5512f68b674ada4daf7 SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c
 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
@@ -83,10 +84,14 @@ EBUILD xorg-server-1.1.0-r1.ebuild 23974 RMD160 0116594df6692e06979d9524b3b25c9a
 MD5 80f84884c2e659060f04efef93925e70 xorg-server-1.1.0-r1.ebuild 23974
 RMD160 0116594df6692e06979d9524b3b25c9ae83b7ce6 xorg-server-1.1.0-r1.ebuild 23974
 SHA256 390c8101ed86a9e88531b03575072dc6911d2ccfac8dac17a691f258335dfb4f xorg-server-1.1.0-r1.ebuild 23974
-MISC ChangeLog 30030 RMD160 9df3eb5076961928940419c7fd106a415ad1f769 SHA1 c263bed98bcbf524a44fa1018d4be38d284738b9 SHA256 9805223d3f5701cd5713176ad889e90d452fe2c53c9c1bb2af8ad1b7b54eac84
-MD5 f42b14a7bf04d76a9e15fe1a1bf72f91 ChangeLog 30030
-RMD160 9df3eb5076961928940419c7fd106a415ad1f769 ChangeLog 30030
-SHA256 9805223d3f5701cd5713176ad889e90d452fe2c53c9c1bb2af8ad1b7b54eac84 ChangeLog 30030
+EBUILD xorg-server-1.1.1.ebuild 23848 RMD160 081580bd00438a6faa1ebb96b9463582e6f51f2e SHA1 9a4013c7c8f4c9292a6e370227fcf2c4f6c9b665 SHA256 bb48f942cb8a562d4f0dcbc6fc3cb9d834d38a27dd9905c23a8032fc26c69e69
+MD5 c8c9969dd7104f3804b83b870fbd9d60 xorg-server-1.1.1.ebuild 23848
+RMD160 081580bd00438a6faa1ebb96b9463582e6f51f2e xorg-server-1.1.1.ebuild 23848
+SHA256 bb48f942cb8a562d4f0dcbc6fc3cb9d834d38a27dd9905c23a8032fc26c69e69 xorg-server-1.1.1.ebuild 23848
+MISC ChangeLog 30261 RMD160 108ac39a619f69314f354cbb095614f1b55ad7c2 SHA1 bb452530e519249ce19c2efd81becda463706e27 SHA256 d9e130ae940ec9a6a34a8e72024a6391a3d64c13c5cebcea3e2bc97059e8ffcf
+MD5 425a2f89692c0b1a9348772475ace5a2 ChangeLog 30261
+RMD160 108ac39a619f69314f354cbb095614f1b55ad7c2 ChangeLog 30261
+SHA256 d9e130ae940ec9a6a34a8e72024a6391a3d64c13c5cebcea3e2bc97059e8ffcf ChangeLog 30261
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -100,3 +105,6 @@ SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/di
 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
+MD5 5bbe7de7ebbf30c9991b3fd800b1f219 files/digest-xorg-server-1.1.1 500
+RMD160 0a5b1d758ab4077ac728b7ec6cc7f06fb49ce273 files/digest-xorg-server-1.1.1 500
+SHA256 1bea059c9ffe1dee3634293efe79b0a429d52ca18eda558e2e7b9e0605b0504a files/digest-xorg-server-1.1.1 500
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.1.1 b/x11-base/xorg-server/files/digest-xorg-server-1.1.1
new file mode 100644
index 000000000000..740e34065050
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.1.1
@@ -0,0 +1,6 @@
+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 a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 6252103
+RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 xorg-server-1.1.1.tar.bz2 6252103
+SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c xorg-server-1.1.1.tar.bz2 6252103
diff --git a/x11-base/xorg-server/xorg-server-1.1.1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1.ebuild
new file mode 100644
index 000000000000..fcc2842b2276
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.1.1.ebuild
@@ -0,0 +1,690 @@
+# 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.1.ebuild,v 1.1 2006/07/09 06:36:47 dberkholz 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}"
+
+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_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_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/nvidia-drivers
+	!x11-drivers/nvidia-legacy-drivers
+	!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="
+	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-misc/linuxwacom )
+			)
+			!minimal? (
+				>=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-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_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 ) )
+			)
+			!minimal? (
+				>=x11-drivers/xf86-video-dummy-0.2.0
+				>=x11-drivers/xf86-video-fbdev-0.2.0
+
+				!hppa? (
+					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-ati-6.6.0
+					>=x11-drivers/xf86-video-glint-1.1.1
+					>=x11-drivers/xf86-video-mga-1.4.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-sisusb-0.8.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-ati-6.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-mga-1.4.1
+					>=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-sisusb-0.8.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-ati-6.6.0
+					>=x11-drivers/xf86-video-chips-1.1.1
+					>=x11-drivers/xf86-video-glint-1.1.1
+					>=x11-drivers/xf86-video-mga-1.4.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-sisusb-0.8.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-ati-6.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-mga-1.4.1
+					>=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-sisusb-0.8.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-impact-0.2.0
+					>=x11-drivers/xf86-video-newport-0.2.0 )
+				ppc? ( >=x11-drivers/xf86-video-ati-6.6.0
+					>=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-mga-1.4.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-sisusb-0.8.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-ati-6.6.0
+					>=x11-drivers/xf86-video-mga-1.4.1
+					>=x11-drivers/xf86-video-nv-1.1.1
+					>=x11-drivers/xf86-video-sisusb-0.8.1 )
+				sparc? ( >=x11-drivers/xf86-video-ati-6.6.0
+					>=x11-drivers/xf86-video-glint-1.1.1
+					>=x11-drivers/xf86-video-mga-1.4.1
+					>=x11-drivers/xf86-video-savage-2.1.1
+					>=x11-drivers/xf86-video-sisusb-0.8.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-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-ati-6.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-mga-1.4.1
+					>=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-sisusb-0.8.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() {
+	use minimal || 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
+			# (bug #136370) Radeon needs fbdev and vesa
+			if use video_cards_radeon; then
+				if [[ ${card} = video_cards_fbdev ]] \
+					|| [[ ${card} = video_cards_vesa ]]; then
+					continue
+				fi
+			fi
+
+			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."
+}