EAPI4 cleanups.

70 files changed, 128 insertions, 206 deletions

diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 410d0a5e..736b2cdd 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,2 +1,2 @@
-EBUILD mesa-progs-9999.ebuild 1099 RMD160 a781e143ae41ab792aae9aba520625a80e8afd21 SHA1 3cbd3c7ea476e7b8a6bade0c19f74481c90d4d1a SHA256 343465dfe3e1558d35cece95590fb80ccf061d5ad11aff7fa9d31ff9eea1bfb3
+EBUILD mesa-progs-9999.ebuild 1042 RMD160 3a0d1843d06e2f344272d1dd9382007572234c57 SHA1 0cc4b89caf1e6be1343a6312dd4358a593d0b042 SHA256 ef7537a91998316ea11e8a1eb5e61ea1877575b7acd06e36590ee1d9f22fd773
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 97c5a5d6..756d8347 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -7,20 +7,12 @@ EAPI=4
 MY_PN=${PN/progs/demos}
 MY_P=${MY_PN}-${PV}
 EGIT_REPO_URI="git://anongit.freedesktop.org/${MY_PN/-//}"
-
-if [[ ${PV} = 9999* ]]; then
-	    GIT_ECLASS="git"
-fi
-
+[[ ${PV} = 9999* ]] && GIT_ECLASS="git"
 inherit toolchain-funcs ${GIT_ECLASS}
 
 DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
 HOMEPAGE="http://mesa3d.sourceforge.net/"
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/${MY_PN/-//}/${PV}/${MY_P}.tar.bz2"
-fi
+[[ ${PV} == 9999* ]] || SRC_URI="ftp://ftp.freedesktop.org/pub/${MY_PN/-//}/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -40,9 +32,9 @@ src_configure() {
 
 src_compile() {
 	tc-export CC
-	emake LDLIBS='-lGL -lm' src/xdemos/{glxgears,glxinfo} || die
+	emake LDLIBS='-lGL -lm' src/xdemos/{glxgears,glxinfo}
 }
 
 src_install() {
-	dobin src/xdemos/{glxgears,glxinfo} || die
+	dobin src/xdemos/{glxgears,glxinfo}
 }
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 1b68e202..8fe16c2e 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -4,5 +4,5 @@ AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de511
 AUX chooser.sh 1301 RMD160 47ae0768ed54f235443399bdf08632c9f5cd3d10 SHA1 c378244ce59d74c966d564b3b34ac8168e3d0352 SHA256 5808080351f80c56b5ab78946103551a628925a0a3a95417b28002bf6e088212
 AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb4d5a184d6d7cc1995d685b55c9c188ac SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549
 AUX xserverrc 45 RMD160 ba59828df58de185ac8cbe762f746cc4b5b25594 SHA1 297121e4f3bc8abbaade83cd2583d16e8887e15b SHA256 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387
-EBUILD xinit-9999.ebuild 1695 RMD160 3ad090ce22531baf13b07f8e9e742a86e9d61ba2 SHA1 e8a0a26add01f156dc7eef3dca0e62cf4d239ca7 SHA256 b4759191344d91107cc6b1b1a217fa024d01958892f4507bd7b64d911611bf4e
+EBUILD xinit-9999.ebuild 1573 RMD160 14e48b8b871d5da5e67080cc56d2878c99195e90 SHA1 6aea2850d4ddb15b5444fcb7f81082890ecf68ca SHA256 c36f2772ad2629a41cad199586cb4b3ab5e0ce376ed0996f4a6e6fa6eb613f75
 MISC metadata.xml 323 RMD160 269a698f418e2fb289704dcf9dd8ee2291c5b266 SHA1 5dc07448925c52d5cc1e2c7cd1d5d9fb4537d04a SHA256 cc0d02e6168e77461049b0a9a0493e11d5ff21b19de24ac2436c536b74055444
diff --git a/x11-apps/xinit/xinit-9999.ebuild b/x11-apps/xinit/xinit-9999.ebuild
index d1a0815b..d07fcf5c 100644
--- a/x11-apps/xinit/xinit-9999.ebuild
+++ b/x11-apps/xinit/xinit-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.2.1-r2.ebuild,v 1.1 2010/05/27 08:42:59 scarabeus Exp $
+# $Header: $
 
 EAPI=4
 
@@ -41,11 +41,11 @@ src_install() {
 	xorg-2_src_install
 
 	exeinto /etc/X11
-	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh || die
+	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
 	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/Xsession || die
+	doexe "${FILESDIR}"/Xsession
 	exeinto /etc/X11/xinit
-	doexe "${FILESDIR}"/xserverrc || die
+	doexe "${FILESDIR}"/xserverrc
 	exeinto /etc/X11/xinit/xinitrc.d/
 	doexe "${FILESDIR}/00-xhost"
 }
diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest
index 774edcea..a7378b7a 100644
--- a/x11-apps/xrandr/Manifest
+++ b/x11-apps/xrandr/Manifest
@@ -1,2 +1,2 @@
-EBUILD xrandr-9999.ebuild 602 RMD160 980020780347abc6a417585d3473c23101e465cb SHA1 52ed7971b1c590a30d06b4d8633f90e8b7fb3a3b SHA256 0a419af71625a5bc5a421b8420a5b3cdf67fecc0fddcf7f84e5354ffab3dbe03
+EBUILD xrandr-9999.ebuild 509 RMD160 b5ea0cf0f3208c66c498eb4f4d6da4c4ca9777dd SHA1 2b71cd3d7bf6f225c66ae287aaf181c32cad6b72 SHA256 bca6bd6d7bd37642806917e29f01962202d50302ffd637d38bd9878ee11ea6c0
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-apps/xrandr/xrandr-9999.ebuild b/x11-apps/xrandr/xrandr-9999.ebuild
index 7104bbbd..b7117e35 100644
--- a/x11-apps/xrandr/xrandr-9999.ebuild
+++ b/x11-apps/xrandr/xrandr-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-1.3.3.ebuild,v 1.1 2010/07/24 11:47:41 scarabeus Exp $
+# $Header: $
 
 EAPI=4
 
@@ -18,5 +18,5 @@ DEPEND="${RDEPEND}"
 
 src_install() {
 	xorg-2_src_install
-	rm -f "${ED}"/usr/bin/xkeystone
+	rm -f "${ED}"/usr/bin/xkeystone || die
 }
diff --git a/x11-base/nouveau-drm/Manifest b/x11-base/nouveau-drm/Manifest
index fe5a8b43..a86e3cf2 100644
--- a/x11-base/nouveau-drm/Manifest
+++ b/x11-base/nouveau-drm/Manifest
@@ -1 +1 @@
-EBUILD nouveau-drm-99999999.ebuild 1520 RMD160 8a3a2cbad093947e810d403251052ab8df372991 SHA1 5d0c5dc05a4235ac68afeea5a7a241fe4b857f8f SHA256 4cf9268f98451d1f4c29aae89031a1444fb423e0ed218e63296726b3e02e6a0c
+EBUILD nouveau-drm-99999999.ebuild 1453 RMD160 5490567e5ba0b4db67ab3708cf6b6f2dc9f58ede SHA1 6c37bc0074f6f450fe2ba253bd0ac9d0d0df8287 SHA256 bdca951a91b227ba3cc2175e0cf33d53802bd3474483d34f7cc9e6c4cc2b1d0e
diff --git a/x11-base/nouveau-drm/nouveau-drm-99999999.ebuild b/x11-base/nouveau-drm/nouveau-drm-99999999.ebuild
index 82305bbf..1c74adce 100644
--- a/x11-base/nouveau-drm/nouveau-drm-99999999.ebuild
+++ b/x11-base/nouveau-drm/nouveau-drm-99999999.ebuild
@@ -45,11 +45,10 @@ src_compile() {
 	set_arch_to_kernel
 	emake \
 		LINUXDIR="${KERNEL_DIR}" \
-		GIT_REVISION="$(zcat ${WORKDIR}/master.tar.gz | git get-tar-commit-id)" \
-		|| die "Compiling kernel modules failed"
+		GIT_REVISION="$(zcat ${WORKDIR}/master.tar.gz | git get-tar-commit-id)"
 }
 
 src_install() {
 	insinto /lib/modules/${KV_FULL}/${PN}
-	doins drivers/gpu/drm/{*/,}*.ko || die "doins failed"
+	doins drivers/gpu/drm/{*/,}*.ko
 }
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index c17882be..5deac49c 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,2 +1,2 @@
-EBUILD xorg-drivers-1.10.ebuild 5798 RMD160 4fde5290f1980e8a99a8b1abf3a7d112e7ebf9f3 SHA1 bbaf7a8592ae6ef26dea3fb2660f7f8d06ccdc0c SHA256 18c738f21586598ef90eaa5b334f08c91e57a0a2cd0dd957459534b01188d22a
-EBUILD xorg-drivers-9999.ebuild 5798 RMD160 4fde5290f1980e8a99a8b1abf3a7d112e7ebf9f3 SHA1 bbaf7a8592ae6ef26dea3fb2660f7f8d06ccdc0c SHA256 18c738f21586598ef90eaa5b334f08c91e57a0a2cd0dd957459534b01188d22a
+EBUILD xorg-drivers-1.10.ebuild 5689 RMD160 62b72cadb731a333b98d6015e5346e5bee993891 SHA1 cf11df3d6680689d23aa28a4c379d33889216f9d SHA256 e1062fd9bd2d3b60c1c4c85016d1cafd389b648e39430ed9d6ccfbfbd6910c5c
+EBUILD xorg-drivers-9999.ebuild 5689 RMD160 62b72cadb731a333b98d6015e5346e5bee993891 SHA1 cf11df3d6680689d23aa28a4c379d33889216f9d SHA256 e1062fd9bd2d3b60c1c4c85016d1cafd389b648e39430ed9d6ccfbfbd6910c5c
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.10.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.10.ebuild
index 1100c720..77bca3f4 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.10.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.9.ebuild,v 1.1 2010/09/12 18:41:10 chithanh Exp $
+# $Header: $
 
 EAPI=4
 
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 1100c720..77bca3f4 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.9.ebuild,v 1.1 2010/09/12 18:41:10 chithanh Exp $
+# $Header: $
 
 EAPI=4
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 2d0ae8d4..5dd6aeeb 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -5,6 +5,6 @@ AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f
 AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
 AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
 DIST xorg-server-1.9.99.901.tar.bz2 5385667 RMD160 a33d2a02a2879e7eaf2ad69baedb8d5ac4367549 SHA1 5735f6fb896fbda73f50919d9f02e5c74e9db69c SHA256 fedef3a34eeff0930ee6f90f73be23d4285fdf0e451bc60a21ec200a91806d24
-EBUILD xorg-server-1.9.99.901.ebuild 7761 RMD160 79a6c337113b3f3619e01a28212f2ec1d92cf288 SHA1 f96b238837835c5b738786a0a052d06711799928 SHA256 a8ebaa3040a6a57f3516aa5dcab20bfba24774d6ce7f4ea05bef05d2a405be22
-EBUILD xorg-server-9999.ebuild 7761 RMD160 79a6c337113b3f3619e01a28212f2ec1d92cf288 SHA1 f96b238837835c5b738786a0a052d06711799928 SHA256 a8ebaa3040a6a57f3516aa5dcab20bfba24774d6ce7f4ea05bef05d2a405be22
+EBUILD xorg-server-1.9.99.901.ebuild 7118 RMD160 23b1c3dc0cee7e50250404ec95ece53424a9ddd8 SHA1 041cd55407c487e0fb5b695733f134f9303d248e SHA256 62a216254d1f956b4624db1b73f0d4e9b1e492ebb20e7db300650648e7dee31e
+EBUILD xorg-server-9999.ebuild 7118 RMD160 23b1c3dc0cee7e50250404ec95ece53424a9ddd8 SHA1 041cd55407c487e0fb5b695733f134f9303d248e SHA256 62a216254d1f956b4624db1b73f0d4e9b1e492ebb20e7db300650648e7dee31e
 MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba
diff --git a/x11-base/xorg-server/xorg-server-1.9.99.901.ebuild b/x11-base/xorg-server/xorg-server-1.9.99.901.ebuild
index 5a0e4121..0a056368 100644
--- a/x11-base/xorg-server/xorg-server-1.9.99.901.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.9.99.901.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2010 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.9.0.ebuild,v 1.1 2010/09/12 18:41:36 chithanh Exp $
+# $Header: $
 
 EAPI=4
+PACKAGE_NAME="xserver"
 inherit xorg-2 multilib versionator
 
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-OPENGL_DIR="xorg-x11"
-
 DESCRIPTION="X.Org X servers"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 
 IUSE_SERVERS="dmx kdrive xorg"
 IUSE="${IUSE_SERVERS} doc ipv6 minimal nptl tslib +udev"
+
 RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
 	media-libs/freetype
@@ -80,10 +78,6 @@ DEPEND="${RDEPEND}
 	>=x11-proto/xineramaproto-1.1.3
 	>=x11-proto/xproto-7.0.17
 	dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
-	doc? (
-		>=app-doc/doxygen-1.6.1
-		app-text/xmlto
-	)
 	!minimal? (
 		>=x11-proto/xf86driproto-2.1.0
 		>=x11-proto/dri2proto-2.3
@@ -93,13 +87,13 @@ DEPEND="${RDEPEND}
 PDEPEND="
 	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
 
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)"
 
-# These have been sent upstream
 #UPSTREAMED_PATCHES=(
 #	"${WORKDIR}/patches/"
-#	)
+#)
 
 PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
@@ -110,8 +104,6 @@ PATCHES=(
 pkg_setup() {
 	xorg-2_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
@@ -149,7 +141,7 @@ pkg_setup() {
 		--without-dtrace
 		--without-fop
 		--with-os-vendor=Gentoo
-		${conf_opts}"
+	"
 
 	# Xorg-server requires includes from OS mesa which are not visible for
 	# users of binary drivers.
@@ -195,22 +187,21 @@ src_install() {
 
 	if ! use minimal &&	use xorg; then
 		# Install xorg.conf.example into docs
-		dodoc hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
+		dodoc hw/xfree86/xorg.conf.example
 	fi
 
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
-	newinitd "${FILESDIR}"/xdm.initd-3 xdm || die
-	newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-3 xdm
+	newconfd "${FILESDIR}"/xdm.confd-3 xdm
 
 	# install the @x11-module-rebuild set for Portage
 	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf || die
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
 }
 
 pkg_postinst() {
 	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set --use-old xorg-x11
+	eselect opengl set xorg-x11 --use-old
 
 	if [[ ${INFO} = yes ]]; then
 		elog "You should consider reading upgrade guide for this release:"
@@ -239,11 +230,11 @@ pkg_postrm() {
 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
+		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
 		local x=""
 		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
 			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
 			fi
 		done
 	eend 0
@@ -256,13 +247,4 @@ server_based_install() {
 			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
 			"${D}"/usr/share/man/man1/Xserver.1x
 	fi
-}
-
-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."
-}
+}
\ No newline at end of file
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 5a0e4121..0a056368 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2010 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.9.0.ebuild,v 1.1 2010/09/12 18:41:36 chithanh Exp $
+# $Header: $
 
 EAPI=4
+PACKAGE_NAME="xserver"
 inherit xorg-2 multilib versionator
 
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-OPENGL_DIR="xorg-x11"
-
 DESCRIPTION="X.Org X servers"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 
 IUSE_SERVERS="dmx kdrive xorg"
 IUSE="${IUSE_SERVERS} doc ipv6 minimal nptl tslib +udev"
+
 RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
 	media-libs/freetype
@@ -80,10 +78,6 @@ DEPEND="${RDEPEND}
 	>=x11-proto/xineramaproto-1.1.3
 	>=x11-proto/xproto-7.0.17
 	dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
-	doc? (
-		>=app-doc/doxygen-1.6.1
-		app-text/xmlto
-	)
 	!minimal? (
 		>=x11-proto/xf86driproto-2.1.0
 		>=x11-proto/dri2proto-2.3
@@ -93,13 +87,13 @@ DEPEND="${RDEPEND}
 PDEPEND="
 	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
 
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)"
 
-# These have been sent upstream
 #UPSTREAMED_PATCHES=(
 #	"${WORKDIR}/patches/"
-#	)
+#)
 
 PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
@@ -110,8 +104,6 @@ PATCHES=(
 pkg_setup() {
 	xorg-2_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
@@ -149,7 +141,7 @@ pkg_setup() {
 		--without-dtrace
 		--without-fop
 		--with-os-vendor=Gentoo
-		${conf_opts}"
+	"
 
 	# Xorg-server requires includes from OS mesa which are not visible for
 	# users of binary drivers.
@@ -195,22 +187,21 @@ src_install() {
 
 	if ! use minimal &&	use xorg; then
 		# Install xorg.conf.example into docs
-		dodoc hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
+		dodoc hw/xfree86/xorg.conf.example
 	fi
 
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
-	newinitd "${FILESDIR}"/xdm.initd-3 xdm || die
-	newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-3 xdm
+	newconfd "${FILESDIR}"/xdm.confd-3 xdm
 
 	# install the @x11-module-rebuild set for Portage
 	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf || die
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
 }
 
 pkg_postinst() {
 	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set --use-old xorg-x11
+	eselect opengl set xorg-x11 --use-old
 
 	if [[ ${INFO} = yes ]]; then
 		elog "You should consider reading upgrade guide for this release:"
@@ -239,11 +230,11 @@ pkg_postrm() {
 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
+		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
 		local x=""
 		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
 			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
 			fi
 		done
 	eend 0
@@ -256,13 +247,4 @@ server_based_install() {
 			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
 			"${D}"/usr/share/man/man1/Xserver.1x
 	fi
-}
-
-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."
-}
+}
\ No newline at end of file
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 8ff2262e..d9c9bac5 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,2 +1,2 @@
-EBUILD xf86-input-synaptics-9999.ebuild 1007 RMD160 3d7d9c11759f29867549931ed51ade77caa108ef SHA1 b2119a97672c187c920ae1a24ef3d63bd96d7aa4 SHA256 a9927bf196158117c30ea6055cbccb58073250810971439d542fa527e96bdd41
+EBUILD xf86-input-synaptics-9999.ebuild 839 RMD160 be8aec8f7d0bb3d245bb1253e123ba1ca3fc0d4e SHA1 a2d12de2392a74962e290ca56d885c640c1fbf76 SHA256 6cc8ce56156e82f8be14f554b546adb96568e1aa8b7150c8529e754ccd4169a0
 MISC metadata.xml 489 RMD160 6d00dcafdbb2cd378f03a601b2a1a9385ac6c583 SHA1 ebedcff00b817d050181a0b00121ada982be6f91 SHA256 303367040ca55bd42fed1d185fae0e30af683f020e363b57eb0dede4f68e7bef
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild
index be693b59..805afc24 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.3.0.ebuild,v 1.1 2010/09/08 20:38:40 scarabeus Exp $
+# $Header: $
 
 EAPI=4
 
@@ -20,9 +20,8 @@ DEPEND="${RDEPEND}
 	x11-proto/inputproto
 	>=x11-proto/recordproto-1.14"
 
-src_install() {
-	DOCS="README" xorg-2_src_install
-}
+DOCS="README"
+
 pkg_postinst() {
 	xorg-2_pkg_postinst
 	# Just a friendly warning
diff --git a/x11-drivers/xf86-video-vmware/Manifest b/x11-drivers/xf86-video-vmware/Manifest
index 2f1e38e2..0f750569 100644
--- a/x11-drivers/xf86-video-vmware/Manifest
+++ b/x11-drivers/xf86-video-vmware/Manifest
@@ -1 +1 @@
-EBUILD xf86-video-vmware-9999.ebuild 586 RMD160 a9073cd69b049c154b6afa792b4f0a4a72d05ed5 SHA1 efbedfbe6eff14cfe81153f674e068fe9026fb62 SHA256 3ebdde7aa6280f4999d8a2c31475d62ec6a36b69d19b0aeabdea2e5ea7744f0b
+EBUILD xf86-video-vmware-9999.ebuild 464 RMD160 0f9ad92beee77c52aadd3a51f43343eb5b630e5e SHA1 91d9ec35af3fd5654303fc9e411bd07e79e46d21 SHA256 3d6480b6255c48ca54bad31643f20d09c337593098840e4281d60d44ab3d7f4d
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-9999.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-9999.ebuild
index 5d3222c3..8d96b8dd 100644
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-9999.ebuild
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-11.0.1.ebuild,v 1.3 2010/04/16 21:29:38 pacho Exp $
+# $Header: $
 
 EAPI=4
 inherit xorg-2
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index d4c0d751..856674c6 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -1 +1 @@
-EBUILD libFS-9999.ebuild 541 RMD160 18ee6817ee67453645d05afc2efc35805d45d16a SHA1 0934dcd0d8eaff8aa9046e46d494b5100b2e107b SHA256 e04766ca684a417bec637c849eb309fc33300ca18c6afa3268300735bcd128d0
+EBUILD libFS-9999.ebuild 443 RMD160 1f883e3fbacc227bbbcd2003d579177a2e4bb0c4 SHA1 e1115f8e5230092e19d47f5240822c1f535f62e7 SHA256 6ee5e4139425455014dd414aa0cdc02ff1b9dcce47e20e69b94600672a4793e4
diff --git a/x11-libs/libFS/libFS-9999.ebuild b/x11-libs/libFS/libFS-9999.ebuild
index 3c88d290..11afde37 100644
--- a/x11-libs/libFS/libFS-9999.ebuild
+++ b/x11-libs/libFS/libFS-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libFS/libFS-1.0.3.ebuild,v 1.1 2010/10/28 11:06:20 scarabeus Exp $
+# $Header: $
 
 EAPI=4
 inherit xorg-2
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index ba6624a8..8f7b0eab 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1 +1 @@
-EBUILD libICE-9999.ebuild 727 RMD160 b9fd24fc169c3044315528b102834e4ebfebf69b SHA1 adf5017d92f4ac7caffd0f475d2f802caa6372fa SHA256 b91b17489494843bc001607cbc6f4ead5fc34d502c778d47980f9c1f383f42d9
+EBUILD libICE-9999.ebuild 701 RMD160 73aed0f64dd0a530b85884a593055576b05b1a8e SHA1 ad478e9ed33ffbb943f730c830f380aaede33920 SHA256 89d2b937d5fdad9438d16d998267d328c50c12009f763964424f8c0e5b849bbb
diff --git a/x11-libs/libICE/libICE-9999.ebuild b/x11-libs/libICE/libICE-9999.ebuild
index a7fd34c8..5e6ecf7c 100644
--- a/x11-libs/libICE/libICE-9999.ebuild
+++ b/x11-libs/libICE/libICE-9999.ebuild
@@ -12,9 +12,7 @@ IUSE="doc ipv6"
 
 RDEPEND="x11-libs/xtrans
 	x11-proto/xproto"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
-
+DEPEND="${RDEPEND}"
 pkg_setup() {
 	xorg-2_pkg_setup
 
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 50ed3acb..a173595d 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1 +1 @@
-EBUILD libSM-9999.ebuild 735 RMD160 27bd2f277ec107a2b063b6b5d6e7c1bff82d7f9d SHA1 52ab81a7ee67a2f260dafcf460c74f932c861a4a SHA256 082f44cc4fc176420dadbc34d5dcff501b66be728345e9da27831b54b925adb6
+EBUILD libSM-9999.ebuild 710 RMD160 7c0c4641e2e27d70f99151dd267932ee4523ab37 SHA1 1ef8d8b10088f37c58cf5309f599a64d291ebc7d SHA256 5153edcac5316d50bc4fbb5d127cdd95726f3c7cdc7e713bb521f97afe4f4e91
diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index 8a4b3f70..98e99894 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -16,8 +16,7 @@ RDEPEND="x11-libs/libICE
 	!elibc_FreeBSD? (
 		uuid? ( >=sys-apps/util-linux-2.16 )
 	)"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index fa485c5e..0a2e3683 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1 +1 @@
-EBUILD libXaw-9999.ebuild 719 RMD160 4f67177d7e5bcfd8bd28bf8e0f26145733e7ae0f SHA1 ba72d3f0f37852bb2a7b5159629cc85b55c0a722 SHA256 7b7bfdc5aee96ae2716c136a4f030fec700baec612b9fa4adaa4fdaae5b7fcbf
+EBUILD libXaw-9999.ebuild 694 RMD160 1db7c777222e37a75195983407cd2cda0dfa8e47 SHA1 f1cf499de50360b0a22af6681ffdc7cdee2da48a SHA256 5ede7ea523d1e6ee5001e3aeab16a3815b5348857c6d58ec41307ee4bbea3407
diff --git a/x11-libs/libXaw/libXaw-9999.ebuild b/x11-libs/libXaw/libXaw-9999.ebuild
index f958f1aa..0c62d54e 100644
--- a/x11-libs/libXaw/libXaw-9999.ebuild
+++ b/x11-libs/libXaw/libXaw-9999.ebuild
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-proto/xproto
 	x11-proto/xextproto"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index 4fcec42f..6af57c6c 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1 +1 @@
-EBUILD libXcomposite-9999.ebuild 774 RMD160 1475a24a86d7c1fad59cb1133e00eec531149d28 SHA1 023f79399f93f4a53bd958a1f64f0af97d969763 SHA256 3727240c38df15b0a30c6fa07299761f45edca9818c25f39ae255c2148e7590a
+EBUILD libXcomposite-9999.ebuild 630 RMD160 96f633deb01a576c2641414a8f5edb84530aa26b SHA1 305c5fced78a386fa2abeb3698a9abd3190e6c5d SHA256 aabf7c7451fa826a613cf08cc2c17d93ae2ee994f948d257f93ce285cf4a380e
diff --git a/x11-libs/libXcomposite/libXcomposite-9999.ebuild b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
index e31dfd9a..c87a74ef 100644
--- a/x11-libs/libXcomposite/libXcomposite-9999.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/libXcomposite-0.4.2.ebuild,v 1.9 2010/10/21 01:15:22 ranger Exp $
+# $Header: $
 
 EAPI=4
 inherit xorg-2
@@ -15,10 +15,9 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	>=x11-proto/compositeproto-0.4
 	x11-proto/xproto"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
-src_configure() {
+pkg_setup() {
+	xorg-2_pkg_setup
 	CONFIGURE_OPTIONS="$(use_with doc xmlto)"
-	xorg-2_src_configure
 }
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index 2c64fa50..c93644f5 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1 +1 @@
-EBUILD libXdmcp-9999.ebuild 764 RMD160 25d5d6627d2a8c25e42e016c57d4e678ec99a46f SHA1 ca5c61def89fffad0e41137ef91ae82f33b638fe SHA256 cc9b06b048b9174139cbc5b63a64667b84794a1b1f62bc4f1e7e3a068831d4b7
+EBUILD libXdmcp-9999.ebuild 635 RMD160 1ee1f7ce9b16203deb6d5a7191fafcda018e2bfa SHA1 d0790971489c4b3c3861debd161dcb0d11391d75 SHA256 66892827f6788dd875e83830e674119239aeca443bd5904131360aa098fadf2a
diff --git a/x11-libs/libXdmcp/libXdmcp-9999.ebuild b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
index 3dce8896..4b1fba73 100644
--- a/x11-libs/libXdmcp/libXdmcp-9999.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXdmcp/libXdmcp-1.1.0.ebuild,v 1.1 2010/10/31 09:44:09 scarabeus Exp $
+# $Header: $
 
 EAPI=4
 inherit xorg-2
@@ -11,8 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="doc"
 
 RDEPEND="x11-proto/xproto"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index 2f464535..3d39db17 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1 +1 @@
-EBUILD libXext-9999.ebuild 773 RMD160 7a35793520da422faff9a9f547ab435513084418 SHA1 eb7a1cfbf161458630c402a954533c19641c3825 SHA256 649e380f8686dd2c89f8bc484b1620cb1e6d82ffc78cacd6fedd39ba980bd8d0
+EBUILD libXext-9999.ebuild 648 RMD160 8674adb8d60d01aa1c7923a013f21e2005b353ea SHA1 3e4b593e0f368086d91d27260f8eb3c57a75a64d SHA256 7e0093a5456326180ce84bc69242bc9864400900e0d0a37efc7839815b2185a9
diff --git a/x11-libs/libXext/libXext-9999.ebuild b/x11-libs/libXext/libXext-9999.ebuild
index fa3a0d7d..b50c9382 100644
--- a/x11-libs/libXext/libXext-9999.ebuild
+++ b/x11-libs/libXext/libXext-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.1.2.ebuild,v 1.10 2010/10/21 01:16:32 ranger Exp $
+# $Header: $
 
 EAPI=4
 inherit xorg-2
@@ -12,8 +12,7 @@ IUSE="doc"
 
 RDEPEND=">=x11-libs/libX11-1.2
 	>=x11-proto/xextproto-7.1"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_enable doc specs)
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index 35fe03d2..3fe00ca2 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1 +1 @@
-EBUILD libXfont-9999.ebuild 726 RMD160 cc1abe5e26e2404761cd05322e3292c766dbf284 SHA1 3060530b750df823411ebdea6f5c943bf92340dc SHA256 b15cdb92bc7b6d8e1e694a3280cf08a846f13828d1ee6483040c9a565e748e02
+EBUILD libXfont-9999.ebuild 597 RMD160 93c5de58f0f1eff025d528469a30ed7fdffe2dca SHA1 b273a3930e59974fbfa5fb9c94ed83242441f21a SHA256 170bc00444198a83a86546129e05d02fb0c168b81278289ef632e57ab98fb24c
diff --git a/x11-libs/libXfont/libXfont-9999.ebuild b/x11-libs/libXfont/libXfont-9999.ebuild
index 554f8a21..229073d2 100644
--- a/x11-libs/libXfont/libXfont-9999.ebuild
+++ b/x11-libs/libXfont/libXfont-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.3.ebuild,v 1.1 2010/10/29 08:56:28 scarabeus Exp $
+# $Header: $
 
 EAPI=4
 inherit xorg-2
@@ -16,8 +16,7 @@ RDEPEND="x11-libs/xtrans
 	app-arch/bzip2
 	x11-proto/xproto
 	x11-proto/fontsproto"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 702155f2..5f9ae242 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1 +1 @@
-EBUILD libXft-9999.ebuild 717 RMD160 06fa06bd6794345a390b9acf3d985143ff80556d SHA1 2b165a170b0c5c4e4e6d497a9269930fb43d6f14 SHA256 45a320ddb7fb870916a146dfdc16162139cf5219edeb7bb72bddd666eaec9076
+EBUILD libXft-9999.ebuild 617 RMD160 473dca445d7ae062988fca8dd269f4448aada66c SHA1 1680466a08bc28377211af0e13abff14c1c02c5c SHA256 ca440b100ea1c8fb2738287f25c90fa79ae3b5e93fdce073ded7f820c76b0641
diff --git a/x11-libs/libXft/libXft-9999.ebuild b/x11-libs/libXft/libXft-9999.ebuild
index e7ec6069..b48027ef 100644
--- a/x11-libs/libXft/libXft-9999.ebuild
+++ b/x11-libs/libXft/libXft-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.2.0.ebuild,v 1.2 2010/11/01 14:28:03 scarabeus Exp $
+# $Header: $
 
 EAPI=4
 inherit xorg-2 flag-o-matic
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 0fdf4915..e96153e3 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,2 +1,2 @@
-EBUILD libXi-9999.ebuild 1041 RMD160 64aa080a0893d91eca0a8747e2b57303d84aaa82 SHA1 11425238ae53870d7e21cd7b48390772d423529e SHA256 586a9471dacf452f8e1995f52dec46fbe51a0aa71bec408bc709628cd3af16c7
+EBUILD libXi-9999.ebuild 943 RMD160 d2fd32f916ef4687439962997fbb512e36101a5c SHA1 348f2ba6db90a80e1db554bbaefec8fc39e99cd8 SHA256 d74aa0e3c99180e122a65516fabe41010a8a8c9957c4ca18a00fbe6239bb5f7e
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libXi/libXi-9999.ebuild b/x11-libs/libXi/libXi-9999.ebuild
index 7f4aac4f..6ee0ee2f 100644
--- a/x11-libs/libXi/libXi-9999.ebuild
+++ b/x11-libs/libXi/libXi-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.3.1.ebuild,v 1.2 2010/08/03 09:11:33 scarabeus Exp $
+# $Header: $
 
 EAPI=4
 
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 0d958ac2..8605bf51 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1 +1 @@
-EBUILD libXmu-9999.ebuild 716 RMD160 21d12259498f545d65afa23061329684ec530e9a SHA1 36bd8d1234606c8a4aa016db9c14d97dd070bb56 SHA256 50fe34303e4be47f8fa7ef61c02fddeee0e59a501891ade831630e852bbb776e
+EBUILD libXmu-9999.ebuild 691 RMD160 aab86ed2620e7f0360311623e3bdf8ce006bc8eb SHA1 3b88ece12abc36bba922bafb8b3d193375413ad8 SHA256 6f232d5de6a695917d6ed8005d63ec7b76c27afd89dfad6256f6e24071c6285f
diff --git a/x11-libs/libXmu/libXmu-9999.ebuild b/x11-libs/libXmu/libXmu-9999.ebuild
index 6977ec42..b2f25c5b 100644
--- a/x11-libs/libXmu/libXmu-9999.ebuild
+++ b/x11-libs/libXmu/libXmu-9999.ebuild
@@ -14,8 +14,7 @@ RDEPEND="x11-libs/libXt
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-proto/xextproto"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
index 833282ee..634218a9 100644
--- a/x11-libs/libXpm/Manifest
+++ b/x11-libs/libXpm/Manifest
@@ -1 +1 @@
-EBUILD libXpm-9999.ebuild 964 RMD160 aed31f8af30b5de3184876f22a59b236984795ca SHA1 3eed7dfd3cee766cbe0627df9747c7e0d18144c5 SHA256 6716fac30268c2dc67eb82ef32513d9fe38c86c0898f327a3a6977a78e358951
+EBUILD libXpm-9999.ebuild 864 RMD160 57c5374b0ec33d12c1a5a115bf7ecf9e5b9043e8 SHA1 2aba98243c19d9bd88fdfd7e932972fefc4c0967 SHA256 80db2f0796c9190ac34311746adfc77fd08b14416969abe593377c3f9728118a
diff --git a/x11-libs/libXpm/libXpm-9999.ebuild b/x11-libs/libXpm/libXpm-9999.ebuild
index 2d812801..4af304ec 100644
--- a/x11-libs/libXpm/libXpm-9999.ebuild
+++ b/x11-libs/libXpm/libXpm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.9.ebuild,v 1.1 2010/10/31 10:47:40 scarabeus Exp $
+# $Header: $
 
 EAPI=4
 inherit xorg-2 flag-o-matic
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index bfd077eb..a0982066 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1 +1 @@
-EBUILD libXt-9999.ebuild 610 RMD160 f614a3c4108c943f95a9df9e026d79f5397a690d SHA1 9697c77ec7e3aa857422d91f86c4d985015861ea SHA256 a3dd5e54dbe75eb0df82cb564a43cafcfcafd93f94bf4429284e6e402666fdef
+EBUILD libXt-9999.ebuild 512 RMD160 efc9e1a60deada0e60c221bc3066f1a5af1d1a9a SHA1 1650764b3d2885035b21f6b0316ea63db7460cbe SHA256 588bb94d551b0670d7d1db943c5f8c9c92950e269fdef6ca1e7413fbc0280591
diff --git a/x11-libs/libXt/libXt-9999.ebuild b/x11-libs/libXt/libXt-9999.ebuild
index 884ade16..83e7b068 100644
--- a/x11-libs/libXt/libXt-9999.ebuild
+++ b/x11-libs/libXt/libXt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.0.8.ebuild,v 1.9 2010/10/28 11:43:34 scarabeus Exp $
+# $Header: $
 
 EAPI=4
 inherit xorg-2 toolchain-funcs
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index 3246dc05..c84e4903 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1 +1 @@
-EBUILD libfontenc-9999.ebuild 452 RMD160 3ebc00a51466989fb2fe77f84a54807b5f01166e SHA1 aa6eb0a36f4ca0994b65d4c45a77851f558a0d76 SHA256 81880afe592489bec05515bab6a822956ddc3297712d01f64ec4cc32f7dc979c
+EBUILD libfontenc-9999.ebuild 344 RMD160 c5f7048a5b1b26f95fab62c150220f662586f402 SHA1 1de0c8ab4921679088dd2ec0d32fa99c41e67595 SHA256 d316230ecf66bb9a7cd2aa91cc711ccc7cd8799367d8c2a4087be00dadc8bbab
diff --git a/x11-libs/libfontenc/libfontenc-9999.ebuild b/x11-libs/libfontenc/libfontenc-9999.ebuild
index 4cfec083..f7da19d0 100644
--- a/x11-libs/libfontenc/libfontenc-9999.ebuild
+++ b/x11-libs/libfontenc/libfontenc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/libfontenc-1.1.0.ebuild,v 1.1 2010/10/21 12:41:12 scarabeus Exp $
+# $Header: $
 
 EAPI=4
 inherit xorg-2
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index bd22356f..c1ac0cba 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,2 +1,2 @@
-EBUILD libpciaccess-9999.ebuild 531 RMD160 d7689e47c519f9462f35ec1182c4e027053c3981 SHA1 1486cb32cb4438969462c4b1a240fc16af206938 SHA256 c7b7c7c05a1e237c14ad7c0bc5bed6cbacb700526148df57f69348769c70d73a
+EBUILD libpciaccess-9999.ebuild 524 RMD160 73b4bf6291c0f624c51da03ae9e9f50ba4059aa9 SHA1 268150240631ede06c9b5a5df2d6ab8c29743443 SHA256 a436084ae26b2ed4df27401afd934e622e300cffb61d6ea2994a8be7394e57e9
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libpciaccess/libpciaccess-9999.ebuild b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
index b6029d3d..742c5296 100644
--- a/x11-libs/libpciaccess/libpciaccess-9999.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
@@ -18,6 +18,6 @@ CONFIGURE_OPTIONS="--with-pciids-path=/usr/share/misc"
 src_install() {
 	xorg-2_src_install
 	if ! use minimal; then
-		dobin scanpci/scanpci || die
+		dobin scanpci/scanpci
 	fi
 }
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index eb2112ef..be2089d3 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,2 +1,2 @@
 AUX pixman-0.12.0-sse.patch 536 RMD160 2eac636c530c1911765111766bb121b075d6b3dc SHA1 5a51a7f339faf1fd33b803442f27cca09e9eceb0 SHA256 2708f2fb856c706af9ae89570508afc1e72c05348d989ed813a3e2cc85582cf1
-EBUILD pixman-9999.ebuild 1398 RMD160 2e60243e110eb5d8d665bb97a6e72f8c45b93ce8 SHA1 ec1c56b745b71c539f86a530e499966a2f4a7829 SHA256 71dcc0ae1c259b0b31a2f15c40f8287bd196d62e798ed8650976a307f1c63240
+EBUILD pixman-9999.ebuild 1399 RMD160 71955f93b375791e336b17388c8038fae86c4786 SHA1 e3dc9ba0fb681d4f0d3f467893e2dce9679380f5 SHA256 4adaf3ce3a56f7abf010e94aed1b33c64409a4967233d647f664031610b900fa
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 40d95193..f1d44a15 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 EAPI=4
+
 inherit xorg-2 toolchain-funcs versionator
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index 68822e63..a02a7c22 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,2 +1,2 @@
-EBUILD xtrans-9999.ebuild 729 RMD160 67bf03086d3ff90e0e9ab06fca37d11a5ffd43d2 SHA1 3b39f4827c84831a9fc162a5f9eb35842fcb8a13 SHA256 61d8780b0e0d6b09774e71167e45b18f9a129039bb0d06f22ea2e2bcf97e0fd7
+EBUILD xtrans-9999.ebuild 704 RMD160 972b7d08a47213a4f5f53e543765a1f4c480f056 SHA1 2923a2e7d2910457db321b1715121aa6ddc39ee7 SHA256 354f3fe310c73ff74ba299ad3a4dc816240ffe752f03ac17e946def85d030452
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/xtrans/xtrans-9999.ebuild b/x11-libs/xtrans/xtrans-9999.ebuild
index 72f3ada0..c11e97b9 100644
--- a/x11-libs/xtrans/xtrans-9999.ebuild
+++ b/x11-libs/xtrans/xtrans-9999.ebuild
@@ -14,8 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="doc"
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_enable doc docs)
diff --git a/x11-misc/xcb-demo/Manifest b/x11-misc/xcb-demo/Manifest
index c76234f5..10d8817b 100644
--- a/x11-misc/xcb-demo/Manifest
+++ b/x11-misc/xcb-demo/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-demo-0.1.tar.bz2 80289 RMD160 2f76ad4b6d7d9b40d7142cc27ab314cc584794e4 SHA1 b580e9940cb9a2393cdc1d01ea2077c2d93845a4 SHA256 20753bb59558dc00311a5a296fc6c4b3fcff04b86b2579fcb459c89b17d733a4
-EBUILD xcb-demo-0.1.ebuild 567 RMD160 fec39ae1b2b9f1e6272720bcd4e12b3763d49984 SHA1 65e37140eeec83fd04f3fba35be6ada88f7d5f88 SHA256 acbc16de6bfad53de26d7376e7c882d6b149dca13a40779f3f60ef568c424269
+EBUILD xcb-demo-0.1.ebuild 400 RMD160 dc49cb3d17d6879db85a6143e538edd0ece32cf6 SHA1 bf5c384b1b4d9e85fcf33bc38116332e84e654d2 SHA256 00fedf4a7705c1168b8f6b40abd8bf3e094e2fd10171b2df4d41782ab9026dad
 EBUILD xcb-demo-9999.ebuild 450 RMD160 d29a1415538cfd0c207c624c79ff63f366606d21 SHA1 f95869ea9efd9d7e158b6b42a357056d60c1c34b SHA256 02986206a85a37acc9eadfdbdf60b7cc8fa81ede4ee87b9ef851fe9006a8e7ec
diff --git a/x11-misc/xcb-demo/xcb-demo-0.1.ebuild b/x11-misc/xcb-demo/xcb-demo-0.1.ebuild
index 651c6f90..e1380450 100644
--- a/x11-misc/xcb-demo/xcb-demo-0.1.ebuild
+++ b/x11-misc/xcb-demo/xcb-demo-0.1.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/xproto-7.0.5.ebuild,v 1.1 2006/04/29 04:23:28 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+# $Header: $
 
 EAPI=4
+
 inherit xorg-2
 
 DESCRIPTION="X C-language Bindings demos"
 SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
 RDEPEND="x11-libs/libxcb
 	x11-libs/xcb-util"
 DEPEND="${RDEPEND}"
diff --git a/x11-proto/bigreqsproto/Manifest b/x11-proto/bigreqsproto/Manifest
index 14416188..6876d56f 100644
--- a/x11-proto/bigreqsproto/Manifest
+++ b/x11-proto/bigreqsproto/Manifest
@@ -1 +1 @@
-EBUILD bigreqsproto-9999.ebuild 621 RMD160 3ee1132be993e549e0d92454f0ae7a515cc1eef4 SHA1 b17de702e003f1922d44172b5e9be3309882c72d SHA256 44c02acacc617070fc1d460d4505fcd50c826e547f9741b846fdfab4662f22f2
+EBUILD bigreqsproto-9999.ebuild 596 RMD160 ffeead250fbbf469ecf82bf4f07cd7adc7d8913f SHA1 ed118dbb0bd31741a57fc1834763e3b93f98138c SHA256 9682478c3b2605414099f1e432f21232694b73bd27742014dc26e4c1386b9f6e
diff --git a/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild b/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
index 913f7ac7..d8b56d06 100644
--- a/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
+++ b/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
@@ -11,8 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="doc"
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-proto/fontsproto/Manifest b/x11-proto/fontsproto/Manifest
index a4f4e1fa..740ea441 100644
--- a/x11-proto/fontsproto/Manifest
+++ b/x11-proto/fontsproto/Manifest
@@ -1 +1 @@
-EBUILD fontsproto-9999.ebuild 606 RMD160 c1c694e46e63fe6b06b05cb3f98c2bb5177b3ffa SHA1 d9a82f58d88b8e57d63b85a180821192975035f1 SHA256 31fb33ab9f5cca439d1b6d79dd53adb6d691d3a8abc9118c82efef787ef71805
+EBUILD fontsproto-9999.ebuild 581 RMD160 7a31042262f4710c9aad3e3de538fbd48c6ae537 SHA1 387126de616c6d444d44f1ef0bba9c0f38436efe SHA256 7bb4724fdd595ef368b069a4cccc517a595c926026347b13c7b28b09ef10a713
diff --git a/x11-proto/fontsproto/fontsproto-9999.ebuild b/x11-proto/fontsproto/fontsproto-9999.ebuild
index 4861c562..9e9b1050 100644
--- a/x11-proto/fontsproto/fontsproto-9999.ebuild
+++ b/x11-proto/fontsproto/fontsproto-9999.ebuild
@@ -11,8 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="doc"
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-proto/glproto/Manifest b/x11-proto/glproto/Manifest
index ac725421..f3dfa576 100644
--- a/x11-proto/glproto/Manifest
+++ b/x11-proto/glproto/Manifest
@@ -1 +1 @@
-EBUILD glproto-9999.ebuild 1235 RMD160 187fbc70e1c43d8b4557c3d38d2eb8143a6c7162 SHA1 1b8d4f6a5d06b9fb294817a1deaddcf2f339fbf7 SHA256 734a1d5a0907656ffc798668d98e53223d835ab75edc487716bc42facbf6ec49
+EBUILD glproto-9999.ebuild 1017 RMD160 3b1454c99a3cd9cc64cb23d94259eb5d2bf3937e SHA1 58412c4d6a9e701e739bf09c29c35985dc98be87 SHA256 64ab1bf4023089c5571f318361de2000982b0600cd096895678d25dd24225b78
diff --git a/x11-proto/glproto/glproto-9999.ebuild b/x11-proto/glproto/glproto-9999.ebuild
index a7d8d01f..5b15e8ce 100644
--- a/x11-proto/glproto/glproto-9999.ebuild
+++ b/x11-proto/glproto/glproto-9999.ebuild
@@ -4,11 +4,7 @@
 
 EAPI=4
 inherit xorg-2
-
-OPENGL_DIR="xorg-x11"
-
 DESCRIPTION="X.Org GL protocol headers"
-
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 LICENSE="SGI-B-2.0"
 IUSE=""
@@ -23,27 +19,19 @@ src_install() {
 
 pkg_postinst() {
 	xorg-2_pkg_postinst
-	switch_opengl_implem
+	eselect opengl set --use-old xorg-x11
 }
 
 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}/include
+		dodir /usr/$(get_libdir)/opengl/xorg-x11/include
 		local x=""
 		# glext.h added for #54984
 		for x in "${D}"/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do
 			if [[ -f ${x} || -L ${x} ]]; then
-				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/xorg-x11/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}
-}
+}
\ No newline at end of file
diff --git a/x11-proto/recordproto/Manifest b/x11-proto/recordproto/Manifest
index 2e135f9d..8e5b280d 100644
--- a/x11-proto/recordproto/Manifest
+++ b/x11-proto/recordproto/Manifest
@@ -1 +1 @@
-EBUILD recordproto-9999.ebuild 625 RMD160 84713b67ea4efea59fbce1bca5ec062e0e1817b4 SHA1 74669a4bb3c94f67daf995a263891a57cbba3318 SHA256 d1a5f4794b824723f67775380ba1b993e02f9e64ba41c3b9e44afb5dd5d0a173
+EBUILD recordproto-9999.ebuild 600 RMD160 9f9869065a5cc2478af04b08c9a301ea593ac7fd SHA1 6a655579643db8eaf9ab0602ef52cb1150798bdd SHA256 5632e322d567cca2fcd1d5a91a68f97f5b294a519810cf5aa88ca1edab792edc
diff --git a/x11-proto/recordproto/recordproto-9999.ebuild b/x11-proto/recordproto/recordproto-9999.ebuild
index 88196b46..00446025 100644
--- a/x11-proto/recordproto/recordproto-9999.ebuild
+++ b/x11-proto/recordproto/recordproto-9999.ebuild
@@ -11,8 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="doc"
 
 RDEPEND="!<x11-libs/libXtst-1.0.99.2"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-proto/scrnsaverproto/Manifest b/x11-proto/scrnsaverproto/Manifest
index f1568aa5..b03757f6 100644
--- a/x11-proto/scrnsaverproto/Manifest
+++ b/x11-proto/scrnsaverproto/Manifest
@@ -1 +1 @@
-EBUILD scrnsaverproto-9999.ebuild 610 RMD160 7f584f739f554f9115b78f478831406a8f795b06 SHA1 692aed0476c8cf15a8fbb9a71a635b265babda49 SHA256 b081de4ca0fc14d8f5a153d6032cdb8fd818ad9dbf6be93f795b74620b8c13a3
+EBUILD scrnsaverproto-9999.ebuild 585 RMD160 5ad2838c967facae1c180b1233e4f14798599541 SHA1 66c4511202d7b356d1a0e163ab0c8cfb1564e868 SHA256 0acc8a1a618553cc5bd00163015aad80ff40662fd0c41f5a854278bd292a6935
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
index b36e0ada..4410d30c 100644
--- a/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
@@ -11,8 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="doc"
 
 RDEPEND="!<x11-libs/libXScrnSaver-1.2"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-proto/xcmiscproto/Manifest b/x11-proto/xcmiscproto/Manifest
index 1ea37bb9..264a7f35 100644
--- a/x11-proto/xcmiscproto/Manifest
+++ b/x11-proto/xcmiscproto/Manifest
@@ -1 +1 @@
-EBUILD xcmiscproto-9999.ebuild 620 RMD160 290c3dd3207d5f91c77a5cecb52822cecf23e6e3 SHA1 3b901562eccce141134901514f39c0cf1551c72a SHA256 eac106696d25f3a24f71d6f430d231716645b8724b2e26ced6fba6e7aa0fcebf
+EBUILD xcmiscproto-9999.ebuild 595 RMD160 a4f666fab1f5f2a5a17a86a8e338333bfd131a45 SHA1 2227c8be71b1d64ed1ddd1f9d39c455f7a084aa9 SHA256 f9be986cc82d2b78ec65511b2a7544dedc6ce45450016af9ae41a65decacafd5
diff --git a/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild b/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
index 33e2ceef..cff619b1 100644
--- a/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
+++ b/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
@@ -11,8 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="doc"
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-proto/xextproto/Manifest b/x11-proto/xextproto/Manifest
index ffcf988f..27537379 100644
--- a/x11-proto/xextproto/Manifest
+++ b/x11-proto/xextproto/Manifest
@@ -1 +1 @@
-EBUILD xextproto-9999.ebuild 706 RMD160 b862fbcdd4522f3a6032ef438901dbca7ac18784 SHA1 4df2d9a8ac754ff66b525b5fe495710b52814a53 SHA256 af79232e23c3ba962865a89a4532c1ae84d78674a59262a9b03e58cb059b6559
+EBUILD xextproto-9999.ebuild 632 RMD160 bb06f2d181857faa31a28d2e1664286efbe4ad44 SHA1 abbc976d2fa4e03cd5e713705020a92d1fa799de SHA256 c0042f44476748e25d9de3b22701620193a089e9f36b56aa41c5cf1c77abcd4b
diff --git a/x11-proto/xextproto/xextproto-9999.ebuild b/x11-proto/xextproto/xextproto-9999.ebuild
index 507f9127..9d51507d 100644
--- a/x11-proto/xextproto/xextproto-9999.ebuild
+++ b/x11-proto/xextproto/xextproto-9999.ebuild
@@ -3,7 +3,6 @@
 # $Header: $
 
 EAPI=4
-
 inherit xorg-2
 
 DESCRIPTION="X.Org XExt protocol headers"
@@ -12,14 +11,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="doc"
 
 RDEPEND="!<x11-libs/libXext-1.0.99"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.3
-	)"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
+	xorg-2_pkg_setup
+
 	CONFIGURE_OPTIONS="
 		$(use_with doc xmlto)
 		--without-fop
diff --git a/x11-proto/xproto/Manifest b/x11-proto/xproto/Manifest
index cf5d3c62..0a2f807b 100644
--- a/x11-proto/xproto/Manifest
+++ b/x11-proto/xproto/Manifest
@@ -1 +1 @@
-EBUILD xproto-9999.ebuild 756 RMD160 7892c689319d7112e6aa7cb265b0e9b75e30cb9d SHA1 c4a82e8515a332b906b45cce7b4a21ae9354d710 SHA256 6f2966ed4370c2c6a0b6b15b1ef0b69f82c61d1832362799c4c0fe42e49d3c65
+EBUILD xproto-9999.ebuild 629 RMD160 016d31977dc1c77a67d02113994367698c88eca4 SHA1 76a56a3dc83ce0a9aca6dbee7f9d48aff3f7373d SHA256 85368a43e3f21c64cf1400fd7ea6901b910675204c22afd6d3790ee4b809242c
diff --git a/x11-proto/xproto/xproto-9999.ebuild b/x11-proto/xproto/xproto-9999.ebuild
index 27fca819..4011b6b5 100644
--- a/x11-proto/xproto/xproto-9999.ebuild
+++ b/x11-proto/xproto/xproto-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/xproto-7.0.18.ebuild,v 1.1 2010/08/10 14:34:04 scarabeus Exp $
+# $Header: $
 
 EAPI=4
 inherit xorg-2
@@ -10,8 +10,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="doc"
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup