[x11-libs] Move proto stuff to rdepend to play on safe side.

65 files changed, 121 insertions, 115 deletions

diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index 40d37f41..bd5690ee 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -1 +1 @@
-EBUILD libFS-9999.ebuild 505 RMD160 04dcb064c6aa30b5581dff47fa8f09419ef2a853 SHA1 ce841d4db66b348a7c88640f0ac267d20c9d051e SHA256 0733ae595de383fac697a0e799200ad20520d9c71c3ad229ca8d2b31b8067639
+EBUILD libFS-9999.ebuild 541 RMD160 db435e607771736f69d63a1d4a59ccc5211df738 SHA1 bd2e28dff84b882c396ba8e0234619449af448a1 SHA256 74c0396a2cd7d8732365df7866a76e6d5ee4ced10639f6e3c2d48ee74ac182e3
diff --git a/x11-libs/libFS/libFS-9999.ebuild b/x11-libs/libFS/libFS-9999.ebuild
index 31c114fe..9fb220e3 100644
--- a/x11-libs/libFS/libFS-9999.ebuild
+++ b/x11-libs/libFS/libFS-9999.ebuild
@@ -10,9 +10,13 @@ DESCRIPTION="X.Org FS library"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="ipv6"
 
-RDEPEND="x11-libs/xtrans"
-DEPEND="${RDEPEND}
+RDEPEND="x11-libs/xtrans
 	x11-proto/xproto
 	x11-proto/fontsproto"
+DEPEND="${RDEPEND}"
 
-CONFIGURE_OPTIONS="$(use_enable ipv6)"
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	CONFIGURE_OPTIONS="$(use_enable ipv6)"
+}
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index d0a2771b..51bc3e74 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1 +1 @@
-EBUILD libICE-9999.ebuild 708 RMD160 9f13d19d7ff5eaf91d61d80d4af3ddf07bebb9b3 SHA1 01046f8cec407b2626dd38f6cb3ff40503ee11a8 SHA256 9a9e5da65adb0fc2cb7f45caef85aeeea9ccca95b711aa8df476d51940e10e4f
+EBUILD libICE-9999.ebuild 727 RMD160 65a188bbc91061283a993f03198d9c988914a7d1 SHA1 2404b645ff24d2658c005f562aa3830fc0ab1cac SHA256 e503e92ec467159ae418f07315af05bdfa086b4bef2e024719e58a161db7761d
diff --git a/x11-libs/libICE/libICE-9999.ebuild b/x11-libs/libICE/libICE-9999.ebuild
index 786d516b..e968599e 100644
--- a/x11-libs/libICE/libICE-9999.ebuild
+++ b/x11-libs/libICE/libICE-9999.ebuild
@@ -16,6 +16,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-text/xmlto )"
 
 pkg_setup() {
+	xorg-2_pkg_setup
+
 	CONFIGURE_OPTIONS="$(use_enable ipv6)
 		$(use_enable doc docs)
 		$(use_enable doc specs)
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 7315622e..85a0d3b0 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1 +1 @@
-EBUILD libSM-9999.ebuild 716 RMD160 36142b9424ee934e752c13c62743ceef567205ec SHA1 16ea1503218c2a1c16abe88cbd7ba1226765a8e7 SHA256 8fc86a4323b6b8438ba0a953a6d27e5003667620c2116f36d8a81fbd36316f47
+EBUILD libSM-9999.ebuild 735 RMD160 90745c47ce0b1201f54fda29158d82c23ac6190b SHA1 23c10ccdbd91ce4801fc88034a0bfe5609486717 SHA256 74449fbb6b803527d633b66f455a30eed5bfaac406068477e9e7e31e591ccf3c
diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index 7a262ea0..6e4300f5 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -12,14 +12,16 @@ IUSE="doc ipv6 +uuid"
 
 RDEPEND="x11-libs/libICE
 	x11-libs/xtrans
+	x11-proto/xproto
 	!elibc_FreeBSD? (
 		uuid? ( >=sys-apps/util-linux-2.16 )
 	)"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
 	doc? ( app-text/xmlto )"
 
 pkg_setup() {
+	xorg-2_pkg_setup
+
 	CONFIGURE_OPTIONS="$(use_enable ipv6)
 		$(use_enable doc docs)
 		$(use_with doc xmlto)
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 70b7b0ea..e37b3677 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,3 @@
 DIST libX11-1.3.99.903.tar.bz2 2094153 RMD160 9fe9276c4d7fa77a0bf3c566ca626afacc162ed8 SHA1 fefaa5e73381a85e864691863de4e2531a57fba5 SHA256 50205aad0646c0ab13aff8e8eaec7c5cddff416d3a012f83c5661ad98e49736f
-EBUILD libX11-1.3.99.903.ebuild 924 RMD160 833f218c0740bfde9cca79d5278f1ca39056dd0c SHA1 7efd45e5dd016c623b41fbc258d3c706e3b458d4 SHA256 ae644e7ce0326c6b00f82cdebd0deecc4c40550e641b6a421b9832a96d0e0c57
-EBUILD libX11-9999.ebuild 924 RMD160 833f218c0740bfde9cca79d5278f1ca39056dd0c SHA1 7efd45e5dd016c623b41fbc258d3c706e3b458d4 SHA256 ae644e7ce0326c6b00f82cdebd0deecc4c40550e641b6a421b9832a96d0e0c57
+EBUILD libX11-1.3.99.903.ebuild 924 RMD160 c7ac0128808a555726ef100321d06cb171287523 SHA1 1465701d35f148f08d1b8d98557c6af78b16d533 SHA256 edfc4bbf8641cb0de2b9d9ebff3950179658008130c51a53780c4e85b03f566d
+EBUILD libX11-9999.ebuild 924 RMD160 d246ec970724dd8ccb27d7abd981e9946eb5aa95 SHA1 f5ef30f53c7a2b3628f9d5910dfe63dd902c3a57 SHA256 06596b93901e6fd2d198b220a351b34f1567e13dcfeec01e37e83ba6a7ac0ab6
diff --git a/x11-libs/libX11/libX11-1.3.99.903.ebuild b/x11-libs/libX11/libX11-1.3.99.903.ebuild
index 9b78887a..3cee627b 100644
--- a/x11-libs/libX11/libX11-1.3.99.903.ebuild
+++ b/x11-libs/libX11/libX11-1.3.99.903.ebuild
@@ -11,15 +11,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="doc ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.1.92
-	x11-libs/xtrans"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )
-	test? ( dev-lang/perl )
+	x11-libs/xtrans
 	x11-proto/xf86bigfontproto
 	x11-proto/inputproto
 	x11-proto/kbproto
 	x11-proto/xextproto
 	>=x11-proto/xproto-7.0.13"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )
+	test? ( dev-lang/perl )"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
index 9b78887a..178fbd0c 100644
--- a/x11-libs/libX11/libX11-9999.ebuild
+++ b/x11-libs/libX11/libX11-9999.ebuild
@@ -11,15 +11,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="doc ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.1.92
-	x11-libs/xtrans"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )
-	test? ( dev-lang/perl )
+	x11-libs/xtrans
+	>=x11-proto/xproto-7.0.13
 	x11-proto/xf86bigfontproto
 	x11-proto/inputproto
 	x11-proto/kbproto
-	x11-proto/xextproto
-	>=x11-proto/xproto-7.0.13"
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )
+	test? ( dev-lang/perl )"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-libs/libXTrap/Manifest b/x11-libs/libXTrap/Manifest
index 7e19d2ba..51a4b57d 100644
--- a/x11-libs/libXTrap/Manifest
+++ b/x11-libs/libXTrap/Manifest
@@ -1 +1 @@
-EBUILD libXTrap-9999.ebuild 381 RMD160 fb410ce7039a754ec1a232586586b58d6bd44ba2 SHA1 0a23801950d0e0da6480806ab78aede0e24c71e4 SHA256 786517727d1f3e71631562181f52497899d27fb9a39ad30eac6cc72b9a822773
+EBUILD libXTrap-9999.ebuild 381 RMD160 8122fdc6a75364bffe491d275e799f9141634f78 SHA1 393a0114fee4576567ee6119d06cfc60325a02e0 SHA256 8ed0c950c81ff82e9bd14d6442a949e46ba1b36671d14eda83336632b1dfd70e
diff --git a/x11-libs/libXTrap/libXTrap-9999.ebuild b/x11-libs/libXTrap/libXTrap-9999.ebuild
index a54d99bc..0f83075a 100644
--- a/x11-libs/libXTrap/libXTrap-9999.ebuild
+++ b/x11-libs/libXTrap/libXTrap-9999.ebuild
@@ -12,6 +12,6 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
+	x11-libs/libXext
 	x11-proto/trapproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index c3c76476..29809998 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1 +1 @@
-EBUILD libXaw-9999.ebuild 700 RMD160 0c48fda06e6150dde698946900c98049a2f03d00 SHA1 be00a97c622393e357ed7440efb1e68a54e47d73 SHA256 a4dc36bab1fb5f523df0074e4e3960ba497ad7ba9cdc048e2b6e9b2812ee9a02
+EBUILD libXaw-9999.ebuild 719 RMD160 2e30b9594953cc5efe824a0563e5287a0357883f SHA1 490528dac9d9267e0612815fe5d6f21675e3f428 SHA256 279bca3613cef5bb367538a1db2d2d961658846d5534912eacd377d983d9039f
diff --git a/x11-libs/libXaw/libXaw-9999.ebuild b/x11-libs/libXaw/libXaw-9999.ebuild
index f6649aad..27397c31 100644
--- a/x11-libs/libXaw/libXaw-9999.ebuild
+++ b/x11-libs/libXaw/libXaw-9999.ebuild
@@ -14,13 +14,15 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXt
 	x11-libs/libXmu
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
+	x11-libs/libXpm
 	x11-proto/xproto
-	x11-proto/xextproto
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}
 	doc? ( app-text/xmlto )"
 
 pkg_setup() {
+	xorg-2_pkg_setup
+
 	CONFIGURE_OPTIONS="$(use_enable doc specs)
 		$(use_with doc xmlto)
 		--without-fop"
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index 922149cb..bbdf940f 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1 +1 @@
-EBUILD libXcursor-9999.ebuild 833 RMD160 ef3718006b67637409961d2a34a5bdc5fe933fef SHA1 94e746c311de9aaed8c5a36b5d886aa56d20c703 SHA256 303414e1da198e84120bdab9d1460fd681f710f621373da0f209bfb0ef125766
+EBUILD libXcursor-9999.ebuild 811 RMD160 874d04920dd6e0554dc80455ed0c46c6a5d46044 SHA1 0fe8cd793fbb933cf13429287bf35b8c0a048eb2 SHA256 d49fc12fff320079056362eaf8b30b898f6216277bd93230d03c599f7bc885c0
diff --git a/x11-libs/libXcursor/libXcursor-9999.ebuild b/x11-libs/libXcursor/libXcursor-9999.ebuild
index 55ae56e5..229e6744 100644
--- a/x11-libs/libXcursor/libXcursor-9999.ebuild
+++ b/x11-libs/libXcursor/libXcursor-9999.ebuild
@@ -13,8 +13,7 @@ IUSE=""
 RDEPEND=">=x11-libs/libXrender-0.8.2
 	x11-libs/libXfixes
 	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/fixesproto"
+DEPEND="${RDEPEND}"
 
 CONFIGURE_OPTIONS="--with-icondir=/usr/share/cursors/xorg-x11
 	--with-cursorpath=~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps"
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index 5232029b..80ed9a89 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1 +1 @@
-EBUILD libXdmcp-9999.ebuild 766 RMD160 e181f416871d7da2cc67d9882fb766a4242b2c90 SHA1 c4c4bdb1ba96c4283fee997488484e31ef6fa1e4 SHA256 0469e6a7d3b8225b034ffd4fbffb3b5dd410557738b4af16afde7539f9294b04
+EBUILD libXdmcp-9999.ebuild 764 RMD160 b45a2a614c96ad3688cc8b09079da9a846bc4bec SHA1 059e97a3964538171ad18028092664bb4b72e397 SHA256 10f349867749692562b6ca14628f857af7fb824e685a96bb695b8d81dd288bed
diff --git a/x11-libs/libXdmcp/libXdmcp-9999.ebuild b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
index e7174b6a..cfe9a931 100644
--- a/x11-libs/libXdmcp/libXdmcp-9999.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
@@ -10,9 +10,8 @@ DESCRIPTION="X.Org Xdmcp library"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc"
 
-RDEPEND=""
+RDEPEND="x11-proto/xproto"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
 	doc? ( app-text/xmlto )"
 
 pkg_setup() {
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index 690e901c..e783345c 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1 +1 @@
-EBUILD libXext-9999.ebuild 810 RMD160 cda6903631890f311628654d377e7cb6e7641f24 SHA1 c0299db383b4144dd4d56fe397f6cee60e7b05d8 SHA256 0e2db98a6527c621e0be47910c25880560c7b3777eaf4a2ea4f6e718ae204d64
+EBUILD libXext-9999.ebuild 783 RMD160 8d8da4ab5dba3c2adac8f8337c03b76926e7ca27 SHA1 1bd296c9689426f2e8ce46be33b7a16352e000d8 SHA256 f1059dd30920f044e815f8868e6dbc9c9e850196e69dd5d8707bcf43967551b9
diff --git a/x11-libs/libXext/libXext-9999.ebuild b/x11-libs/libXext/libXext-9999.ebuild
index 63055b78..aad00f24 100644
--- a/x11-libs/libXext/libXext-9999.ebuild
+++ b/x11-libs/libXext/libXext-9999.ebuild
@@ -10,10 +10,9 @@ DESCRIPTION="X.Org Xext library"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc"
 
-RDEPEND=">=x11-libs/libX11-1.2"
+RDEPEND=">=x11-libs/libX11-1.2
+	>=x11-proto/xextproto-7.1"
 DEPEND="${RDEPEND}
-	>=x11-proto/xextproto-7.1
-	>=x11-proto/xproto-7.0.13
 	doc? ( app-text/xmlto )"
 
 pkg_setup() {
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index 3e6221b0..da81fff6 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1 +1 @@
-EBUILD libXfixes-9999.ebuild 546 RMD160 4819c1d65aa63bcdd0d4a5de67fbd4330017f71e SHA1 e88aea2a83fdd6358642189fc8769a22a5a5294c SHA256 ad5818e2680c59ebd1fa86133aebc49f978b2f60deeadae88575593bfdc49846
+EBUILD libXfixes-9999.ebuild 546 RMD160 cdd11de3b398051dc5f72fd783ee13db1555f99b SHA1 195a4f23a2da96f32f19dc607d02c1daf224db6d SHA256 28216ce2bfc3d32f00d6096570e091252a7b1f1825e662ca3300d003ae9a1712
diff --git a/x11-libs/libXfixes/libXfixes-9999.ebuild b/x11-libs/libXfixes/libXfixes-9999.ebuild
index 59a92a3a..90cd62ef 100644
--- a/x11-libs/libXfixes/libXfixes-9999.ebuild
+++ b/x11-libs/libXfixes/libXfixes-9999.ebuild
@@ -12,6 +12,6 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	>=x11-proto/fixesproto-4
-	x11-proto/xproto"
-DEPEND="${RDEPEND}
+	x11-proto/xproto
 	x11-proto/xextproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index 5bb241c3..199a885d 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1 +1 @@
-EBUILD libXfont-9999.ebuild 726 RMD160 eb41afb5f863b627bea1e777b6bf7794ad85d8bb SHA1 889e38af475bace0349e13391632f90cc73ede4e SHA256 7f3def67d78dc246103ab122d4796db1da2e31d713de213d4fefc8dec56011f8
+EBUILD libXfont-9999.ebuild 726 RMD160 12ead9e1bea455ec4e36da4cb8be85134eb6d7b6 SHA1 49743dff813f357f0671ba05a63f6557936931a6 SHA256 2bf5dabcd61d0093c1b93b93a45155e83489762c0dd9ffd9b52626f4b90024b1
diff --git a/x11-libs/libXfont/libXfont-9999.ebuild b/x11-libs/libXfont/libXfont-9999.ebuild
index 700cd5e4..fb5b8618 100644
--- a/x11-libs/libXfont/libXfont-9999.ebuild
+++ b/x11-libs/libXfont/libXfont-9999.ebuild
@@ -13,10 +13,10 @@ IUSE="doc ipv6"
 RDEPEND="x11-libs/xtrans
 	x11-libs/libfontenc
 	>=media-libs/freetype-2
-	app-arch/bzip2"
-DEPEND="${RDEPEND}
+	app-arch/bzip2
 	x11-proto/xproto
-	x11-proto/fontsproto
+	x11-proto/fontsproto"
+DEPEND="${RDEPEND}
 	doc? ( app-text/xmlto )"
 
 pkg_setup() {
diff --git a/x11-libs/libXfontcache/Manifest b/x11-libs/libXfontcache/Manifest
index e2390c54..750c5766 100644
--- a/x11-libs/libXfontcache/Manifest
+++ b/x11-libs/libXfontcache/Manifest
@@ -1 +1 @@
-EBUILD libXfontcache-9999.ebuild 461 RMD160 599feae74de47ebb152a68f6b865ad390a9244f1 SHA1 8bba750307dc7a046b385845e2ec43a7785c9e82 SHA256 b0af2d92f095555adf34f63db1702c9e751924fbb90cf331d7408674f7148a6b
+EBUILD libXfontcache-9999.ebuild 461 RMD160 3992869db8ebc64b3f05839edaaaf8446366e9e6 SHA1 b02f3f19589322b84e64d4ca76c168e01db91868 SHA256 c803b6bccbb1da48b04502ed01653812bf2048d70a94372a6925a233eb65bf2c
diff --git a/x11-libs/libXfontcache/libXfontcache-9999.ebuild b/x11-libs/libXfontcache/libXfontcache-9999.ebuild
index 99fdc93c..95cdad6e 100644
--- a/x11-libs/libXfontcache/libXfontcache-9999.ebuild
+++ b/x11-libs/libXfontcache/libXfontcache-9999.ebuild
@@ -11,6 +11,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
+	x11-libs/libXext
 	x11-proto/fontcacheproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index c75fdcf7..f16e91ee 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1 +1 @@
-EBUILD libXft-9999.ebuild 698 RMD160 db2ac46a9bdf35b0f2a52e298b832810295d3fcc SHA1 4e7abdb8b930e21125287adbb6157511aef607d7 SHA256 c0362d22537001081ad3e3bf7762177452e96ab059e34fbc3c8013eb750b5567
+EBUILD libXft-9999.ebuild 698 RMD160 eaec148bf04a09135487f6aaf6db06c36c5af3b4 SHA1 0b814f52ff6b100659f42c66c16925055ea3382a SHA256 21b49c875c5bbbcf8fb7d7c8905a077572c4ec823d806d857ba3a12695f5814c
diff --git a/x11-libs/libXft/libXft-9999.ebuild b/x11-libs/libXft/libXft-9999.ebuild
index 4a597b99..992775bc 100644
--- a/x11-libs/libXft/libXft-9999.ebuild
+++ b/x11-libs/libXft/libXft-9999.ebuild
@@ -14,6 +14,6 @@ RDEPEND=">=x11-libs/libXrender-0.8.2
 	x11-libs/libX11
 	x11-libs/libXext
 	media-libs/freetype
-	media-libs/fontconfig"
-DEPEND="${RDEPEND}
+	media-libs/fontconfig
 	x11-proto/xproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 2abb3847..bf2be11b 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,2 +1,2 @@
-EBUILD libXi-9999.ebuild 978 RMD160 8cf72703730114d24433937c8de258e4f8101cd4 SHA1 22abae9656be0502bfdfbaba8127a07ebb1ccce2 SHA256 eb6ee7f78d35a14009238b2b3e74fd3827e23b76d54b6f869ee916c59947ca2c
+EBUILD libXi-9999.ebuild 978 RMD160 c71f3e6435e3b21870edba2647bd76c5288574b7 SHA1 517a137ce371014f25bb89d151f0d16523faea20 SHA256 6ccc5b0a7bc60ca0676082f09aabd89910b592c9f862c264073b02d0cf350388
 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 eccfa320..c9d09dda 100644
--- a/x11-libs/libXi/libXi-9999.ebuild
+++ b/x11-libs/libXi/libXi-9999.ebuild
@@ -14,9 +14,9 @@ RDEPEND="
 	>=x11-libs/libX11-1.3
 	>=x11-libs/libXext-1.1
 	>=x11-proto/inputproto-2.0
+	>=x11-proto/xproto-7.0.16
 "
 DEPEND="${RDEPEND}
-	>=x11-proto/xproto-7.0.16
 	doc? (
 		app-text/asciidoc
 		app-text/xmlto
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index ad2d7ff6..b4971f11 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1 +1 @@
-EBUILD libXinerama-9999.ebuild 512 RMD160 38f3bcd9c0be6edc7f7be332099e3bf266310c7a SHA1 3edb464a525a90ad92e4112e803d271ba5420d94 SHA256 eb63b8d830813e84fd4402ae044490b9144bd90ba701c7557ba24271077c155d
+EBUILD libXinerama-9999.ebuild 512 RMD160 214912f1dac3ae7ae06ced9b4253d448de46daad SHA1 16e110acb9e99b3b2c0600abf5e4a97ee0177289 SHA256 48b74e4e62cbe563e1decf939953aa23b8be3f9d0c9f241b978cc65dbfb00d8b
diff --git a/x11-libs/libXinerama/libXinerama-9999.ebuild b/x11-libs/libXinerama/libXinerama-9999.ebuild
index e2befbb1..4298e574 100644
--- a/x11-libs/libXinerama/libXinerama-9999.ebuild
+++ b/x11-libs/libXinerama/libXinerama-9999.ebuild
@@ -11,7 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
+	x11-libs/libXext
 	x11-proto/xextproto
 	>=x11-proto/xineramaproto-1.2"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 9a513db6..77f1a547 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1 +1 @@
-EBUILD libXmu-9999.ebuild 716 RMD160 b01497a95710d9ef574c80f419daf9aeadf2bceb SHA1 a8295ac7692b7e2515789a93bdaed2019d33511a SHA256 377a310211c739c31895948e4f9dd213fee3967a9d065665af8aff0170c786a9
+EBUILD libXmu-9999.ebuild 716 RMD160 e48290cea8b0cc12fa417d0a31e7b47fe16f88aa SHA1 7a52ff7320d4f3af48c4e0238b8849ecb52c0a4b SHA256 e391a1e2b1deee5484544aaeb88db3a8bef7167c5217987d884dd00b2119f50b
diff --git a/x11-libs/libXmu/libXmu-9999.ebuild b/x11-libs/libXmu/libXmu-9999.ebuild
index d06a95c2..162c8c89 100644
--- a/x11-libs/libXmu/libXmu-9999.ebuild
+++ b/x11-libs/libXmu/libXmu-9999.ebuild
@@ -12,9 +12,9 @@ IUSE="doc ipv6"
 
 RDEPEND="x11-libs/libXt
 	x11-libs/libXext
-	x11-libs/libX11"
+	x11-libs/libX11
+	x11-proto/xextproto"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
 	doc? ( app-text/xmlto )"
 
 pkg_setup() {
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
index 2d4ece5a..70f2ef94 100644
--- a/x11-libs/libXpm/Manifest
+++ b/x11-libs/libXpm/Manifest
@@ -1 +1 @@
-EBUILD libXpm-9999.ebuild 964 RMD160 36e539720428f1081e2a71a5ee89996844271f70 SHA1 42b7b9ff7324e1c760ef0fb493b13bac47fd27c2 SHA256 14384faec22dc4fb5f0f44761fe2a704e9ccf9e262d9911cdecf1747dd983f76
+EBUILD libXpm-9999.ebuild 964 RMD160 124b88887b2f63203af99f7f954edd288ff0523e SHA1 6820bc1a701c73d6e2c3a2ac0d77a9fc50b28fb3 SHA256 c5e62c8c71f3e2ef1f4e37b7503e4d466470958f9892eaf9ce95ef67ea7d1829
diff --git a/x11-libs/libXpm/libXpm-9999.ebuild b/x11-libs/libXpm/libXpm-9999.ebuild
index d2395fd2..fc7b97e1 100644
--- a/x11-libs/libXpm/libXpm-9999.ebuild
+++ b/x11-libs/libXpm/libXpm-9999.ebuild
@@ -12,11 +12,11 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
+	x11-libs/libXext
 	x11-proto/xextproto
 	x11-proto/xproto"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
 
 src_compile() {
 	# the gettext configure check and code in sxpm are incorrect; they assume
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index 29a6949f..60de6cb3 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1 +1 @@
-EBUILD libXrandr-9999.ebuild 573 RMD160 9ba87cdc3a1b4b22a2eb6e9201b581f129594299 SHA1 c4e8429b76dcf36ed229cd0b0a58124399a0393a SHA256 82477a579db2ef94c9a55dcbf20c149feccf4d672e06e1d9d3daffa1b9b29bb3
+EBUILD libXrandr-9999.ebuild 573 RMD160 735329029d2f511da86d58921703c66d6198c035 SHA1 307ac7adb8df45fa76cf651cc870ed0f2a8ded49 SHA256 230f7a1cb7947b093391433d7a7c7c60ef20571c5f41f685be8f7e03e4622460
diff --git a/x11-libs/libXrandr/libXrandr-9999.ebuild b/x11-libs/libXrandr/libXrandr-9999.ebuild
index b21d978d..a3dd401b 100644
--- a/x11-libs/libXrandr/libXrandr-9999.ebuild
+++ b/x11-libs/libXrandr/libXrandr-9999.ebuild
@@ -12,8 +12,8 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXrender"
-DEPEND="${RDEPEND}
+	x11-libs/libXrender
 	x11-proto/randrproto
 	x11-proto/renderproto
 	x11-proto/xextproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest
index df63a6bd..bd229a9a 100644
--- a/x11-libs/libXres/Manifest
+++ b/x11-libs/libXres/Manifest
@@ -1 +1 @@
-EBUILD libXres-9999.ebuild 556 RMD160 785d63545a9dcbc748cd2b58bb9d558708fe7443 SHA1 169301bd8b0917115b54dffa06531743f649b101 SHA256 357f949fb8bebb00a4f6f1e0d5db776f3849162337b8758ac6ffa4240e0095f7
+EBUILD libXres-9999.ebuild 556 RMD160 3986d6e89b4a552fdaf97dfad008b4b7b0fe901e SHA1 eaf76f561d1f9379c6dddbd079750083a104afec SHA256 af012bdf8602d2e6b3633247a85f3fe1f86ce4c746dce60db744a67baf4f4779
diff --git a/x11-libs/libXres/libXres-9999.ebuild b/x11-libs/libXres/libXres-9999.ebuild
index 0289e98a..be76180b 100644
--- a/x11-libs/libXres/libXres-9999.ebuild
+++ b/x11-libs/libXres/libXres-9999.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
+	x11-libs/libXext
 	x11-proto/xextproto
 	x11-proto/resourceproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index 886850e7..d14a39be 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1 +1 @@
-EBUILD libXt-9999.ebuild 610 RMD160 1471c6f1c7d5f06058d3d72fb0652e062dc234ef SHA1 9adfab43e06fc7a64b397bc1948ccb8cdced426e SHA256 d88a06b52585c55d5b7e59c9ac966c97094cf339bcf748fee1ca866746e5b729
+EBUILD libXt-9999.ebuild 610 RMD160 1537f409ba40bbe074ae3f55707fe0ca66ab8b36 SHA1 75810b59057105b21bdbd203b44a3c895f7c6701 SHA256 8c383dd4581de935ba64701d715f2c3c9376c821bb0833336ebf68589eb3ae88
diff --git a/x11-libs/libXt/libXt-9999.ebuild b/x11-libs/libXt/libXt-9999.ebuild
index 7d244124..4b87f358 100644
--- a/x11-libs/libXt/libXt-9999.ebuild
+++ b/x11-libs/libXt/libXt-9999.ebuild
@@ -12,10 +12,10 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libSM
-	x11-libs/libICE"
-DEPEND="${RDEPEND}
+	x11-libs/libICE
 	x11-proto/xproto
 	x11-proto/kbproto"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index c857d3f6..316d4bfe 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -1,2 +1,2 @@
-EBUILD libXtst-9999.ebuild 589 RMD160 d064e76013887e2f4ef9dc4b814c0001db7f7adf SHA1 826f54b885c2beaf27d4e4376f540bdbb19eee0b SHA256 66ea319cd90d538786728adac6eac1160ae77c796c6cf9da1fead6d5dc787018
+EBUILD libXtst-9999.ebuild 589 RMD160 f12eb961b70fe5f58add59c2c0e21ccdcf0c6884 SHA1 7a9611c7bbaa1628164e687d46f52c726e1e7772 SHA256 1af9973463f95ac45171392c05dbf8f3809799a19130e57be55cc68cf4df34c2
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libXtst/libXtst-9999.ebuild b/x11-libs/libXtst/libXtst-9999.ebuild
index cf6d5b62..9c26df8a 100644
--- a/x11-libs/libXtst/libXtst-9999.ebuild
+++ b/x11-libs/libXtst/libXtst-9999.ebuild
@@ -14,6 +14,6 @@ RDEPEND="x11-libs/libX11
 	>=x11-libs/libXext-1.0.99.4
 	  x11-libs/libXi
 	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/xextproto-7.0.99.3"
-DEPEND="${RDEPEND}
+	>=x11-proto/xextproto-7.0.99.3
 	x11-proto/inputproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
index 06fa2b8d..84f22c70 100644
--- a/x11-libs/libXv/Manifest
+++ b/x11-libs/libXv/Manifest
@@ -1 +1 @@
-EBUILD libXv-9999.ebuild 503 RMD160 8d1407f6d5cb6cd1f212cb024f62fb874c65ce42 SHA1 eb434f5e4459089ac4c108d61e9894153ca49698 SHA256 95ec9bcff2f9290d8d8db52b46938ca86c8e3e3eb04dc9b674224ae5eae391b9
+EBUILD libXv-9999.ebuild 503 RMD160 712d0a616905d1685f979b01babd4518c00e579a SHA1 6168d8b664c9e378b8950ca4866d03c4c5235263 SHA256 fae8fdf63e39645d894fb7b405a6be51f28518b87d9e3f4feb46debfe45ae645
diff --git a/x11-libs/libXv/libXv-9999.ebuild b/x11-libs/libXv/libXv-9999.ebuild
index fd9316b1..8141865a 100644
--- a/x11-libs/libXv/libXv-9999.ebuild
+++ b/x11-libs/libXv/libXv-9999.ebuild
@@ -11,7 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
+	x11-libs/libXext
 	x11-proto/videoproto
 	x11-proto/xproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index 14f020dc..45f56409 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1 +1 @@
-EBUILD libXxf86dga-9999.ebuild 421 RMD160 1898c64163d465a122c3b842086bf9e98c45a50a SHA1 bf0b71cc0f5e22628d8ecbecef32547afbffd8d9 SHA256 44ef92716c457ba3a69db9faf3e820b2326154846f3661751a07fcad8b996156
+EBUILD libXxf86dga-9999.ebuild 421 RMD160 080c779beaeafa544f1557582bc56397f47e6a18 SHA1 66ca7ddc307b7b47cd61d71715c8db2452e4fe9f SHA256 8a1ce00a6705974b65caca9bf3465aea5e0af05cd18afb053c70fe8a5bbaae8d
diff --git a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild b/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
index 49e69299..b8c3045c 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
@@ -11,8 +11,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
+	x11-libs/libXext
 	x11-proto/xextproto
 	x11-proto/xproto
 	>=x11-proto/xf86dgaproto-2.0.99.2"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86misc/Manifest b/x11-libs/libXxf86misc/Manifest
index aa670a52..e47983c9 100644
--- a/x11-libs/libXxf86misc/Manifest
+++ b/x11-libs/libXxf86misc/Manifest
@@ -1 +1 @@
-EBUILD libXxf86misc-9999.ebuild 502 RMD160 53d4f277636bcfdad97f0e4123057a8816ccd8ff SHA1 f9c8d84d5762c7ef5dee8b963c2afdd16e101ad7 SHA256 02a7d68a3cad82faca5b2a47f7c52b69e53f6d79e03fea17b049e617da921d3a
+EBUILD libXxf86misc-9999.ebuild 502 RMD160 d67e0cabe9351f829299954774553db21047bebf SHA1 fd456e3e16badf0b1bd04d0f8f141bc92bc00a8e SHA256 2f8a21389a4ccc8c20727d04ca2bd3bffe1c65aa679ade1ca0207af19085d643
diff --git a/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild b/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild
index ef4fb908..b0cd996c 100644
--- a/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild
+++ b/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild
@@ -11,7 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
+	x11-libs/libXext
 	x11-proto/xproto
 	x11-proto/xf86miscproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index 30685834..f107a0bc 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1 +1 @@
-EBUILD libXxf86vm-9999.ebuild 552 RMD160 8f6298df270640fdde3f9a4be7f8207579415772 SHA1 dca7c882549cec0ce4f7253932b6a8b85fb187aa SHA256 304a176b49f04182e63920fa498efee00f27eabd3aea5f0bbbe114086d86160f
+EBUILD libXxf86vm-9999.ebuild 552 RMD160 7f1d478534f99cc7c10ba045dfcdb67cc8378f2b SHA1 01eb7233ff788510fda5372df5d1402fb2ca69f9 SHA256 4826d0b05745152948f394dff823e590161712a98e77ae9f11eebe761a57467f
diff --git a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild b/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
index d4be09b7..db8ff6f8 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
@@ -11,8 +11,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
+	x11-libs/libXext
 	>=x11-proto/xf86vidmodeproto-2.3
 	x11-proto/xextproto
 	x11-proto/xproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
index 0f4a8b4f..3813f386 100644
--- a/x11-libs/libdmx/Manifest
+++ b/x11-libs/libdmx/Manifest
@@ -1 +1 @@
-EBUILD libdmx-9999.ebuild 388 RMD160 5d75a79b7db9bef14bf0dc1a467ca9dafd85b999 SHA1 3d504f52922f6ddcfd1abf2c2b6e680d7c2fa399 SHA256 454d62fdcc89420180fb1942ef95922d4fe9f6a6806b37e9931f7e8d550d5f0c
+EBUILD libdmx-9999.ebuild 388 RMD160 c4f27909489c2256e3561a85f4b366859e5c72f6 SHA1 52aa6c6dee253a3d78625ded14d56952ca5a105f SHA256 c6ec82c4076cbc22dbdbc35d8bc8df9b6224a68c9b1d5cf0550566d6e792f49d
diff --git a/x11-libs/libdmx/libdmx-9999.ebuild b/x11-libs/libdmx/libdmx-9999.ebuild
index cbf2bc37..23d4f6cb 100644
--- a/x11-libs/libdmx/libdmx-9999.ebuild
+++ b/x11-libs/libdmx/libdmx-9999.ebuild
@@ -10,7 +10,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	>=x11-proto/dmxproto-2.3"
+	x11-libs/libXext
+	>=x11-proto/dmxproto-2.3
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 4021bca3..cfd22db3 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1 +1 @@
-EBUILD libdrm-9999.ebuild 1025 RMD160 e9f2ead800ab6be5a2abad1d36cecb8cca6d6cee SHA1 ea69e356bc04ddbbd8a9ee37f662e6a5b923fa99 SHA256 1c2ea24f6e8a069cd52abca7572d1c1008350b0bf60ee32ef55358cb030d61dc
+EBUILD libdrm-9999.ebuild 1020 RMD160 a86726c55ffb8c65439b88942251b2b50371e4bb SHA1 5267a22ec3846f1f70466d18283bf2e4e0005639 SHA256 c53f4fddb498cc575e6600f797f19de36f2a2bdc088db8b81e857c7fe2e58d6e
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 6c8216ba..7e82efcd 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -29,11 +29,11 @@ DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="--enable-udev
-			$(use_enable video_cards_intel intel)
-			$(use_enable video_cards_nouveau nouveau-experimental-api)
-			$(use_enable video_cards_radeon radeon)
-			$(use_enable video_cards_vmware vmwgfx-experimental-api)
-			$(use_enable libkms)"
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau-experimental-api)
+		$(use_enable video_cards_radeon radeon)
+		$(use_enable video_cards_vmware vmwgfx-experimental-api)
+		$(use_enable libkms)"
 
 	xorg-2_pkg_setup
 }
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index c62b6521..a7ff1226 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1 +1 @@
-EBUILD libfontenc-9999.ebuild 452 RMD160 4a2d7ba6b935cf2afed13289e3c59aecaf745ff3 SHA1 6ded45b4dec87f229b898c0919cd0c7801719318 SHA256 c76e726bff45fc7771189f1d13fe8f04439868b76a735640c10f492cff82b03f
+EBUILD libfontenc-9999.ebuild 452 RMD160 c8185d82b4553918139abbceddf1c8f1a35f3829 SHA1 f0eccc81d669f6852ff6551bbcc97cc4e554a50c SHA256 973544a5274f6938bd567bab972555542ec87fd80f9cce0fd84f4a43a9618a89
diff --git a/x11-libs/libfontenc/libfontenc-9999.ebuild b/x11-libs/libfontenc/libfontenc-9999.ebuild
index 96704c17..c0da691d 100644
--- a/x11-libs/libfontenc/libfontenc-9999.ebuild
+++ b/x11-libs/libfontenc/libfontenc-9999.ebuild
@@ -10,6 +10,6 @@ DESCRIPTION="X.Org fontenc library"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
+RDEPEND="sys-libs/zlib
 	x11-proto/xproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 96a7c148..0ff11903 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1 +1 @@
-EBUILD libxcb-9999.ebuild 836 RMD160 cd510f27391dc0ffcdbf4b9d14d9e7f46679f4cc SHA1 57da7ed48891a06fd401b20dd4a1429463979a57 SHA256 a5cb0cd3da9154ad647e62a0362579ec66923dc5735ee7f989f657a2f09e7c30
+EBUILD libxcb-9999.ebuild 836 RMD160 754a74e3b91514922d1376945bb21828023240d7 SHA1 9b0346fa486af149256aaceee5a99f4d35df9225 SHA256 caf318f43be216e62d4610d3385f105e683594ae0e95e07bafa946147b64e8c6
diff --git a/x11-libs/libxcb/libxcb-9999.ebuild b/x11-libs/libxcb/libxcb-9999.ebuild
index 7f105c7c..37a91d90 100644
--- a/x11-libs/libxcb/libxcb-9999.ebuild
+++ b/x11-libs/libxcb/libxcb-9999.ebuild
@@ -15,14 +15,14 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc selinux"
 
-RDEPEND="x11-libs/libXau
+RDEPEND="dev-libs/libpthread-stubs
+	x11-libs/libXau
 	x11-libs/libXdmcp
-	dev-libs/libpthread-stubs"
+	>=x11-proto/xcb-proto-1.6"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
+	=dev-lang/python-2*[xml]
 	dev-libs/libxslt
-	>=x11-proto/xcb-proto-1.6
-	=dev-lang/python-2*[xml]"
+	doc? ( app-doc/doxygen )"
 
 pkg_setup() {
 	python_set_active_version 2
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index 103c3bc3..882e63bf 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1 +1 @@
-EBUILD libxkbfile-9999.ebuild 475 RMD160 983e2c44b59d8e7754f87b24eebb4fc885adb1f4 SHA1 d8919bf4d1df26a0b84cebea4c7b854742c152fe SHA256 e1e05ad54fcfc8d2bd45519872235b5404413ed837ed029b9ae1cd425aa3f9f2
+EBUILD libxkbfile-9999.ebuild 475 RMD160 93d68c463aa20ab8becd175f8f246fb2f5de7614 SHA1 2e9a019374c7bde2b637f6edcae4f47bd044986d SHA256 3065e9975cdfbc8519791dec707fa84ef6f4e1d7781db60644b362c89a27bfdc
diff --git a/x11-libs/libxkbfile/libxkbfile-9999.ebuild b/x11-libs/libxkbfile/libxkbfile-9999.ebuild
index b985d732..bdbfe005 100644
--- a/x11-libs/libxkbfile/libxkbfile-9999.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-9999.ebuild
@@ -10,6 +10,6 @@ DESCRIPTION="X.Org xkbfile library"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
+RDEPEND="x11-libs/libX11
 	x11-proto/kbproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index 9ec899bd..0df4045e 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -1,2 +1,2 @@
-EBUILD xcb-util-9999.ebuild 665 RMD160 8d4708f4bb03f898a54561b9a2243a295b39a819 SHA1 e90271525d36c13e89623a128f963ed9cdda5ec5 SHA256 0239844650046bee47e5b1a5fbeea02fae6484f732ae740c0f94007613770179
+EBUILD xcb-util-9999.ebuild 645 RMD160 bd2f932d40749021fba937ae68b91eae37d1a8b3 SHA1 b952098034c5890d99fdb3e8ae4af257cbd04d2e SHA256 83bd60c8b2ee535fa93a1a51e1086e47d8830ed233c5154d97d6b21b915ca591
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/xcb-util/xcb-util-9999.ebuild b/x11-libs/xcb-util/xcb-util-9999.ebuild
index b4d897d5..50ce088d 100644
--- a/x11-libs/xcb-util/xcb-util-9999.ebuild
+++ b/x11-libs/xcb-util/xcb-util-9999.ebuild
@@ -12,9 +12,8 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
-RDEPEND=">=x11-libs/libxcb-1"
+RDEPEND=">=x11-libs/libxcb-1
+	x11-proto/xproto"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
-	dev-util/pkgconfig
-	x11-proto/xproto
 	test? ( >=dev-libs/check-0.9.4 )"
diff --git a/x11-libs/xpyb/Manifest b/x11-libs/xpyb/Manifest
index 6f0f9b9d..e6e1d266 100644
--- a/x11-libs/xpyb/Manifest
+++ b/x11-libs/xpyb/Manifest
@@ -1 +1 @@
-EBUILD xpyb-9999.ebuild 611 RMD160 fdb79bd9733961a153445b0a147549cf3155b676 SHA1 91a198a7380858e4361f6f3f70616385e3eaf9ad SHA256 edadbf273b2aa7f8734a8754b82fc59ab5c88782b63a81c1d1c928469140ef26
+EBUILD xpyb-9999.ebuild 611 RMD160 856914ed379e800dec31852ab21848105bb04f1c SHA1 9efd6394f7f918be5714c56aa0342bb4cf5f8fce SHA256 c31015496c5ee192ab2d9b5c4137b7175113de4697e053fa94ac18a489c2adf4
diff --git a/x11-libs/xpyb/xpyb-9999.ebuild b/x11-libs/xpyb/xpyb-9999.ebuild
index b355eeaa..9bfbbea2 100644
--- a/x11-libs/xpyb/xpyb-9999.ebuild
+++ b/x11-libs/xpyb/xpyb-9999.ebuild
@@ -14,9 +14,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="selinux"
 
 RDEPEND=">=x11-libs/libxcb-1.1
-	>=dev-lang/python-2.5"
-DEPEND="${RDEPEND}
+	>=dev-lang/python-2.5
 	>=x11-proto/xcb-proto-1.2"
+DEPEND="${RDEPEND}"
 
 DOCS="NEWS README"