Move proto to be always in rdepend just to play on safe side.

(Portage version: 2.2_rc98/cvs/Linux x86_64)

29 files changed, 96 insertions, 87 deletions

diff --git a/x11-libs/libFS/libFS-1.0.3.ebuild b/x11-libs/libFS/libFS-1.0.3.ebuild
index 31c114feb8e6..0ff6f112c257 100644
--- a/x11-libs/libFS/libFS-1.0.3.ebuild
+++ b/x11-libs/libFS/libFS-1.0.3.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: /var/cvsroot/gentoo-x86/x11-libs/libFS/libFS-1.0.3.ebuild,v 1.2 2010/11/01 14:28:00 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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/libICE-1.0.7.ebuild b/x11-libs/libICE/libICE-1.0.7.ebuild
index 3618ac44a1da..38ef6ece5e16 100644
--- a/x11-libs/libICE/libICE-1.0.7.ebuild
+++ b/x11-libs/libICE/libICE-1.0.7.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/libICE/libICE-1.0.7.ebuild,v 1.1 2010/10/19 18:03:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libICE/libICE-1.0.7.ebuild,v 1.2 2010/11/01 14:28:02 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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/libSM-1.2.0.ebuild b/x11-libs/libSM/libSM-1.2.0.ebuild
index 051491227030..3ad7d1ddf214 100644
--- a/x11-libs/libSM/libSM-1.2.0.ebuild
+++ b/x11-libs/libSM/libSM-1.2.0.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/libSM/libSM-1.2.0.ebuild,v 1.1 2010/10/28 11:28:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild,v 1.2 2010/11/01 14:28:01 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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/libXaw/libXaw-1.0.8.ebuild b/x11-libs/libXaw/libXaw-1.0.8.ebuild
index c25c6cb6a90e..39d394b73d85 100644
--- a/x11-libs/libXaw/libXaw-1.0.8.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.8.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/libXaw/libXaw-1.0.8.ebuild,v 1.1 2010/10/28 11:38:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/libXaw-1.0.8.ebuild,v 1.2 2010/11/01 14:28:00 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -14,10 +14,10 @@ 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() {
diff --git a/x11-libs/libXcursor/libXcursor-1.1.11.ebuild b/x11-libs/libXcursor/libXcursor-1.1.11.ebuild
index 5923edc7b814..bc7ff2c36424 100644
--- a/x11-libs/libXcursor/libXcursor-1.1.11.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.1.11.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/libXcursor/libXcursor-1.1.11.ebuild,v 1.1 2010/10/28 10:58:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/libXcursor-1.1.11.ebuild,v 1.2 2010/11/01 14:28:00 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -12,9 +12,9 @@ IUSE=""
 
 RDEPEND=">=x11-libs/libXrender-0.8.2
 	x11-libs/libXfixes
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
+	x11-libs/libX11
 	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/libXdmcp-1.1.0.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.0.ebuild
index e7174b6a26f4..18427ab21926 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.0.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.0.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: /var/cvsroot/gentoo-x86/x11-libs/libXdmcp/libXdmcp-1.1.0.ebuild,v 1.2 2010/11/01 14:28:00 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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/libXext-1.1.2-r1.ebuild b/x11-libs/libXext/libXext-1.1.2-r1.ebuild
index d58cb64e5d85..eaa2abbbc0d5 100644
--- a/x11-libs/libXext/libXext-1.1.2-r1.ebuild
+++ b/x11-libs/libXext/libXext-1.1.2-r1.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-r1.ebuild,v 1.1 2010/09/05 07:49:48 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.1.2-r1.ebuild,v 1.2 2010/11/01 14:28:01 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -10,10 +10,10 @@ 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=""
 
-RDEPEND=">=x11-libs/libX11-1.1.99.1"
-DEPEND="${RDEPEND}
+RDEPEND=">=x11-libs/libX11-1.1.99.1
 	>=x11-proto/xextproto-7.0.99.2
 	>=x11-proto/xproto-7.0.13"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	xorg-2_src_prepare
diff --git a/x11-libs/libXext/libXext-1.1.2.ebuild b/x11-libs/libXext/libXext-1.1.2.ebuild
index a35f61b639ac..059bbdc5d2d1 100644
--- a/x11-libs/libXext/libXext-1.1.2.ebuild
+++ b/x11-libs/libXext/libXext-1.1.2.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: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.1.2.ebuild,v 1.11 2010/11/01 14:28:01 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -10,7 +10,7 @@ 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=""
 
-RDEPEND=">=x11-libs/libX11-1.1.99.1"
-DEPEND="${RDEPEND}
+RDEPEND=">=x11-libs/libX11-1.1.99.1
 	>=x11-proto/xextproto-7.0.99.2
 	>=x11-proto/xproto-7.0.13"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXext/libXext-1.2.0.ebuild b/x11-libs/libXext/libXext-1.2.0.ebuild
index 0952b6b4be54..d339a2a5f345 100644
--- a/x11-libs/libXext/libXext-1.2.0.ebuild
+++ b/x11-libs/libXext/libXext-1.2.0.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.2.0.ebuild,v 1.1 2010/10/28 11:18:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.2.0.ebuild,v 1.2 2010/11/01 14:28:01 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -10,10 +10,10 @@ 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"
-DEPEND="${RDEPEND}
+RDEPEND=">=x11-libs/libX11-1.2
 	>=x11-proto/xextproto-7.1
-	>=x11-proto/xproto-7.0.13
+	>=x11-proto/xproto-7.0.13"
+DEPEND="${RDEPEND}
 	doc? ( app-text/xmlto )"
 
 PATCHES=( "${FILESDIR}/${PN}-1.1.2-xhidden.patch" )
diff --git a/x11-libs/libXfixes/libXfixes-4.0.5.ebuild b/x11-libs/libXfixes/libXfixes-4.0.5.ebuild
index 4901051b043e..e5833975c514 100644
--- a/x11-libs/libXfixes/libXfixes-4.0.5.ebuild
+++ b/x11-libs/libXfixes/libXfixes-4.0.5.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/libXfixes/libXfixes-4.0.5.ebuild,v 1.9 2010/10/21 01:17:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfixes/libXfixes-4.0.5.ebuild,v 1.10 2010/11/01 14:28:01 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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/libXfont-1.4.3.ebuild b/x11-libs/libXfont/libXfont-1.4.3.ebuild
index 700cd5e402fb..5d0fef3bcfb7 100644
--- a/x11-libs/libXfont/libXfont-1.4.3.ebuild
+++ b/x11-libs/libXfont/libXfont-1.4.3.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: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.3.ebuild,v 1.2 2010/11/01 14:28:01 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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/libXft/libXft-2.2.0.ebuild b/x11-libs/libXft/libXft-2.2.0.ebuild
index 4a597b995090..dc786b71efba 100644
--- a/x11-libs/libXft/libXft-2.2.0.ebuild
+++ b/x11-libs/libXft/libXft-2.2.0.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.1 2010/10/31 09:58:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.2.0.ebuild,v 1.2 2010/11/01 14:28:03 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2 flag-o-matic
@@ -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/libXi-1.3.1.ebuild b/x11-libs/libXi/libXi-1.3.1.ebuild
index fe4abdba7b54..591e24807c98 100644
--- a/x11-libs/libXi/libXi-1.3.1.ebuild
+++ b/x11-libs/libXi/libXi-1.3.1.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.11 2010/10/22 20:30:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.3.1.ebuild,v 1.12 2010/11/01 14:27:59 scarabeus Exp $
 
 EAPI=3
 XORG_EAUTORECONF="yes"
@@ -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-8.5.1
 		app-text/xmlto
diff --git a/x11-libs/libXinerama/libXinerama-1.1.1.ebuild b/x11-libs/libXinerama/libXinerama-1.1.1.ebuild
index 3f60f7fa454c..15390aee8b50 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.1.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.1.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/libXinerama/libXinerama-1.1.1.ebuild,v 1.1 2010/10/28 10:53:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.1.ebuild,v 1.2 2010/11/01 14:28:02 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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/libXmu-1.1.0.ebuild b/x11-libs/libXmu/libXmu-1.1.0.ebuild
index cb63b65ddba3..bffc16cc066e 100644
--- a/x11-libs/libXmu/libXmu-1.1.0.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.0.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/libXmu/libXmu-1.1.0.ebuild,v 1.1 2010/10/31 10:40:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXmu/libXmu-1.1.0.ebuild,v 1.2 2010/11/01 14:28:00 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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/libXpm-3.5.9.ebuild b/x11-libs/libXpm/libXpm-3.5.9.ebuild
index b2868b2dd28c..216afa36ba00 100644
--- a/x11-libs/libXpm/libXpm-3.5.9.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.9.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.2 2010/10/31 20:16:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.9.ebuild,v 1.3 2010/11/01 14:28:01 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2 flag-o-matic
@@ -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/libXrandr-1.3.1.ebuild b/x11-libs/libXrandr/libXrandr-1.3.1.ebuild
index ddfacf8816f4..360dc72f9921 100644
--- a/x11-libs/libXrandr/libXrandr-1.3.1.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.3.1.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/libXrandr/libXrandr-1.3.1.ebuild,v 1.1 2010/10/28 21:43:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/libXrandr-1.3.1.ebuild,v 1.2 2010/11/01 14:28:01 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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/libXres-1.0.5.ebuild b/x11-libs/libXres/libXres-1.0.5.ebuild
index c4ef9be6fdcb..28f96abf47e5 100644
--- a/x11-libs/libXres/libXres-1.0.5.ebuild
+++ b/x11-libs/libXres/libXres-1.0.5.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/libXres/libXres-1.0.5.ebuild,v 1.1 2010/10/29 08:42:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXres/libXres-1.0.5.ebuild,v 1.2 2010/11/01 14:27:59 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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/libXt-1.0.9.ebuild b/x11-libs/libXt/libXt-1.0.9.ebuild
index f5ab03fea6a3..74f25ef591b1 100644
--- a/x11-libs/libXt/libXt-1.0.9.ebuild
+++ b/x11-libs/libXt/libXt-1.0.9.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.9.ebuild,v 1.1 2010/10/28 22:00:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.0.9.ebuild,v 1.2 2010/11/01 14:28:03 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2 toolchain-funcs
@@ -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/libXtst-1.2.0.ebuild b/x11-libs/libXtst/libXtst-1.2.0.ebuild
index 8f856d0d49e3..67f75f030905 100644
--- a/x11-libs/libXtst/libXtst-1.2.0.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.0.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/libXtst/libXtst-1.2.0.ebuild,v 1.1 2010/10/31 10:57:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXtst/libXtst-1.2.0.ebuild,v 1.2 2010/11/01 14:28:03 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -12,11 +12,11 @@ IUSE="doc"
 
 RDEPEND="x11-libs/libX11
 	>=x11-libs/libXext-1.0.99.4
-	  x11-libs/libXi"
-DEPEND="${RDEPEND}
+	  x11-libs/libXi
 	x11-proto/inputproto
 	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/xextproto-7.0.99.3
+	>=x11-proto/xextproto-7.0.99.3"
+DEPEND="${RDEPEND}
 	doc? ( app-text/xmlto )"
 
 pkg_setup() {
diff --git a/x11-libs/libXv/libXv-1.0.6.ebuild b/x11-libs/libXv/libXv-1.0.6.ebuild
index 222e08f8f2bb..a639381c6fde 100644
--- a/x11-libs/libXv/libXv-1.0.6.ebuild
+++ b/x11-libs/libXv/libXv-1.0.6.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/libXv/libXv-1.0.6.ebuild,v 1.1 2010/10/31 11:01:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXv/libXv-1.0.6.ebuild,v 1.2 2010/11/01 14:28:02 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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/libXxf86dga-1.1.2.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.2.ebuild
index eca00ebb29b0..7e75cadcb09b 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.2.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.2.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/libXxf86dga/libXxf86dga-1.1.2.ebuild,v 1.1 2010/10/31 11:05:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86dga/libXxf86dga-1.1.2.ebuild,v 1.2 2010/11/01 14:28:02 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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/libXxf86vm/libXxf86vm-1.1.1.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.1.ebuild
index c598b72ee7dc..5f48e9319598 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.1.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.1.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/libXxf86vm/libXxf86vm-1.1.1.ebuild,v 1.1 2010/10/31 11:08:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86vm/libXxf86vm-1.1.1.ebuild,v 1.2 2010/11/01 14:28:02 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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/libdmx-1.1.1.ebuild b/x11-libs/libdmx/libdmx-1.1.1.ebuild
index 4403bb896a3f..38756abff2d2 100644
--- a/x11-libs/libdmx/libdmx-1.1.1.ebuild
+++ b/x11-libs/libdmx/libdmx-1.1.1.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/libdmx/libdmx-1.1.1.ebuild,v 1.1 2010/10/29 08:48:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdmx/libdmx-1.1.1.ebuild,v 1.2 2010/11/01 14:27:59 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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-libs/libXext
 	x11-proto/xextproto
 	>=x11-proto/dmxproto-2.3"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libfontenc/libfontenc-1.1.0.ebuild b/x11-libs/libfontenc/libfontenc-1.1.0.ebuild
index 96704c17377f..16adb1421d7e 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.0.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.0.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: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/libfontenc-1.1.0.ebuild,v 1.2 2010/11/01 14:28:02 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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/libpciaccess/libpciaccess-0.12.0.ebuild b/x11-libs/libpciaccess/libpciaccess-0.12.0.ebuild
index 562b55998d8b..f028bdd12d12 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.12.0.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.12.0.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/libpciaccess/libpciaccess-0.12.0.ebuild,v 1.1 2010/07/22 20:06:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.12.0.ebuild,v 1.2 2010/11/01 14:28:00 scarabeus Exp $
 
 EAPI=3
 
@@ -14,6 +14,8 @@ DEPEND="zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
+	xorg-2_pkg_setup
+
 	CONFIGURE_OPTIONS="$(use_with zlib)
 		--with-pciids-path=/usr/share/misc"
 }
diff --git a/x11-libs/libxcb/libxcb-1.6.ebuild b/x11-libs/libxcb/libxcb-1.6.ebuild
index 986d52d02850..317908a4fe74 100644
--- a/x11-libs/libxcb/libxcb-1.6.ebuild
+++ b/x11-libs/libxcb/libxcb-1.6.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/libxcb/libxcb-1.6.ebuild,v 1.10 2010/10/21 01:20:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.6.ebuild,v 1.11 2010/11/01 14:27:59 scarabeus Exp $
 
 EAPI=3
 
@@ -17,11 +17,11 @@ IUSE="doc selinux"
 
 RDEPEND="x11-libs/libXau
 	x11-libs/libXdmcp
-	dev-libs/libpthread-stubs"
+	dev-libs/libpthread-stubs
+	>=x11-proto/xcb-proto-1.6"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	dev-libs/libxslt
-	>=x11-proto/xcb-proto-1.6
 	=dev-lang/python-2*[xml]"
 
 pkg_setup() {
diff --git a/x11-libs/libxcb/libxcb-1.7.ebuild b/x11-libs/libxcb/libxcb-1.7.ebuild
index 7f18d34155b8..ddde6354ef4e 100644
--- a/x11-libs/libxcb/libxcb-1.7.ebuild
+++ b/x11-libs/libxcb/libxcb-1.7.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/libxcb/libxcb-1.7.ebuild,v 1.1 2010/08/14 22:26:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.7.ebuild,v 1.2 2010/11/01 14:27:59 scarabeus Exp $
 
 EAPI=3
 
@@ -17,11 +17,11 @@ IUSE="doc selinux"
 
 RDEPEND="x11-libs/libXau
 	x11-libs/libXdmcp
-	dev-libs/libpthread-stubs"
+	dev-libs/libpthread-stubs
+	>=x11-proto/xcb-proto-1.6"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	dev-libs/libxslt
-	>=x11-proto/xcb-proto-1.6
 	=dev-lang/python-2*[xml]"
 
 pkg_setup() {
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.7.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.7.ebuild
index 746242ce7ebe..bddfa54344ee 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.0.7.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.0.7.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/libxkbfile/libxkbfile-1.0.7.ebuild,v 1.1 2010/10/31 11:11:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxkbfile/libxkbfile-1.0.7.ebuild,v 1.2 2010/11/01 14:27:59 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
@@ -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}"