Remove virtual/x11 option from modular X deps.

(Portage version: 2.1.2_pre1-r1)

9 files changed, 47 insertions, 90 deletions

diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog
index 7fef4091c4ce..063bd76554b9 100644
--- a/x11-libs/fox/ChangeLog
+++ b/x11-libs/fox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/fox
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.56 2006/09/24 06:47:01 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.57 2006/09/24 08:27:27 dberkholz Exp $
+
+  24 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; fox-1.0.53.ebuild,
+  fox-1.2.6-r3.ebuild, fox-1.2.18.ebuild, fox-1.2.18-r1.ebuild,
+  fox-1.4.34.ebuild, fox-1.4.34-r1.ebuild, fox-1.5.4.ebuild,
+  fox-1.6.14.ebuild:
+  Remove virtual/x11 option from modular X deps.
 
 *fox-1.4.34-r1 (24 Sep 2006)
 *fox-1.2.18-r1 (24 Sep 2006)
diff --git a/x11-libs/fox/fox-1.0.53.ebuild b/x11-libs/fox/fox-1.0.53.ebuild
index e4408ff3715a..e028f0a4296d 100644
--- a/x11-libs/fox/fox-1.0.53.ebuild
+++ b/x11-libs/fox/fox-1.0.53.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.0.53.ebuild,v 1.3 2006/08/23 00:46:43 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.0.53.ebuild,v 1.4 2006/09/24 08:27:27 dberkholz Exp $
 
 inherit toolchain-funcs flag-o-matic fox
 
@@ -9,11 +9,8 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
 IUSE="cups jpeg opengl png tiff zlib"
 
-RDEPEND="|| ( ( x11-libs/libXrandr
-			x11-libs/libXcursor
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
 	cups? ( net-print/cups )
 	jpeg? ( >=media-libs/jpeg-6b )
 	opengl? ( virtual/opengl virtual/glu )
@@ -21,11 +18,8 @@ RDEPEND="|| ( ( x11-libs/libXrandr
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	zlib? ( >=sys-libs/zlib-1.1.4 )"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-libs/libXt
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-libs/libXt"
 
 FOXCONF="$(use_enable cups) \
 	$(use_enable jpeg) \
diff --git a/x11-libs/fox/fox-1.2.18-r1.ebuild b/x11-libs/fox/fox-1.2.18-r1.ebuild
index 9eae4959a113..17f5118df51c 100644
--- a/x11-libs/fox/fox-1.2.18-r1.ebuild
+++ b/x11-libs/fox/fox-1.2.18-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.2.18-r1.ebuild,v 1.1 2006/09/24 06:47:01 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.2.18-r1.ebuild,v 1.2 2006/09/24 08:27:27 dberkholz Exp $
 
 inherit eutils toolchain-funcs flag-o-matic fox
 
@@ -9,11 +9,8 @@ SLOT="1.2"
 KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
 IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
 
-RDEPEND="|| ( ( x11-libs/libXrandr
-			x11-libs/libXcursor
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
 	x11-libs/fox-wrapper
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	cups? ( net-print/cups )
@@ -25,11 +22,8 @@ RDEPEND="|| ( ( x11-libs/libXrandr
 		virtual/xft )
 	zlib? ( >=sys-libs/zlib-1.1.4 )"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-libs/libXt
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-libs/libXt"
 
 FOXCONF="$(use_enable bzip2 bz2lib) \
 	$(use_enable cups) \
diff --git a/x11-libs/fox/fox-1.2.18.ebuild b/x11-libs/fox/fox-1.2.18.ebuild
index e38ed74c4bab..beaa10ccf3e9 100644
--- a/x11-libs/fox/fox-1.2.18.ebuild
+++ b/x11-libs/fox/fox-1.2.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.2.18.ebuild,v 1.1 2006/08/23 00:16:45 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.2.18.ebuild,v 1.2 2006/09/24 08:27:27 dberkholz Exp $
 
 inherit toolchain-funcs flag-o-matic fox
 
@@ -9,11 +9,8 @@ SLOT="1.2"
 KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
 IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
 
-RDEPEND="|| ( ( x11-libs/libXrandr
-			x11-libs/libXcursor
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
 	x11-libs/fox-wrapper
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	cups? ( net-print/cups )
@@ -25,11 +22,8 @@ RDEPEND="|| ( ( x11-libs/libXrandr
 		virtual/xft )
 	zlib? ( >=sys-libs/zlib-1.1.4 )"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-libs/libXt
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-libs/libXt"
 
 FOXCONF="$(use_enable bzip2 bz2lib) \
 	$(use_enable cups) \
diff --git a/x11-libs/fox/fox-1.2.6-r3.ebuild b/x11-libs/fox/fox-1.2.6-r3.ebuild
index fd160100c58a..3b97e84b2769 100644
--- a/x11-libs/fox/fox-1.2.6-r3.ebuild
+++ b/x11-libs/fox/fox-1.2.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.2.6-r3.ebuild,v 1.7 2006/08/19 23:08:35 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.2.6-r3.ebuild,v 1.8 2006/09/24 08:27:27 dberkholz Exp $
 
 IUSE="cups debug truetype opengl"
 DESCRIPTION="C++ based Toolkit for developing Graphical User Interfaces easily and effectively"
@@ -10,20 +10,13 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 LICENSE="GPL-2"
 
-RDEPEND="|| ( ( x11-libs/libXrandr
-			x11-libs/libXcursor
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
 	truetype? ( >=media-libs/freetype-2.1.5-r1 virtual/xft )
 	opengl? ( virtual/opengl virtual/glu )"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-libs/libXt
-		)
-		virtual/x11
-	)"
-
+	x11-proto/xextproto
+	x11-libs/libXt"
 
 src_compile() {
 	local myconf
diff --git a/x11-libs/fox/fox-1.4.34-r1.ebuild b/x11-libs/fox/fox-1.4.34-r1.ebuild
index d27d19eb1f4d..3077219ed2db 100644
--- a/x11-libs/fox/fox-1.4.34-r1.ebuild
+++ b/x11-libs/fox/fox-1.4.34-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.4.34-r1.ebuild,v 1.1 2006/09/24 06:47:01 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.4.34-r1.ebuild,v 1.2 2006/09/24 08:27:27 dberkholz Exp $
 
 inherit eutils fox
 
@@ -9,11 +9,8 @@ SLOT="1.4"
 KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
 IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
 
-RDEPEND="|| ( ( x11-libs/libXrandr
-			x11-libs/libXcursor
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
 	x11-libs/fox-wrapper
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	cups? ( net-print/cups )
@@ -25,11 +22,8 @@ RDEPEND="|| ( ( x11-libs/libXrandr
 		virtual/xft )
 	zlib? ( >=sys-libs/zlib-1.1.4 )"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-libs/libXt
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-libs/libXt"
 
 FOXCONF="$(use_enable bzip2 bz2lib) \
 	$(use_enable cups) \
diff --git a/x11-libs/fox/fox-1.4.34.ebuild b/x11-libs/fox/fox-1.4.34.ebuild
index 1dc3eb33ef3b..cf40449a1fcb 100644
--- a/x11-libs/fox/fox-1.4.34.ebuild
+++ b/x11-libs/fox/fox-1.4.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.4.34.ebuild,v 1.1 2006/08/23 00:16:45 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.4.34.ebuild,v 1.2 2006/09/24 08:27:27 dberkholz Exp $
 
 inherit fox
 
@@ -9,11 +9,8 @@ SLOT="1.4"
 KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
 IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
 
-RDEPEND="|| ( ( x11-libs/libXrandr
-			x11-libs/libXcursor
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
 	x11-libs/fox-wrapper
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	cups? ( net-print/cups )
@@ -25,11 +22,8 @@ RDEPEND="|| ( ( x11-libs/libXrandr
 		virtual/xft )
 	zlib? ( >=sys-libs/zlib-1.1.4 )"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-libs/libXt
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-libs/libXt"
 
 FOXCONF="$(use_enable bzip2 bz2lib) \
 	$(use_enable cups) \
diff --git a/x11-libs/fox/fox-1.5.4.ebuild b/x11-libs/fox/fox-1.5.4.ebuild
index 55a6b9e53470..e2b17455465f 100644
--- a/x11-libs/fox/fox-1.5.4.ebuild
+++ b/x11-libs/fox/fox-1.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.5.4.ebuild,v 1.3 2006/01/25 05:08:14 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.5.4.ebuild,v 1.4 2006/09/24 08:27:27 dberkholz Exp $
 
 inherit fox
 
@@ -9,11 +9,8 @@ SLOT="1.5"
 KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
 IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
 
-RDEPEND="|| ( ( x11-libs/libXrandr
-			x11-libs/libXcursor
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
 	x11-libs/fox-wrapper
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	cups? ( net-print/cups )
@@ -25,11 +22,8 @@ RDEPEND="|| ( ( x11-libs/libXrandr
 		virtual/xft )
 	zlib? ( >=sys-libs/zlib-1.1.4 )"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-libs/libXt
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-libs/libXt"
 
 FOXCONF="$(use_enable bzip2 bz2lib) \
 	$(use_enable cups) \
diff --git a/x11-libs/fox/fox-1.6.14.ebuild b/x11-libs/fox/fox-1.6.14.ebuild
index e83b904a9e6b..6d57c8ac5d07 100644
--- a/x11-libs/fox/fox-1.6.14.ebuild
+++ b/x11-libs/fox/fox-1.6.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.14.ebuild,v 1.1 2006/08/23 00:16:45 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.14.ebuild,v 1.2 2006/09/24 08:27:27 dberkholz Exp $
 
 inherit fox
 
@@ -9,11 +9,8 @@ SLOT="1.6"
 KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
 IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
 
-RDEPEND="|| ( ( x11-libs/libXrandr
-			x11-libs/libXcursor
-		)
-		virtual/x11
-	)
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
 	x11-libs/fox-wrapper
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	cups? ( net-print/cups )
@@ -25,11 +22,8 @@ RDEPEND="|| ( ( x11-libs/libXrandr
 		virtual/xft )
 	zlib? ( >=sys-libs/zlib-1.1.4 )"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-libs/libXt
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-libs/libXt"
 
 FOXCONF="$(use_enable bzip2 bz2lib) \
 	$(use_enable cups) \