Update BIND_NOW patchset for xorg-server-1.2.0

svn path=/; revision=200

10 files changed, 667 insertions, 373 deletions

diff --git a/hardened/xorg/media-libs/mesa/Manifest b/hardened/xorg/media-libs/mesa/Manifest
index 9a46b02..14fb0cb 100644
--- a/hardened/xorg/media-libs/mesa/Manifest
+++ b/hardened/xorg/media-libs/mesa/Manifest
@@ -61,14 +61,10 @@ SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5 files/li
 DIST MesaLib-6.5.1.tar.bz2 3138257 RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 SHA1 cd3b314808534b0306c7f89e9a72c9c23dbff239 SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0
 DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
 DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
-EBUILD mesa-6.5-r3.ebuild 9167 RMD160 3010292963dd1e31748a4c6325dbeb2466a5836c SHA1 3290c59465fb57ac64e9f16276365e9d6811d564 SHA256 153bdcbb30c822e817e8b6722918117f238cade73a3e69a66d4dbd3ce8a013f4
-MD5 322719f46e0956b212398bb467c1aea5 mesa-6.5-r3.ebuild 9167
-RMD160 3010292963dd1e31748a4c6325dbeb2466a5836c mesa-6.5-r3.ebuild 9167
-SHA256 153bdcbb30c822e817e8b6722918117f238cade73a3e69a66d4dbd3ce8a013f4 mesa-6.5-r3.ebuild 9167
-EBUILD mesa-6.5-r4.ebuild 9264 RMD160 86c8699d8bacc4c1daf21f2c876b827cc15890ad SHA1 47549e33940d2e465bcce8c17d71f445b1216209 SHA256 b8933685afa32b41155a76de7a236a3589f6c2a4e7a9415efe324eeba0f56641
-MD5 39eda827e978c4a0212ea38ca2a86c8f mesa-6.5-r4.ebuild 9264
-RMD160 86c8699d8bacc4c1daf21f2c876b827cc15890ad mesa-6.5-r4.ebuild 9264
-SHA256 b8933685afa32b41155a76de7a236a3589f6c2a4e7a9415efe324eeba0f56641 mesa-6.5-r4.ebuild 9264
+EBUILD mesa-6.5-r3.ebuild 9269 RMD160 de1e779dff0cd3a337fdfc23b9322f30a176fe1a SHA1 39e58a48c2acb122c10d1a8b9dd24c5c721b4e7e SHA256 938cc124eefbf36a56d7c2ed588579ee76b4559098aec3c474f3588447d9bbdb
+MD5 9a27fc4a2e8715622c710c338fbdd060 mesa-6.5-r3.ebuild 9269
+RMD160 de1e779dff0cd3a337fdfc23b9322f30a176fe1a mesa-6.5-r3.ebuild 9269
+SHA256 938cc124eefbf36a56d7c2ed588579ee76b4559098aec3c474f3588447d9bbdb mesa-6.5-r3.ebuild 9269
 EBUILD mesa-6.5.1-r1.ebuild 8566 RMD160 bb69d2b35da1e262f5c0d31266967ed588cbc152 SHA1 0e16c52af81e06c88779365e408a03b0fd1ce986 SHA256 dd893e8470d2a422795bac8cdb874d7c38952257208a5820b5e03087d1ae141f
 MD5 227f3897206468e4f0cb6778c5036329 mesa-6.5.1-r1.ebuild 8566
 RMD160 bb69d2b35da1e262f5c0d31266967ed588cbc152 mesa-6.5.1-r1.ebuild 8566
@@ -77,10 +73,10 @@ EBUILD mesa-6.5.1-r4.ebuild 9325 RMD160 4c47b730c5da06d578270e8c8a506bcd183a5a63
 MD5 402ba128e34a3566d6d058ad2eda0939 mesa-6.5.1-r4.ebuild 9325
 RMD160 4c47b730c5da06d578270e8c8a506bcd183a5a63 mesa-6.5.1-r4.ebuild 9325
 SHA256 8f492fd251ae5948a6a4627f2146288d337c853bdeb63161192d48aebc31140b mesa-6.5.1-r4.ebuild 9325
-EBUILD mesa-6.5.2-r1.ebuild 9037 RMD160 04e8cee181fd7d1a214a1c27ce230162fc9f54de SHA1 f4d7e712c067d80866ae92abb338906f52a3999d SHA256 b41f677eb85895ee3c3213198847494b30a23587172e54cf2ffc42f68099c808
-MD5 636e643ca07ca8670167a71063c897e9 mesa-6.5.2-r1.ebuild 9037
-RMD160 04e8cee181fd7d1a214a1c27ce230162fc9f54de mesa-6.5.2-r1.ebuild 9037
-SHA256 b41f677eb85895ee3c3213198847494b30a23587172e54cf2ffc42f68099c808 mesa-6.5.2-r1.ebuild 9037
+EBUILD mesa-6.5.2-r1.ebuild 9026 RMD160 b8baa7c3ad5e79ef67f63cc941647d0c17fef1ad SHA1 d982c427b4cd73657f596ce6de442d895de1b999 SHA256 d58e3103876739ece0c35c9cdea7f3a8aaf209b43456ebefe98e3540fcfbf09d
+MD5 339646fe6b9f4df2e8829469d7c1df13 mesa-6.5.2-r1.ebuild 9026
+RMD160 b8baa7c3ad5e79ef67f63cc941647d0c17fef1ad mesa-6.5.2-r1.ebuild 9026
+SHA256 d58e3103876739ece0c35c9cdea7f3a8aaf209b43456ebefe98e3540fcfbf09d mesa-6.5.2-r1.ebuild 9026
 EBUILD mesa-6.5.2.ebuild 8985 RMD160 c08e39f10a72027722071a9fa6caf37cebc312a0 SHA1 792fd696d6254ce8e4b0c3b1e29317ec0554bb02 SHA256 8724b3d005228dcdfdfc05c799272a16bb73c310af895eede7caab693f3b8ef6
 MD5 430f13380cc4d0fbb3b2bda923fd0a4d mesa-6.5.2.ebuild 8985
 RMD160 c08e39f10a72027722071a9fa6caf37cebc312a0 mesa-6.5.2.ebuild 8985
@@ -92,9 +88,6 @@ SHA256 8aaef3acbc0dca54146e87953c739b0d04cc8a8452954d32ef9f64addabe2286 TODO 206
 MD5 80bc8bfb6472d4dcbad6e14a2595c1a9 files/digest-mesa-6.5-r3 241
 RMD160 069ddf1320b547a5a5cf1af3d0611a6c35398c7e files/digest-mesa-6.5-r3 241
 SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/digest-mesa-6.5-r3 241
-MD5 80bc8bfb6472d4dcbad6e14a2595c1a9 files/digest-mesa-6.5-r4 241
-RMD160 069ddf1320b547a5a5cf1af3d0611a6c35398c7e files/digest-mesa-6.5-r4 241
-SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/digest-mesa-6.5-r4 241
 MD5 c5825b910eaf2092a073b33f7db2d640 files/digest-mesa-6.5.1-r1 247
 RMD160 7e176dbe4570a0c74add11e3166b2596361d14f6 files/digest-mesa-6.5.1-r1 247
 SHA256 fcc814f186f772d396d230867bc9eeeaa1f1f348f6b53aa1bbcf23ff73ccde8f files/digest-mesa-6.5.1-r1 247
diff --git a/hardened/xorg/media-libs/mesa/files/digest-mesa-6.5-r4 b/hardened/xorg/media-libs/mesa/files/digest-mesa-6.5-r4
deleted file mode 100644
index 79639c7..0000000
--- a/hardened/xorg/media-libs/mesa/files/digest-mesa-6.5-r4
+++ /dev/null
@@ -1,3 +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
diff --git a/hardened/xorg/media-libs/mesa/mesa-6.5-r3.ebuild b/hardened/xorg/media-libs/mesa/mesa-6.5-r3.ebuild
index 0461db4..f0eddbe 100644
--- a/hardened/xorg/media-libs/mesa/mesa-6.5-r3.ebuild
+++ b/hardened/xorg/media-libs/mesa/mesa-6.5-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild,v 1.13 2006/10/11 02:26:49 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild,v 1.14 2007/04/07 04:56:07 vapier Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -36,7 +36,7 @@ IUSE="${IUSE_VIDEO_CARDS}
 	motif
 	nptl"
 
-RESTRICT="stricter"
+#RESTRICT="stricter"
 RDEPEND="dev-libs/expat
 	x11-libs/libX11
 	x11-libs/libXext
@@ -99,6 +99,9 @@ src_unpack() {
 	epatch ${FILESDIR}/change-default-dri-driver-dir-X7.1.patch
 	epatch ${FILESDIR}/6.4-multilib-fix.patch
 	epatch ${FILESDIR}/6.5-re-order-context-destruction.patch
+	epatch ${FILESDIR}/6.5-fix-radeon-PCIE.patch
+	epatch ${FILESDIR}/6.5-pic-textrel-fix.patch
+
 
 	# Don't compile debug code with USE=-debug - bug #125004
 	if ! use debug; then
@@ -246,10 +249,10 @@ src_install() {
 	# anywhere.
 	dodir /usr/$(get_libdir)/dri
 	exeinto /usr/$(get_libdir)/dri
-	ebegin "Installing drivers to ${EXEDESTTREE}"
+	ebegin "Installing drivers to /usr/$(get_libdir)/dri"
 	DRI_SO=$(find ${S}/lib* -name '*_dri.so')
 	doexe ${DRI_SO}
-	eend
+	eend $?
 
 	if ! use motif; then
 		rm ${D}/usr/include/GL/GLwMDrawA.h
diff --git a/hardened/xorg/media-libs/mesa/mesa-6.5-r4.ebuild b/hardened/xorg/media-libs/mesa/mesa-6.5-r4.ebuild
deleted file mode 100644
index e693004..0000000
--- a/hardened/xorg/media-libs/mesa/mesa-6.5-r4.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r4.ebuild,v 1.2 2006/08/25 20:53:37 hanno Exp $
-
-inherit eutils toolchain-funcs multilib flag-o-matic portability
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV}"
-MY_SRC_P="${MY_PN}Lib-${PV}"
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_VIDEO_CARDS="
-	video_cards_i810
-	video_cards_mach64
-	video_cards_mga
-	video_cards_none
-	video_cards_r128
-	video_cards_radeon
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_sis
-	video_cards_sunffb
-	video_cards_tdfx
-	video_cards_trident
-	video_cards_via"
-IUSE="${IUSE_VIDEO_CARDS}
-	debug
-	doc
-	hardened
-	motif
-	nptl"
-
-#RESTRICT="stricter"
-RDEPEND="dev-libs/expat
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/libXi
-	x11-libs/libXmu
-	>=x11-libs/libdrm-2.0.1
-	x11-libs/libICE
-	app-admin/eselect-opengl
-	motif? ( virtual/motif )
-	doc? ( app-doc/opengl-manpages )
-	!<=x11-base/xorg-x11-6.9"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	x11-proto/inputproto
-	x11-proto/xextproto
-	!hppa? ( x11-proto/xf86driproto )
-	x11-proto/xf86vidmodeproto
-	>=x11-proto/glproto-1.4.4
-	motif? ( x11-proto/printproto )"
-
-S="${WORKDIR}/${MY_P}"
-
-# Think about: ggi, svga, fbcon, no-X configs
-
-if use debug; then
-	if ! has splitdebug ${FEATURES}; then
-		RESTRICT="${RESTRICT} nostrip"
-	fi
-fi
-
-pkg_setup() {
-	if use debug; then
-		strip-flags
-		append-flags -g
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	if [[ ${KERNEL} == "FreeBSD" ]]; then
-		CONFIG="freebsd"
-	elif use x86; then
-		CONFIG="linux-dri-x86"
-	elif use amd64; then
-		CONFIG="linux-dri-x86-64"
-	elif use ppc; then
-		CONFIG="linux-dri-ppc"
-	else
-		CONFIG="linux-dri"
-	fi
-}
-
-src_unpack() {
-	HOSTCONF="${S}/configs/${CONFIG}"
-
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/6.4-dont-install-gles-headers.patch
-	epatch ${FILESDIR}/change-default-dri-driver-dir-X7.1.patch
-	epatch ${FILESDIR}/6.4-multilib-fix.patch
-	epatch ${FILESDIR}/6.5-re-order-context-destruction.patch
-	epatch ${FILESDIR}/6.5-fix-radeon-PCIE.patch
-	epatch ${FILESDIR}/6.5-pic-textrel-fix.patch
-
-	# Don't compile debug code with USE=-debug - bug #125004
-	if ! use debug; then
-	   einfo "Removing DO_DEBUG defs in dri drivers..."
-	   find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ;
-	fi
-
-	# Set default dri drivers directory
-	echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/$(get_libdir)/dri\"'" >> ${HOSTCONF}
-
-	# Do we want thread-local storage (TLS)?
-	if use nptl; then
-		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
-	fi
-
-	# Configurable DRI drivers
-	if use video_cards_i810; then
-		add_drivers i810 i915
-	fi
-	if use video_cards_mach64; then
-		add_drivers mach64
-	fi
-	if use video_cards_mga; then
-		add_drivers mga
-	fi
-	if use video_cards_r128; then
-		add_drivers r128
-	fi
-	if use video_cards_radeon; then
-		add_drivers radeon r200 r300
-	fi
-	if use video_cards_s3virge; then
-		add_drivers s3v
-	fi
-	if use video_cards_savage; then
-		add_drivers savage
-	fi
-	if use video_cards_sis; then
-		add_drivers sis
-	fi
-	if use video_cards_sunffb; then
-		add_drivers ffb
-	fi
-	if use video_cards_tdfx; then
-		add_drivers tdfx
-	fi
-	if use video_cards_trident; then
-		add_drivers trident
-	fi
-	if use video_cards_via; then
-		add_drivers unichrome
-	fi
-
-	# Defaults based on X.Org 6.9, with some changes
-	if [[ ! -n "${VIDEO_CARDS}" ]]; then
-		if use alpha; then
-			add_drivers mga tdfx r128 r200 r300 radeon
-		elif use amd64; then
-			add_drivers i915 mga r128 r200 r300 radeon tdfx
-		elif use arm; then
-			add_drivers mga r128 r200 r300 radeon
-		elif use hppa; then
-			# no accelerated 3D on hppa
-			true
-		elif use ia64; then
-			add_drivers mach64 mga r128 r200 r300 radeon tdfx unichrome
-		elif use mips; then
-			# no accelerated 3D on mips
-			true
-		elif use ppc; then
-			add_drivers mach64 mga r128 r200 r300 radeon tdfx
-		elif use ppc64; then
-			add_drivers mga r128 r200 r300 radeon
-		elif use sparc; then
-			add_drivers ffb mach64
-		elif use x86; then
-			add_drivers i810 i915 mach64 mga r128 r200 r300 radeon s3v savage \
-				sis tdfx trident unichrome
-		fi
-	fi
-
-	# Set drivers to everything on which we ran add_drivers()
-	echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
-
-	if use hardened; then
-		einfo "Deactivating assembly code for hardened build"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-		echo "ASM_API =" >> ${HOSTCONF}
-	fi
-
-	if use sparc; then
-		einfo "Sparc assembly code is not working; deactivating"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-	fi
-
-	# Kill this; we don't want /usr/X11R6/lib ever to be searched in this
-	# build.
-	echo "EXTRA_LIB_PATH =" >> ${HOSTCONF}
-
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
-	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
-	echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
-
-	# Removed glut, since we have separate freeglut/glut ebuilds
-	# Remove EGL, since Brian Paul says it's not ready for a release
-	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
-
-	# Get rid of glut includes
-	rm -f ${S}/include/GL/glut*h
-
-	# r200 breaks without this, since it's the only EGL-enabled driver so far
-	echo "USING_EGL = 0" >> ${HOSTCONF}
-
-	# Don't build EGL demos. EGL isn't ready for release, plus they produce a
-	# circular dependency with glut.
-	echo "PROGRAM_DIRS =" >> ${HOSTCONF}
-
-	# Documented in configs/default
-	if use motif; then
-		# Add -lXm
-		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
-		# Add GLwMDrawA.c
-		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
-	fi
-}
-
-src_compile() {
-	emake -j1 ${CONFIG} || die "Build failed"
-}
-
-src_install() {
-	dodir /usr
-	make \
-		DESTDIR=${D}/usr \
-		INCLUDE_DIR=${D}/usr/include \
-		LIB_DIR=${D}/usr/$(get_libdir) \
-		install || die "Installation failed"
-
-	##
-	# Install the actual drivers --- 'make install' doesn't install them
-	# anywhere.
-	dodir /usr/$(get_libdir)/dri
-	exeinto /usr/$(get_libdir)/dri
-	ebegin "Installing drivers to ${EXEDESTTREE}"
-	DRI_SO=$(find ${S}/lib* -name '*_dri.so')
-	doexe ${DRI_SO}
-	eend
-
-	if ! use motif; then
-		rm ${D}/usr/include/GL/GLwMDrawA.h
-	fi
-
-	# Don't install private headers
-	rm ${D}/usr/include/GL/GLw*P.h
-
-	fix_opengl_symlinks
-	dynamic_libgl_install
-
-	# Install libtool archives
-	insinto /usr/$(get_libdir)
-	# (#67729) Needs to be lib, not $(get_libdir)
-	doins ${FILESDIR}/lib/libGLU.la
-	sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
-		> ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
-
-	# On *BSD libcs dlopen() and similar functions are present directly in
-	# libc.so and does not require linking to libdl. portability eclass takes
-	# care of finding the needed library (if needed) witht the dlopen_lib
-	# function.
-	sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
-		${D}/usr/$(get_libdir)/libGLU.la \
-		${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
-
-	# Create the two-number versioned libs (.so.#.#), since only .so.# and
-	# .so.#.#.# were made
-	dosym libGLU.so.1.3.060500 /usr/$(get_libdir)/libGLU.so.1.3
-	dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0
-
-	# libGLU doesn't get the plain .so symlink either
-	dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so
-
-	# Figure out why libGL.so.1.5 is built (directfb), and why it's linked to
-	# as the default libGL.so.1
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-fix_opengl_symlinks() {
-	# Remove invalid symlinks
-	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
-		-name libGL\.* -type l); do
-		rm -f ${LINK}
-	done
-	# Create required symlinks
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# FreeBSD doesn't use major.minor versioning, so the library is only
-		# libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create
-		# libGL.so symlink and leave libGL.so.1 being the real thing
-		dosym libGL.so.1 /usr/$(get_libdir)/libGL.so
-	else
-		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
-		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving libGL and friends for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -o -L ${x} ]; then
-				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
-			fi
-		done
-		# glext.h added for #54984
-		for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
-			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}
-}
-
-add_drivers() {
-	DRI_DRIVERS="${DRI_DRIVERS} $@"
-}
diff --git a/hardened/xorg/media-libs/mesa/mesa-6.5.2-r1.ebuild b/hardened/xorg/media-libs/mesa/mesa-6.5.2-r1.ebuild
index 9042794..4a75254 100644
--- a/hardened/xorg/media-libs/mesa/mesa-6.5.2-r1.ebuild
+++ b/hardened/xorg/media-libs/mesa/mesa-6.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2-r1.ebuild,v 1.1 2007/02/19 22:21:17 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2-r1.ebuild,v 1.4 2007/04/29 05:59:04 ticho Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://mesa3d.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE_VIDEO_CARDS="
 	video_cards_i810
 	video_cards_mach64
diff --git a/hardened/xorg/x11-base/xorg-server/Manifest b/hardened/xorg/x11-base/xorg-server/Manifest
index 3d05a4c..4faa6f3 100644
--- a/hardened/xorg/x11-base/xorg-server/Manifest
+++ b/hardened/xorg/x11-base/xorg-server/Manifest
@@ -90,6 +90,14 @@ 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.2.0-dri-weak-glx.patch 2799 RMD160 046956357a49141248a65b82c74729189f302eea SHA1 1bada4ead78c6c3859567702af5fbb10f49c7da3 SHA256 807edf1ad573d699d24febba10930fd40ce4518ffae3c4a414dee2310a5bddf3
+MD5 0adddc9b7f172057c049d8ab0412491f files/xorg-server-1.2.0-dri-weak-glx.patch 2799
+RMD160 046956357a49141248a65b82c74729189f302eea files/xorg-server-1.2.0-dri-weak-glx.patch 2799
+SHA256 807edf1ad573d699d24febba10930fd40ce4518ffae3c4a414dee2310a5bddf3 files/xorg-server-1.2.0-dri-weak-glx.patch 2799
+AUX xorg-server-1.2.0-glx-needs-GLcore.patch 305 RMD160 b95402494595590ad2d42998d110090c94a6290a SHA1 4919c9150399a6524a642f075b5d92264e275f6d SHA256 1159c2ab7f6c95476eb8f47430b6c921fbf034f3fbb3b3afc3e29b72e1c73c5a
+MD5 93ee0bb562b71291315196474216c3dc files/xorg-server-1.2.0-glx-needs-GLcore.patch 305
+RMD160 b95402494595590ad2d42998d110090c94a6290a files/xorg-server-1.2.0-glx-needs-GLcore.patch 305
+SHA256 1159c2ab7f6c95476eb8f47430b6c921fbf034f3fbb3b3afc3e29b72e1c73c5a files/xorg-server-1.2.0-glx-needs-GLcore.patch 305
 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
@@ -103,7 +111,9 @@ MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598
 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598
 SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 files/xprint.init 598
 DIST MesaLib-6.5.1.tar.bz2 3138257 RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 SHA1 cd3b314808534b0306c7f89e9a72c9c23dbff239 SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0
+DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
 DIST xorg-server-1.1.1.tar.bz2 6252103 RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 SHA1 eb29dd4fea9f184321cbb5512f68b674ada4daf7 SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c
+DIST xorg-server-1.2.0.tar.bz2 6014596 RMD160 0bbc5ccb5cbbe7627b4f09f17848b188e8be2a50 SHA1 85fa0e8fa7d6bea6f1a73c66a57488ea68dffa17 SHA256 e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
 EBUILD xorg-server-1.1.1-r1.ebuild 17327 RMD160 0e945ee583bb516a2f42f12047198e9cbf021caa SHA1 37b5661946a941be8dacd9ac940c7293fbf09ae9 SHA256 224ad66e56e90d7f4841a596713a1b8b83dca51c68d42184b584545c3bfca18c
 MD5 fc52d7a51415583429b0576efbb02b61 xorg-server-1.1.1-r1.ebuild 17327
 RMD160 0e945ee583bb516a2f42f12047198e9cbf021caa xorg-server-1.1.1-r1.ebuild 17327
@@ -116,6 +126,10 @@ EBUILD xorg-server-1.1.1-r5.ebuild 17669 RMD160 4d80d0d87f68fa1cc383e8fdf22b4c3d
 MD5 4d8616c0934501efe83f7ab543e246f3 xorg-server-1.1.1-r5.ebuild 17669
 RMD160 4d80d0d87f68fa1cc383e8fdf22b4c3d2d9df6c9 xorg-server-1.1.1-r5.ebuild 17669
 SHA256 835f4821b2580e4d9d8e37b7c48502976c5c71830f3ce8502ce0f931465ade9e xorg-server-1.1.1-r5.ebuild 17669
+EBUILD xorg-server-1.2.0-r3.ebuild 16692 RMD160 0e704467253136cc313236fea77ab7861c4de7f3 SHA1 7296df7f178441357131657bd5f9f0ffd24ef8c1 SHA256 3f72fc222cffeb609574ce0e4301cf0f077162d2c4cc397bcd8a7aadf45cf664
+MD5 dbb546d5e9c02f498257d9f370d0e2fa xorg-server-1.2.0-r3.ebuild 16692
+RMD160 0e704467253136cc313236fea77ab7861c4de7f3 xorg-server-1.2.0-r3.ebuild 16692
+SHA256 3f72fc222cffeb609574ce0e4301cf0f077162d2c4cc397bcd8a7aadf45cf664 xorg-server-1.2.0-r3.ebuild 16692
 MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r1 506
 RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r1 506
 SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r1 506
@@ -125,3 +139,6 @@ SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/di
 MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r5 506
 RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r5 506
 SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r5 506
+MD5 92aecc687a1f65f481da05e14bab56c3 files/digest-xorg-server-1.2.0-r3 506
+RMD160 2816986513ee6479e25d5c213f00ceb38b905ccb files/digest-xorg-server-1.2.0-r3 506
+SHA256 4cd7c7723d603c993f0cc320ebf294ff367030d2d5c0bb1a9d4d02221235ef07 files/digest-xorg-server-1.2.0-r3 506
diff --git a/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.2.0-r3 b/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.2.0-r3
new file mode 100644
index 0000000..a78fe15
--- /dev/null
+++ b/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.2.0-r3
@@ -0,0 +1,6 @@
+MD5 e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2 3295166
+RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 MesaLib-6.5.2.tar.bz2 3295166
+SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f MesaLib-6.5.2.tar.bz2 3295166
+MD5 ea291c89e68832d570d9d5e007218bd6 xorg-server-1.2.0.tar.bz2 6014596
+RMD160 0bbc5ccb5cbbe7627b4f09f17848b188e8be2a50 xorg-server-1.2.0.tar.bz2 6014596
+SHA256 e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 xorg-server-1.2.0.tar.bz2 6014596
diff --git a/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.2.0-dri-weak-glx.patch b/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.2.0-dri-weak-glx.patch
new file mode 100644
index 0000000..01968b8
--- /dev/null
+++ b/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.2.0-dri-weak-glx.patch
@@ -0,0 +1,77 @@
+--- include/xorg-config.h.in.orig	2007-04-29 23:26:56.000000000 +0200
++++ include/xorg-config.h.in	2007-04-29 23:27:28.000000000 +0200
+@@ -115,4 +115,7 @@
+ /* Have execinfo.h */
+ #undef HAVE_EXECINFO_H
+ 
++/* Loadable XFree86 server awesomeness */
++#undef XFree86LOADER
++
+ #endif /* _XORG_CONFIG_H_ */
+--- hw/xfree86/dri/dri.c.orig	2007-01-23 06:39:16.000000000 +0100
++++ hw/xfree86/dri/dri.c	2007-04-29 20:18:51.000000000 +0200
+@@ -75,6 +75,11 @@
+ extern Bool noPanoramiXExtension;
+ #endif
+ 
++#ifdef XFree86LOADER
++typedef __GLXscreen *(*__glXgetActiveScreenFn)(int);
++__glXgetActiveScreenFn __glXgetActiveScreenPtr = NULL;
++#endif
++
+ static int DRIScreenPrivIndex = -1;
+ static int DRIWindowPrivIndex = -1;
+ static unsigned long DRIGeneration = 0;
+@@ -800,13 +805,24 @@
+ DRICreateDummyContext(ScreenPtr pScreen, Bool needCtxPriv)
+ {
+     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+-    __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
+-    __GLcontextModes *modes = pGLXScreen->modes;
+-    void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
+     DRIContextPrivPtr pDRIContextPriv;
+     void *contextStore;
+     VisualPtr visual;
+     int visNum;
++#if defined(XFree86LOADER)
++    __GLXscreen *pGLXScreen;
++    __GLcontextModes *modes;
++    void **pVisualConfigPriv;
++    if (__glXgetActiveScreenPtr == NULL)
++	__glXgetActiveScreenPtr = (__glXgetActiveScreenFn)LoaderSymbol("__glXgetActiveScreen");
++    pGLXScreen = (*__glXgetActiveScreenPtr)(pScreen->myNum);
++    modes = pGLXScreen->modes;
++    pVisualConfigPriv = pGLXScreen->pVisualPriv;
++#else
++    __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
++    __GLcontextModes *modes = pGLXScreen->modes;
++    void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
++#endif
+ 
+     visual = pScreen->visuals;
+ 
+@@ -864,11 +880,22 @@
+                  XID context, drm_context_t * pHWContext)
+ {
+     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
++    DRIContextPrivPtr pDRIContextPriv;
++    void *contextStore;
++#if defined(XFree86LOADER)
++    __GLXscreen *pGLXScreen;
++    __GLcontextModes *modes;
++    void **pVisualConfigPriv;
++    if (__glXgetActiveScreenPtr == NULL)
++	__glXgetActiveScreenPtr = (__glXgetActiveScreenFn)LoaderSymbol("__glXgetActiveScreen");
++    pGLXScreen = (*__glXgetActiveScreenPtr)(pScreen->myNum);
++    modes = pGLXScreen->modes;
++    pVisualConfigPriv = pGLXScreen->pVisualPriv;
++#else
+     __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
+     __GLcontextModes *modes = pGLXScreen->modes;
+     void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
+-    DRIContextPrivPtr pDRIContextPriv;
+-    void *contextStore;
++#endif
+ 
+     if (pDRIPriv->createDummyCtx && !pDRIPriv->dummyCtxPriv) {
+         if (!DRICreateDummyContext(pScreen, pDRIPriv->createDummyCtxPriv)) {
diff --git a/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.2.0-glx-needs-GLcore.patch b/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.2.0-glx-needs-GLcore.patch
new file mode 100644
index 0000000..7235039
--- /dev/null
+++ b/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.2.0-glx-needs-GLcore.patch
@@ -0,0 +1,10 @@
+--- hw/xfree86/dixmods/Makefile.am.orig	2007-04-29 20:14:49.000000000 +0200
++++ hw/xfree86/dixmods/Makefile.am	2007-04-29 20:15:31.000000000 +0200
+@@ -72,6 +72,7 @@
+ endif
+ libglx_la_LIBADD = \
+ 	$(top_builddir)/GL/glx/libglx.la \
++	./libGLcore.la \
+ 	$(GLXDRI_LIBRARY)
+ libglx_la_SOURCES = glxmodule.c
+ 
diff --git a/hardened/xorg/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild b/hardened/xorg/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild
new file mode 100644
index 0000000..9d0b375
--- /dev/null
+++ b/hardened/xorg/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild
@@ -0,0 +1,539 @@
+# Copyright 1999-2007 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.2.0-r3.ebuild,v 1.4 2007/04/29 06:32:58 ticho 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.2"
+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-1.2.5
+	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.2
+	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.3
+	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.3 )
+	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
+
+	PATCHES="${FILESDIR}/${PV}-server-damage-version.patch
+		${FILESDIR}/${PV}-server-randr-version.patch
+		${FILESDIR}/xorg-xserver-${PV}-xcmisc.diff
+		${FILESDIR}/${PV}-client-leak.patch"
+
+	if use hardened; then
+		# Patches to make it bind-now
+		einfo "Hardened patches will be applied."
+		PATCHES="${FILESDIR}/${P}-glx-needs-GLcore.patch
+			${FILESDIR}/${P}-dri-weak-glx.patch
+			${PATCHES}"
+	fi
+
+	# 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; 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}/hw/xprint/etc/init.d/xprint
+	# Install the wrapper
+	newinitd ${FILESDIR}/xprint.init xprint
+	# Install profile scripts
+	insinto /etc/profile.d
+	doins ${S}/hw/xprint/etc/profile.d/xprint*
+	insinto /etc/X11/xinit/xinitrc.d
+	doins ${S}/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
+	# 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
+	# 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."
+}