Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

5 files changed, 54 insertions, 69 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 2944f787751f..79656d30fa18 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.326 2007/07/19 14:01:02 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.327 2007/07/22 02:46:30 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  gtk+-1.2.10-r12.ebuild, gtk+-2.6.10-r1.ebuild, gtk+-2.8.19.ebuild,
+  gtk+-2.8.20-r1.ebuild:
+  Drop virtual/x11 references.
 
   19 Jul 2007; Christoph Mende <angelos@gentoo.org> gtk+-2.10.13.ebuild:
   Stable on amd64 wrt bug #185614
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
index 44a5c280b278..18bfb0f33f32 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild,v 1.13 2007/06/27 16:52:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild,v 1.14 2007/07/22 02:46:30 dberkholz Exp $
 
 GNOME_TARBALL_SUFFIX="gz"
 inherit gnome.org eutils toolchain-funcs autotools
@@ -20,15 +20,11 @@ MY_AVAILABLE_LINGUAS=" az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
 RDEPEND="=dev-libs/glib-1.2*
-	||	(
-		( x11-libs/libXi x11-libs/libXt )
-		virtual/x11
-	)"
+	x11-libs/libXi
+	x11-libs/libXt"
 DEPEND="${RDEPEND}
-	||	(
-		( x11-proto/inputproto x11-proto/xextproto )
-		virtual/x11
-	)
+	x11-proto/inputproto
+	x11-proto/xextproto
 	nls? ( sys-devel/gettext dev-util/intltool )"
 
 src_unpack() {
diff --git a/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild b/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild
index 65f51d6f3bb0..dfa2db0cc99a 100644
--- a/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild,v 1.5 2007/07/15 05:53:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild,v 1.6 2007/07/22 02:46:30 dberkholz Exp $
 
 inherit flag-o-matic eutils
 
@@ -15,19 +15,15 @@ SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="doc tiff jpeg"
 
-RDEPEND="|| ( (
-			x11-libs/libXrender
-			x11-libs/libX11
-			x11-libs/libXi
-			x11-libs/libXt
-			x11-libs/libXext
-			x11-libs/libXinerama
-			x11-libs/libXcursor
-			x11-libs/libXrandr
-			x11-libs/libXfixes
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXfixes
 	>=dev-libs/glib-2.6
 	>=dev-libs/atk-1.0.1
 	>=x11-libs/pango-1.8
@@ -40,14 +36,10 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	sys-devel/autoconf
 	>=sys-devel/automake-1.7.9
-	|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/inputproto
-			x11-proto/xineramaproto
-		)
-		virtual/x11
-	)
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/xineramaproto
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 set_gtk2_confdir() {
diff --git a/x11-libs/gtk+/gtk+-2.8.19.ebuild b/x11-libs/gtk+/gtk+-2.8.19.ebuild
index 53eb018d2b9d..ae685d6a1a47 100644
--- a/x11-libs/gtk+/gtk+-2.8.19.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.19.ebuild,v 1.18 2007/07/15 05:53:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.19.ebuild,v 1.19 2007/07/22 02:46:30 dberkholz Exp $
 
 inherit gnome.org flag-o-matic eutils autotools virtualx
 
@@ -12,17 +12,15 @@ SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="debug doc jpeg tiff xinerama"
 
-RDEPEND="|| ( (
-			x11-libs/libXrender
-			x11-libs/libX11
-			x11-libs/libXi
-			x11-libs/libXt
-			x11-libs/libXext
-			x11-libs/libXcursor
-			x11-libs/libXrandr
-			x11-libs/libXfixes
-			xinerama? ( x11-libs/libXinerama ) )
-		virtual/x11 )
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXfixes
+	xinerama? ( x11-libs/libXinerama )
 	>=dev-libs/glib-2.10.1
 	>=x11-libs/pango-1.9
 	>=dev-libs/atk-1.10.1
@@ -37,12 +35,10 @@ DEPEND="${RDEPEND}
 	sys-devel/autoconf
 	>=dev-util/pkgconfig-0.9
 	=sys-devel/automake-1.7*
-	|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/inputproto
-			x11-proto/xineramaproto )
-		virtual/x11 )
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/xineramaproto
 	doc? (
 		>=dev-util/gtk-doc-1.4
 		~app-text/docbook-xml-dtd-4.1.2 )"
diff --git a/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild b/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild
index 68a12eb33e23..655433e7960b 100644
--- a/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild,v 1.7 2007/07/15 05:53:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.20-r1.ebuild,v 1.8 2007/07/22 02:46:30 dberkholz Exp $
 
 inherit gnome.org flag-o-matic eutils autotools virtualx
 
@@ -12,17 +12,15 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc jpeg tiff xinerama"
 
-RDEPEND="|| ( (
-			x11-libs/libXrender
-			x11-libs/libX11
-			x11-libs/libXi
-			x11-libs/libXt
-			x11-libs/libXext
-			x11-libs/libXcursor
-			x11-libs/libXrandr
-			x11-libs/libXfixes
-			xinerama? ( x11-libs/libXinerama ) )
-		virtual/x11 )
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXfixes
+	xinerama? ( x11-libs/libXinerama )
 	>=dev-libs/glib-2.10.1
 	>=x11-libs/pango-1.9
 	>=dev-libs/atk-1.10.1
@@ -37,12 +35,10 @@ DEPEND="${RDEPEND}
 	sys-devel/autoconf
 	>=dev-util/pkgconfig-0.9
 	=sys-devel/automake-1.7*
-	|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/inputproto
-			xinerama? ( x11-proto/xineramaproto ) )
-		virtual/x11 )
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/inputproto
+	xinerama? ( x11-proto/xineramaproto )
 	doc? (
 		>=dev-util/gtk-doc-1.4
 		~app-text/docbook-xml-dtd-4.1.2 )"