Cleanup overlay and sync with main tree.

40 files changed, 69 insertions, 532 deletions

diff --git a/profiles/package.mask b/profiles/package.mask
index d10d2c1e..ee48f61d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,24 +1,6 @@
 # Beta
-=x11-libs/libX11-1.2.99*
-=x11-libs/libXi-1.2.99*
-=x11-libs/libXext-1.0.99*
-=x11-libs/libXinerama-1.0.99*
-=x11-libs/libXScrnSaver-1.2*
 =x11-libs/libXtst-1.0.99*
 =x11-libs/libXxf86vm-1.0.99*
-=x11-proto/bigreqsproto-1.1*
-
-# 1.7
-~x11-base/xorg-server-1.7.0
-~x11-libs/libX11-1.3
-~x11-libs/libXext-1.1
-~x11-libs/libXi-1.3
-~x11-libs/libXinerama-1.1
-
-
-
-# broken ATM (missing distfiles?)
-=app-admin/eselect-opengl-1.0.6-r2
 
 # Don't let people install these accidentally
 =media-libs/fontconfig-9999
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 850ae95f..c4bbe2bc 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,4 +1 @@
-AUX 0001-xkb-check-permissions-on-XKM_OUTPUT_DIR.patch 1371 RMD160 66e798ff629128eb7f8581d371b0562f537f37e6 SHA1 ec942c327edc35922156af748969a73d900823a3 SHA256 019f50bb9cc2ae1dbe627115f2d4d21a5e41fc2e3e6024e4e0f94af7e5db96c5
-DIST xorg-server-1.7.0.tar.bz2 4885401 RMD160 69c9126a0f7fcf8c84c2c544338f5a5b66a272fb SHA1 8b44511702f79ab9502d7b0936a6a19b392ba223 SHA256 e55996b1e4217f84c61fd8d1126d7171295d83ddfaa63c5c516c63bf4703a6c4
-EBUILD xorg-server-1.7.0-r1.ebuild 6837 RMD160 c3ff1bdddbbe662398718435741bfac43134f3e7 SHA1 aa51a2cadbd08ac347aff6245d15f89c335146a1 SHA256 1074a2ad2a2cd8bf9953190c1d2a764ff8172aa230fa6b18a4e78414361081b5
 EBUILD xorg-server-9999.ebuild 6753 RMD160 b5595d420e7baad6e57a669e0bf39705dd4e3443 SHA1 f9827e3e98e1f1728a0e5b53ae277cb103283bbe SHA256 fda4f5164fadf8ee6d2663118a4350a940bb5362315ff037b81fd71de76a464b
diff --git a/x11-base/xorg-server/files/0001-xkb-check-permissions-on-XKM_OUTPUT_DIR.patch b/x11-base/xorg-server/files/0001-xkb-check-permissions-on-XKM_OUTPUT_DIR.patch
deleted file mode 100644
index deff5e6f..00000000
--- a/x11-base/xorg-server/files/0001-xkb-check-permissions-on-XKM_OUTPUT_DIR.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9bc7cbf9c02656982c2525836b5498993f708e02 Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@gentoo.org>
-Date: Tue, 29 Sep 2009 22:35:06 +0530
-Subject: [PATCH 01/10] xkb: check permissions on XKM_OUTPUT_DIR
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Checking just for root is insufficient since that does not guarantee write/read
-permissions in XKM_OUTPUT_DIR (for example with sandbox).
-
-Check if we can write a file, as well as read it later. Otherwise, invoke the
-fallback to /tmp
-
-Signed-off-by: Nirbheek Chauhan <nirbheek@gentoo.org>
-Signed-off-by: Rémi Cardona <remi@gentoo.org>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- xkb/ddxLoad.c |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
-index 6954dd1..ba8d50b 100644
---- a/xkb/ddxLoad.c
-+++ b/xkb/ddxLoad.c
-@@ -158,10 +158,9 @@ OutputDirectory(
-     size_t size)
- {
- #ifndef WIN32
--    if (getuid() == 0 && (strlen(XKM_OUTPUT_DIR) < size))
-+    /* Can we write an xkm and then open it too? */
-+    if (access(XKM_OUTPUT_DIR, W_OK | X_OK) == 0 && (strlen(XKM_OUTPUT_DIR) < size))
-     {
--	/* if server running as root it *may* be able to write */
--	/* FIXME: check whether directory is writable at all */
- 	(void) strcpy (outdir, XKM_OUTPUT_DIR);
-     } else
- #else
--- 
-1.6.5.rc1
-
diff --git a/x11-base/xorg-server/xorg-server-1.7.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.7.0-r1.ebuild
deleted file mode 100644
index 6f018eb7..00000000
--- a/x11-base/xorg-server/xorg-server-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular 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} tslib hal ipv6 minimal nptl sdl"
-RDEPEND="hal? ( sys-apps/hal )
-	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
-	dev-libs/openssl
-	>=x11-libs/libXfont-1.3.3
-	>=x11-libs/xtrans-1.2.2
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libpciaccess-0.10.3
-	>=x11-libs/pixman-0.15.20
-	media-libs/freetype
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-1.4
-	x11-apps/xkbcomp
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	>=x11-apps/xinit-1.0.8-r3
-	>=app-admin/eselect-opengl-1.0.8
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.2
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.5
-		>=x11-libs/libXfixes-4.0.3
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		>=x11-libs/libXtst-1.0.3
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=x11-libs/libXres-1.0.3
-		>=media-libs/mesa-7.4[nptl=]
-	)
-	>=x11-libs/libxkbui-1.0.2
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent
-	# Xaw is dmx-dependent
-	# Xpm is dmx-dependent, pulls in Xt
-	# xkbcomp is launched at startup but not checked by ./configure
-
-## Deps that don't have a version in configure.ac but do here:
-# x11-proto/resourceproto
-# x11-proto/fontsproto
-# x11-libs/libXau
-# x11-libs/libXfont
-# x11-libs/libXdmcp
-# x11-libs/libXext
-# x11-libs/libX11
-# x11-libs/libXrender
-# x11-libs/libXmu
-# x11-libs/libXfixes
-# x11-libs/libXtst
-# x11-proto/xineramaproto
-# x11-proto/dmxproto
-## Deps that are larger here than in configure.ac
-# x11-libs/libpciaccess-0.8.0
-#
-
-DEPEND="${RDEPEND}
-	!!net-dialup/dtrace
-	sys-devel/flex
-	>=x11-proto/randrproto-1.2.99.3
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/fixesproto-4.1
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/xextproto-7.0.99.3
-	>=x11-proto/xproto-7.0.13
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/resourceproto-1.0.2
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/inputproto-1.9.99.902
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/glproto-1.4.9
-	dmx? ( >=x11-proto/dmxproto-2.2.2 )
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.1
-		>=x11-libs/libdrm-2.3.0
-	)"
-
-PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
-
-# These have been sent upstream
-UPSTREAMED_PATCHES=(
-	#"${WORKDIR}/patches/"
-	# Merged for 1.7.1
-	"${FILESDIR}/0001-xkb-check-permissions-on-XKM_OUTPUT_DIR.patch"
-	)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	)
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
-		conf_opts="${conf_opts} --disable-xsdl"
-	fi
-
-	# 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 tslib)
-		$(use_enable tslib xcalibrate)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xorg)
-		$(use_enable nptl glx-tls)
-		$(use_enable hal config-hal)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
-		--without-dtrace
-		${conf_opts}"
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Incompatible with GCC 3.x SSP on x86, bug #244352
-	if use x86 ; then
-		if [[ $(gcc-major-version) -lt 4 ]]; then
-			filter-flags -fstack-protector
-		fi
-	fi
-
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example (see bugs #151421 and #151670)
-		insinto /etc/X11
-		doins hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-
-	echo
-	ewarn "You must rebuild all drivers if upgrading from xorg-server 1.6"
-	ewarn "or earlier, because the ABI changed. If you cannot start X because"
-	ewarn "of module version mismatch errors, this is your problem."
-
-	echo
-	ewarn "You can generate a list of all installed packages in the x11-drivers"
-	ewarn "category using this command:"
-	ewarn "emerge portage-utils; qlist -I -C x11-drivers/"
-
-	ebeep 5
-	epause 10
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; 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() {
-	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 ${OLD_IMPLEM}
-}
-
-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."
-}
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 9d306c2a..afef4c82 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1 @@
-DIST libX11-1.3.tar.bz2 1900752 RMD160 00b0bb40df8bb2c97214b1f927846b24e1eda3d5 SHA1 af8f65b5e64de7bc6f5a780e042518a490c949cf SHA256 34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac
-EBUILD libX11-1.3.ebuild 1205 RMD160 d48946986db4df29b4fc4472ced2fa911fa0ad1c SHA1 f51c9ab2ff7f8d42a8870a876947fb58a4935b38 SHA256 63238dd4c3270d5684bafd851f4256b2e97b6d60ed82f68deacc0b1dac23249f
 EBUILD libX11-9999.ebuild 1301 RMD160 00d987d90181c5daf4898b1d457c5d15f78c730a SHA1 8a8ef0d92fe20aa5a4a401e6f3c2bde6311f3447 SHA256 f642a40b9341d8e6476f718b6c4d6fb6ada7289aecad4fda66663380e08e457c
diff --git a/x11-libs/libX11/libX11-1.3.ebuild b/x11-libs/libX11/libX11-1.3.ebuild
deleted file mode 100644
index df0ac871..00000000
--- a/x11-libs/libX11/libX11-1.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.2.2.ebuild,v 1.1 2009/08/06 09:52:16 remi Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-EAPI="1"
-
-inherit x-modular toolchain-funcs flag-o-matic
-
-DESCRIPTION="X.Org X11 library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64  ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 +xcb"
-
-RDEPEND=">=x11-libs/xtrans-1.2.3
-	x11-proto/kbproto
-	>=x11-proto/xproto-7.0.15
-	xcb? ( >=x11-libs/libxcb-1.2 )
-	!xcb? (
-		x11-libs/libXau
-		x11-libs/libXdmcp
-	)"
-DEPEND="${RDEPEND}
-	x11-proto/xf86bigfontproto
-	x11-proto/bigreqsproto
-	x11-proto/inputproto
-	x11-proto/xextproto
-	x11-proto/xcmiscproto
-	>=x11-misc/util-macros-1.2.1"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable ipv6)
-		$(use_with xcb)"
-	# xorg really doesn't like xlocale disabled.
-	# $(use_enable nls xlocale)
-}
-
-src_compile() {
-	x-modular_src_configure
-	# [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys'
-	( filter-flags -m* ; cd src/util && make CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all)
-	x-modular_src_make
-}
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index ae07f1fc..27c7eb6e 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,3 +1 @@
-DIST libXScrnSaver-1.2.0.tar.bz2 248744 RMD160 7b749f61d77e4022fbe081fe4039b302c6b4b509 SHA1 ea2935eb67efa77fd90372337f2d782a8ef74cea SHA256 5b067bec0f2eb6405226bde5f20ca107eb0e5c11f5e5e24b455930c450487f85
-EBUILD libXScrnSaver-1.2.0.ebuild 582 RMD160 f221fb2aa8d30f37a656bcd85d2221820b7c5f6e SHA1 47e649119867eae6c1578442deeb8d757a206d4e SHA256 d2f8ba2f1d336aac6ae296e394cedcbdb8989e8faf83fb6691ed6ceaacb138a8
 EBUILD libXScrnSaver-9999.ebuild 582 RMD160 f221fb2aa8d30f37a656bcd85d2221820b7c5f6e SHA1 47e649119867eae6c1578442deeb8d757a206d4e SHA256 d2f8ba2f1d336aac6ae296e394cedcbdb8989e8faf83fb6691ed6ceaacb138a8
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild
deleted file mode 100644
index bb504afb..00000000
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.1.3.ebuild,v 1.11 2009/06/23 21:24:12 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	>=x11-misc/util-macros-1.2
-	>=x11-proto/scrnsaverproto-1.2"
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index a7c77450..d1d5bc9e 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,3 +1 @@
-DIST libXext-1.1.tar.bz2 302451 RMD160 ccaa7a4a29f55c1a48aadc07ee50fec329f9679c SHA1 39a173c27b6407b978b62987d87a67763fd05ffd SHA256 5ebde6ef24d04db758ce60f5b99f96926ba1215547cdff88753d9a2b46fc3e26
-EBUILD libXext-1.1.ebuild 370 RMD160 d4e26941ea4a249b204e5c85bb3f6d0a7e1bc750 SHA1 5831115ffe70abf34b0c467fb5c74bef20b27cd1 SHA256 4eb27bf28516fb3e36e14f38852ef1a7a3ba1dc535130378f2d447edc9f91a1d
-EBUILD libXext-9999.ebuild 370 RMD160 ad4162dc6bc4eb34de92c8703e35b71ba5c6d803 SHA1 7ecf7576457dbc2964982921f2356ad2ad40d1cb SHA256 9f72ef74593144ddc2eb858cc6626d655f344d7fdf002448323644b5652fb95b
+EBUILD libXext-9999.ebuild 481 RMD160 9a85967bcb9f207a017f1b41386cdce64b4d72c5 SHA1 4e6f4e1dde897aa94d6017e0d14d858a1e7f6f1f SHA256 93c1766cea4891b46475be1b154721f11c275c5003cb586f3d742af9741f18e9
diff --git a/x11-libs/libXext/libXext-1.1.ebuild b/x11-libs/libXext/libXext-1.1.ebuild
deleted file mode 100644
index 7b415447..00000000
--- a/x11-libs/libXext/libXext-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xext library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND=">=x11-libs/libX11-1.1.99.1"
-DEPEND="${RDEPEND}
-	>=x11-proto/xextproto-7.0.99.2
-	>=x11-proto/xproto-7.0.13"
diff --git a/x11-libs/libXext/libXext-9999.ebuild b/x11-libs/libXext/libXext-9999.ebuild
index 2f16f5cb..cb517551 100644
--- a/x11-libs/libXext/libXext-9999.ebuild
+++ b/x11-libs/libXext/libXext-9999.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.1.ebuild,v 1.2 2009/10/03 15:18:55 scarabeus Exp $
 
 inherit x-modular
 
 DESCRIPTION="X.Org Xext library"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
 
-RDEPEND=">=x11-libs/libX11-1.1.99.1
-	>=x11-proto/xextproto-7.0.99.2"
+RDEPEND=">=x11-libs/libX11-1.2"
 DEPEND="${RDEPEND}
-	>=x11-proto/xproto-7.0.13"
+	>=x11-proto/xextproto-7.1
+	>=x11-proto/xproto-7.0.16"
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 17e5794b..c9a4d67d 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,4 +1,2 @@
-DIST libXi-1.3.tar.bz2 350827 RMD160 d7848e8dc9a6a3882bf722eccf75f21b5f99fecd SHA1 7685f2881ce40b13028d9409eedbb9cf1ed0d8ef SHA256 362b8c0c60386841063bd7e01afa72e37eb87ada6e64e539d960f88c780a944b
-EBUILD libXi-1.3.ebuild 604 RMD160 689c340fbb1d1978fe8d1890a7f5e7647455c5d3 SHA1 29435853708ba74caad0d5858f938d3daace22f0 SHA256 0e179ee91954ab2384b7c57a57ba14c43fe732c67f3b831f3b5e1d181b7bb9d1
-EBUILD libXi-9999.ebuild 592 RMD160 1ee595c57fac1334f1ffa92920cd4e72da0a9259 SHA1 0d39b9e0168add9a3965d47c4a25d4a17649f047 SHA256 a69f43011162091f8e44ee49682c42e336e19e180feae333ee7f773de98afd27
+EBUILD libXi-9999.ebuild 564 RMD160 6f7911224d24cecdbb118466d2eb0eac50739858 SHA1 8cb717918f3179f63d5f7e402be3a1ec943d4113 SHA256 d9bdb6099575f741386489a0b5aa1481f636d411f7204883660eb4d01d26dbee
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libXi/libXi-1.3.ebuild b/x11-libs/libXi/libXi-1.3.ebuild
deleted file mode 100644
index 1db09c55..00000000
--- a/x11-libs/libXi/libXi-1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xi library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.2.99.1
-	>=x11-libs/libXext-1.0.99.1"
-DEPEND="${RDEPEND}
-	~app-text/docbook-xml-dtd-4.3
-	>=x11-proto/xproto-7.0.13
-	>=x11-proto/inputproto-1.9.99"
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	ewarn "Some special keys and keyboard layouts may stop working."
-	ewarn "To fix them, recompile xorg-server."
-}
diff --git a/x11-libs/libXi/libXi-9999.ebuild b/x11-libs/libXi/libXi-9999.ebuild
index 40521b0c..87c887ca 100644
--- a/x11-libs/libXi/libXi-9999.ebuild
+++ b/x11-libs/libXi/libXi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -9,12 +9,14 @@ DESCRIPTION="X.Org Xi library"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=x11-libs/libX11-9999
-	>=x11-libs/libXext-9999"
+RDEPEND="
+	>=x11-libs/libX11-1.3
+	>=x11-libs/libXext-1.1
+	>=x11-proto/inputproto-2.0
+"
 DEPEND="${RDEPEND}
-	~app-text/docbook-xml-dtd-4.3
-	>=x11-proto/xproto-9999
-	>=x11-proto/inputproto-9999"
+	>=x11-proto/xproto-7.0.16
+"
 
 pkg_postinst() {
 	x-modular_pkg_postinst
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index c04f7336..d703c673 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,3 +1 @@
-DIST libXinerama-1.1.tar.bz2 245133 RMD160 2f5a9dbad4a6db093838e99b0f991a387a553c62 SHA1 5f445194ef3318f66c287c0c69f778988a3f9266 SHA256 e0d39e74c2e131b44cc98dd4910165c9b8d937df93be58e6afb7c2a56772bf34
-EBUILD libXinerama-1.1.ebuild 573 RMD160 13a839557422e59e0a1093d04eb335b7b5964d7c SHA1 5bf6623ab713c01c979d036a9cdc092f899a1e02 SHA256 52e92e749e06b1bdfe45ca6977ab3ccce8ba607e09c06f1a3a6c3a139410fa05
-EBUILD libXinerama-9999.ebuild 377 RMD160 348d8a5b0fce0b2bdcd25baf8705173089f19777 SHA1 2c5a7f4ed361aecee382ff276d02c6b0d04f72b1 SHA256 c8db7ba7c39f85ed052b5cb276c85e358cbbcfbc65538b2e2177d5db252b0704
+EBUILD libXinerama-9999.ebuild 568 RMD160 8909856159cc5c7e7ffb5d879b24175bc3a86957 SHA1 d79297271a6d3d19a59f45b01c4b170b52f07f3a SHA256 e314de11fca80420f426ed922b4db07a7c00e339cba10bf355a52839ae744eac
diff --git a/x11-libs/libXinerama/libXinerama-1.1.ebuild b/x11-libs/libXinerama/libXinerama-1.1.ebuild
deleted file mode 100644
index f4973e98..00000000
--- a/x11-libs/libXinerama/libXinerama-1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-1.0.3.ebuild,v 1.11 2009/06/23 20:56:55 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xinerama library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	>=x11-proto/xineramaproto-1.1.99.1"
diff --git a/x11-libs/libXinerama/libXinerama-9999.ebuild b/x11-libs/libXinerama/libXinerama-9999.ebuild
index 3dca1ab5..58554717 100644
--- a/x11-libs/libXinerama/libXinerama-9999.ebuild
+++ b/x11-libs/libXinerama/libXinerama-9999.ebuild
@@ -1,14 +1,18 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-1.0.3.ebuild,v 1.11 2009/06/23 20:56:55 klausman Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
 
 inherit x-modular
 
 DESCRIPTION="X.Org Xinerama library"
-
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xineramaproto
-	>=x11-misc/util-macros-1.2.1"
+	x11-proto/xextproto
+	>=x11-proto/xineramaproto-1.2"
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index 8f2aa25a..7295f9df 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1 +1 @@
-EBUILD libXxf86dga-9999.ebuild 372 RMD160 19da623e5218184ecce8cf996e645d400ded05c6 SHA1 fc8c1e86adaf7ccad6e83a94349792eb48d54746 SHA256 f973d60155301a11257bdd614d653d51bae7827ce39fca2b1b1f976a1dcd82bf
+EBUILD libXxf86dga-9999.ebuild 577 RMD160 d7b59abfdd0df4a6becee670a4fc3574d4aa59c0 SHA1 58106e15be83114121bb3dc58bc8a64f965c5a51 SHA256 e74eee907a94161e6723bfd592438d0449f8e972a55409ee6ac799ff760b277c
diff --git a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild b/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
index aa1cfe99..ff3e6c3f 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
@@ -1,14 +1,18 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86dga/libXxf86dga-1.0.2.ebuild,v 1.9 2009/05/05 07:53:53 ssuominen Exp $
+
+# Must be before x-modular eclass is inherited
+# SNAPSHOT="yes"
 
 inherit x-modular
 
 DESCRIPTION="X.Org Xxf86dga library"
-
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
+RDEPEND=">=x11-libs/libX11-1.3
+	>=x11-libs/libXext-1.1"
 DEPEND="${RDEPEND}
 	x11-proto/xproto
-	>=x11-proto/xf86dgaproto-2.0.3"
+	>=x11-proto/xf86dgaproto-2.1"
diff --git a/x11-proto/bigreqsproto/Manifest b/x11-proto/bigreqsproto/Manifest
index b339b3ef..a38a5340 100644
--- a/x11-proto/bigreqsproto/Manifest
+++ b/x11-proto/bigreqsproto/Manifest
@@ -1,3 +1 @@
-DIST bigreqsproto-1.1.0.tar.bz2 48575 RMD160 445f8bde2c03561255c505860fdba9fedb029edc SHA1 32ae0505ec963cc5c0e3ee9258b126e6865d1b1b SHA256 4864e12d3c5a99b0a9ee4704822455299345e6c65b23c688a4e4bf11481107bd
-EBUILD bigreqsproto-1.1.0.ebuild 525 RMD160 d03609c231df8b20b55faf0ca6798f61efebe87d SHA1 18ced02c55dfbdb2af1d558c6d2cba4b97448c77 SHA256 6db6159c2692247d785371c7e8dea394665b6a5d513511a157cb54f11a14a781
-EBUILD bigreqsproto-9999.ebuild 497 RMD160 068fe45a05d63370ce8ca1c6be56a462ddf564bd SHA1 75f8c722a73036de7dbb041027b08491906bff48 SHA256 556985414458951e7c30bc47d6f739f6395eed79274c852f59b9ce56d838ab6e
+EBUILD bigreqsproto-9999.ebuild 498 RMD160 1784879dd2c971deabb7fada862b510ffea0a727 SHA1 ffe9be66526042d5172714e000fa2bdaa11f7a58 SHA256 260f1aeac01947c9b3b049e9386e82cdc750079f3936e130c773daa705873351
diff --git a/x11-proto/bigreqsproto/bigreqsproto-1.1.0.ebuild b/x11-proto/bigreqsproto/bigreqsproto-1.1.0.ebuild
deleted file mode 100644
index fa32a7f5..00000000
--- a/x11-proto/bigreqsproto/bigreqsproto-1.1.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/bigreqsproto/bigreqsproto-1.0.2.ebuild,v 1.17 2009/05/05 14:59:08 fauli Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org BigReqs protocol headers"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=x11-misc/util-macros-1.2"
diff --git a/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild b/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
index 2e11c894..5cb1d667 100644
--- a/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
+++ b/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
@@ -11,5 +11,6 @@ DESCRIPTION="X.Org BigReqs protocol headers"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
+
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/x11-proto/dmxproto/Manifest b/x11-proto/dmxproto/Manifest
index de9e1bd0..e577177f 100644
--- a/x11-proto/dmxproto/Manifest
+++ b/x11-proto/dmxproto/Manifest
@@ -1 +1 @@
-EBUILD dmxproto-9999.ebuild 294 RMD160 c5e3a290451796bcd60b9f6a77893c323cf19674 SHA1 49ad09bad9debc188be46d914f63773d1d9858fd SHA256 9d1cc729bdb38b85991c4daba755d39a1fa1e4aab8d52e98cbfd2c871f832f84
+EBUILD dmxproto-9999.ebuild 481 RMD160 de56056b5feaeda9d624bd325e209659e7f4efdd SHA1 3737c51e53fb7b799ce92938d22109f96a5866ab SHA256 2c9c49029fc18addd6c65ab7df9acc2df4493e3c2007a6e3d309f77b07e63bac
diff --git a/x11-proto/dmxproto/dmxproto-9999.ebuild b/x11-proto/dmxproto/dmxproto-9999.ebuild
index 3e8dff07..6b7493d8 100644
--- a/x11-proto/dmxproto/dmxproto-9999.ebuild
+++ b/x11-proto/dmxproto/dmxproto-9999.ebuild
@@ -1,11 +1,16 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/dmxproto/dmxproto-2.2.99.1.ebuild,v 1.1 2009/09/19 08:28:31 remi Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
 
 inherit x-modular
 
 DESCRIPTION="X.Org DMX protocol headers"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64  ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/x11-proto/evieext/Manifest b/x11-proto/evieext/Manifest
index 1a69e3d4..9aefcd53 100644
--- a/x11-proto/evieext/Manifest
+++ b/x11-proto/evieext/Manifest
@@ -1 +1 @@
-EBUILD evieext-9999.ebuild 386 RMD160 7216f0e6c8de11b674d7a8fa1c96ae08a482416e SHA1 d96f6753007765109242290e81524f747873ff33 SHA256 9915e8fe1446445354573450369c7b379e89aa56ca6bec8cce4e8f4d418450e8
+EBUILD evieext-9999.ebuild 484 RMD160 464720bb91d3cf7038e19e7a96f613b1ba0ed439 SHA1 499718687156d55b0df9824226a2f2decb7e0d2f SHA256 f51694b1c8fdbae50a8a62214354aa0c456398e5de045a5a9d075e3ae586e94e
diff --git a/x11-proto/evieext/evieext-9999.ebuild b/x11-proto/evieext/evieext-9999.ebuild
index 129d557e..d4307eac 100644
--- a/x11-proto/evieext/evieext-9999.ebuild
+++ b/x11-proto/evieext/evieext-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/evieext/evieext-1.1.0.ebuild,v 1.1 2009/09/19 17:09:50 remi Exp $
 
 inherit x-modular
 
diff --git a/x11-proto/inputproto/Manifest b/x11-proto/inputproto/Manifest
index a1b4375c..31b2e039 100644
--- a/x11-proto/inputproto/Manifest
+++ b/x11-proto/inputproto/Manifest
@@ -1 +1 @@
-EBUILD inputproto-9999.ebuild 377 RMD160 7028b3f911f621f304b5b218eceede505efb3b36 SHA1 1539b09c3639d16cf08411545040ae59d849f7a1 SHA256 b4dfd7a65bae5d0c065ed8e9ba8fa91186a8dff0ccd297afd6ccee065b77da99
+EBUILD inputproto-9999.ebuild 486 RMD160 cdde8e6dd6ee8d2ca89abb8e1ed471c1fc12bc85 SHA1 dabb82ebd3566d73452e79a77ba8b2e81d0041b6 SHA256 19d550781e9c23dadf22ca77564d797924b064e58fe64608018b7bbaaed7c638
diff --git a/x11-proto/inputproto/inputproto-9999.ebuild b/x11-proto/inputproto/inputproto-9999.ebuild
index e5d2b333..93769d8e 100644
--- a/x11-proto/inputproto/inputproto-9999.ebuild
+++ b/x11-proto/inputproto/inputproto-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-1.9.99.902.ebuild,v 1.1 2009/09/19 08:47:14 remi Exp $
 
 EAPI="2"
 
diff --git a/x11-proto/recordproto/Manifest b/x11-proto/recordproto/Manifest
index 6a36ef20..d1e765dc 100644
--- a/x11-proto/recordproto/Manifest
+++ b/x11-proto/recordproto/Manifest
@@ -1 +1 @@
-EBUILD recordproto-9999.ebuild 408 RMD160 17bd850d9cb2a62df198df929a41b9e85ab002a5 SHA1 4f9d23226f98f691e4ec4fcbe7c1306f239ce6e1 SHA256 c65ef0cf6c2b826af59f89400c4458142a1a5547d08037f937fb9d498b8886f4
+EBUILD recordproto-9999.ebuild 491 RMD160 ffeae56b1b357e54d1eaa6263a4f428777fb75b6 SHA1 2ba1f8385e9367316e4a5b1c04c147a84fcf40fe SHA256 581e963337b900b97706cd6a1aacc5cd8db05cd2814f83e7cdf5d65b57423ded
diff --git a/x11-proto/recordproto/recordproto-9999.ebuild b/x11-proto/recordproto/recordproto-9999.ebuild
index 1da66415..9387301c 100644
--- a/x11-proto/recordproto/recordproto-9999.ebuild
+++ b/x11-proto/recordproto/recordproto-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/recordproto/recordproto-1.13.99.1.ebuild,v 1.1 2009/09/19 08:55:23 remi Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -13,5 +13,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
->=x11-misc/util-macros-1.2"
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/scrnsaverproto/Manifest b/x11-proto/scrnsaverproto/Manifest
index 4c17123e..c7c8e224 100644
--- a/x11-proto/scrnsaverproto/Manifest
+++ b/x11-proto/scrnsaverproto/Manifest
@@ -1 +1 @@
-EBUILD scrnsaverproto-9999.ebuild 452 RMD160 184d99da6acd2d7f17d32be46353d111174116c1 SHA1 1fa981035f9ff4eca3bdbc8637633b93dddb60ee SHA256 fb997d09f21e24bc1774645edff32ff85de9f381442345b8325fcecb41fdefb4
+EBUILD scrnsaverproto-9999.ebuild 514 RMD160 d9156851dc92f50c7d34362d0d9df870f4fbd8b7 SHA1 f72ceece771873fbb5cc3e2f5b8a6f30a9a7bbff SHA256 115636bbd1cebc566f34039a2fdfd032a71732e6aea0277e253b77312911ce8b
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
index 603fceb7..df8a9051 100644
--- a/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/scrnsaverproto/scrnsaverproto-1.2.0.ebuild,v 1.1 2009/09/19 09:32:20 remi Exp $
 
 EAPI="2"
 
@@ -14,7 +14,4 @@ DESCRIPTION="X.Org ScrnSaver protocol headers"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	!<x11-libs/libXScrnSaver-1.2
-	>=x11-misc/util-macros-1.2"
+RDEPEND="!<x11-libs/libXScrnSaver-1.2"
diff --git a/x11-proto/xcmiscproto/Manifest b/x11-proto/xcmiscproto/Manifest
index 63543a43..006a25c5 100644
--- a/x11-proto/xcmiscproto/Manifest
+++ b/x11-proto/xcmiscproto/Manifest
@@ -1 +1 @@
-EBUILD xcmiscproto-9999.ebuild 517 RMD160 180b65b65eedc5b4d47749e9ecd31b7b02e5eb1f SHA1 46233219bc1584db28280725a9230499ecf76c1d SHA256 8e4b90d3f1bdb8e0b371b18e00387dc96454d40dc7e97017a63ec24c5b272c53
+EBUILD xcmiscproto-9999.ebuild 492 RMD160 38d42430d2a6e13529a1b06245df9729c9e1dedf SHA1 1e3c3077bc85118cd689444997f73357c4533d70 SHA256 aa967c2781b9efc78c91f231142de51b827eab5309ead8d72878d4f316e22d68
diff --git a/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild b/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
index f26efc7b..b876541c 100644
--- a/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
+++ b/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcmiscproto/xcmiscproto-1.1.2.ebuild,v 1.17 2009/05/05 15:31:22 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcmiscproto/xcmiscproto-1.2.0.ebuild,v 1.2 2009/10/03 15:55:23 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -13,5 +13,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-	>=x11-misc/util-macros-1.2"
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xextproto/Manifest b/x11-proto/xextproto/Manifest
index 68a40db3..f9ea6759 100644
--- a/x11-proto/xextproto/Manifest
+++ b/x11-proto/xextproto/Manifest
@@ -1 +1 @@
-EBUILD xextproto-9999.ebuild 351 RMD160 bc53ce4f7c2383d2c3c18999559e3585016e5f07 SHA1 5ac70a1096d99b9be8656b8e772834c0d4d8b873 SHA256 75094548d266c7a0988330b2c51949d24b067dc56e8a953b1ce8bcc7fca67704
+EBUILD xextproto-9999.ebuild 432 RMD160 b9598b2c214bb566aee1adf1b246262265801b26 SHA1 fd058767a187512967cd21a0fdb5ff5973dd926d SHA256 feb988fe048285a2d5cdd3d2e47015febeb02c3b1b89313da1328e3df3f2dc37
diff --git a/x11-proto/xextproto/xextproto-9999.ebuild b/x11-proto/xextproto/xextproto-9999.ebuild
index 8091d802..c44f2c77 100644
--- a/x11-proto/xextproto/xextproto-9999.ebuild
+++ b/x11-proto/xextproto/xextproto-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xextproto/xextproto-7.1.1.ebuild,v 1.1 2009/09/19 11:49:56 remi Exp $
 
 EAPI="2"
 
@@ -11,6 +11,4 @@ DESCRIPTION="X.Org XExt protocol headers"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-!<x11-libs/libXext-1.0.99"
+RDEPEND="!<x11-libs/libXext-1.0.99"
diff --git a/x11-proto/xf86vidmodeproto/Manifest b/x11-proto/xf86vidmodeproto/Manifest
index 7dfd6d4a..c445ac1e 100644
--- a/x11-proto/xf86vidmodeproto/Manifest
+++ b/x11-proto/xf86vidmodeproto/Manifest
@@ -1 +1 @@
-EBUILD xf86vidmodeproto-9999.ebuild 390 RMD160 30da78dfa4f4fb40178feab56945e18a20ff7137 SHA1 8520845a987af2d2e20c96f5d53c0fa7e09dc417 SHA256 6bda9748e1ed1436318e46ad0f2eb21a43d10d4b3500b9a5c39709947cadd850
+EBUILD xf86vidmodeproto-9999.ebuild 332 RMD160 972860fc434e34b3e64d54a503cccd977f7919f4 SHA1 70fd63f0617741746a6b52b1e65a471d239d40df SHA256 e1e31bacbbd426d24d845b5d12d31d75d1bf7490469e9c3f71052ce4eb345447
diff --git a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild
index b755fa1d..b1362854 100644
--- a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild
+++ b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild
@@ -12,6 +12,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
->=x11-misc/util-macros-1.2
-!<x11-libs/libXxf86vm-1.0.99.1"
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xineramaproto/Manifest b/x11-proto/xineramaproto/Manifest
index 15a8ae59..c6c509c9 100644
--- a/x11-proto/xineramaproto/Manifest
+++ b/x11-proto/xineramaproto/Manifest
@@ -1 +1 @@
-EBUILD xineramaproto-9999.ebuild 376 RMD160 12ab79af3cec206e02eb9a7e14aad65111198ae2 SHA1 32620d5e79c1f130c85ef2656513f06b0dd4335b SHA256 6714a747719206c0df89c0eb270bf13e3b1b5a2ebb0673c0ebb7f307c4756905
+EBUILD xineramaproto-9999.ebuild 458 RMD160 6d3c087e868f27a6a58bb41f365f60825a6cc1c8 SHA1 9530da47d8c39217ba5cc61b3e305aaf1ae84f3c SHA256 aa11b288b8fe63050ccebd6857ce88b47107535f5eb40e1061fa447f34554659
diff --git a/x11-proto/xineramaproto/xineramaproto-9999.ebuild b/x11-proto/xineramaproto/xineramaproto-9999.ebuild
index 3f9a4681..6d5a3c4b 100644
--- a/x11-proto/xineramaproto/xineramaproto-9999.ebuild
+++ b/x11-proto/xineramaproto/xineramaproto-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xineramaproto/xineramaproto-1.2.ebuild,v 1.1 2009/10/02 15:12:36 scarabeus Exp $
 
 inherit x-modular
 
@@ -9,7 +9,5 @@ DESCRIPTION="X.Org Xinerama protocol headers"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-!<x11-libs/libXinerama-1.0.99
->=x11-misc/util-macros-1.2"
+RDEPEND="!<x11-libs/libXinerama-1.1"
+DEPEND="${RDEPEND}"