Remove virtual/x11 option from modular X deps.

Package-Manager: portage-2.1.2_pre1-r1

19 files changed, 110 insertions, 171 deletions

diff --git a/x11-libs/Xaw3d/ChangeLog b/x11-libs/Xaw3d/ChangeLog
index 6bf71ddc95cf..59a46ce113ac 100644
--- a/x11-libs/Xaw3d/ChangeLog
+++ b/x11-libs/Xaw3d/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/Xaw3d
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/Xaw3d/ChangeLog,v 1.23 2006/05/03 20:18:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/Xaw3d/ChangeLog,v 1.24 2006/09/24 08:23:18 dberkholz Exp $
+
+  24 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; Xaw3d-1.5-r1.ebuild:
+  Remove virtual/x11 option from modular X deps.
 
   03 May 2006; Diego Pettenò <flameeyes@gentoo.org> Xaw3d-1.5-r1.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild b/x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild
index 2da1c084d32b..8a7a5f5f431e 100644
--- a/x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild
+++ b/x11-libs/Xaw3d/Xaw3d-1.5-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/Xaw3d/Xaw3d-1.5-r1.ebuild,v 1.32 2006/05/03 20:18:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild,v 1.33 2006/09/24 08:23:18 dberkholz Exp $
 
 # Ok, hopefully this will resolv the problem with the version of libXaw3d that
 # gets created.
@@ -30,19 +30,17 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 sh sparc x86 ~x86-f
 IUSE=""
 
 # There _might_ be something else, but I doubt it.
-RDEPEND="|| ( ( x11-libs/libXt
+RDEPEND="x11-libs/libXt
 		x11-libs/libX11
 		x11-libs/libXmu
 		x11-libs/libXpm
-		x11-libs/libXp )
-	virtual/x11 )"
+		x11-libs/libXp"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
-	|| ( ( 	x11-proto/xextproto
-		x11-misc/imake
-		x11-misc/gccmakedep )
-		virtual/x11 )"
+	x11-proto/xextproto
+	x11-misc/imake
+	x11-misc/gccmakedep"
 
 src_unpack() {
 	unpack ${P}.tar.gz
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) \
diff --git a/x11-libs/lesstif/ChangeLog b/x11-libs/lesstif/ChangeLog
index 2b2b6f3cc85d..279d276eee84 100644
--- a/x11-libs/lesstif/ChangeLog
+++ b/x11-libs/lesstif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/lesstif
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.77 2006/08/06 01:45:15 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.78 2006/09/24 08:21:23 dberkholz Exp $
+
+  24 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  lesstif-0.93.94-r4.ebuild, lesstif-0.94.4.ebuild:
+  Remove virtual/x11 option from modular X deps.
 
   05 Aug 2006; Chris White <chriswhite@gentoo.org>
   -lesstif-0.94.0-r2.ebuild:
diff --git a/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild b/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild
index 74ce459904d1..d5870c972b4d 100644
--- a/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild
+++ b/x11-libs/lesstif/lesstif-0.93.94-r4.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/lesstif/lesstif-0.93.94-r4.ebuild,v 1.9 2006/03/10 23:39:53 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild,v 1.10 2006/09/24 08:21:23 dberkholz Exp $
 
 inherit libtool flag-o-matic multilib
 
@@ -15,18 +15,16 @@ KEYWORDS="alpha ~amd64 hppa ~ia64 ppc ppc-macos ppc64 sparc x86"
 IUSE="static"
 
 RDEPEND="virtual/libc
-	|| ( ( x11-libs/libXp
-			x11-libs/libXt )
-		virtual/x11 )
+	x11-libs/libXp
+	x11-libs/libXt
 	>=x11-libs/motif-config-0.9"
 
 DEPEND="dev-lang/perl
 	${RDEPEND}
-	|| ( ( x11-libs/libXaw
-			x11-libs/libXft
-			x11-proto/printproto
-			x11-proto/xextproto )
-		virtual/x11 )"
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-proto/printproto
+	x11-proto/xextproto"
 
 PROVIDE="virtual/motif"
 
diff --git a/x11-libs/lesstif/lesstif-0.94.4.ebuild b/x11-libs/lesstif/lesstif-0.94.4.ebuild
index 30e25036ed4a..df74f1d10d2e 100644
--- a/x11-libs/lesstif/lesstif-0.94.4.ebuild
+++ b/x11-libs/lesstif/lesstif-0.94.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/lesstif/lesstif-0.94.4.ebuild,v 1.15 2006/07/09 16:36:15 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.4.ebuild,v 1.16 2006/09/24 08:21:23 dberkholz Exp $
 
 inherit libtool flag-o-matic multilib
 
@@ -14,18 +14,16 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc-macos ppc64 sparc x86 ~x86-fbsd"
 IUSE="static"
 
 RDEPEND="virtual/libc
-	|| ( ( x11-libs/libXp
-			x11-libs/libXt )
-		virtual/x11 )
+	x11-libs/libXp
+	x11-libs/libXt
 	>=x11-libs/motif-config-0.9"
 
 DEPEND="dev-lang/perl
 	${RDEPEND}
-	|| ( ( x11-libs/libXaw
-			x11-libs/libXft
-			x11-proto/printproto
-			x11-proto/xextproto )
-		virtual/x11 )
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-proto/printproto
+	x11-proto/xextproto
 	>=sys-devel/libtool-1.5.10"
 
 PROVIDE="virtual/motif"
diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 9465d7d0eaac..99ca68916dbb 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.130 2006/08/26 06:33:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.131 2006/09/24 08:20:09 dberkholz Exp $
+
+  24 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  openmotif-2.1.30-r14.ebuild, openmotif-2.2.3-r3.ebuild,
+  openmotif-2.2.3-r8.ebuild, openmotif-2.2.3-r9.ebuild:
+  Remove virtual/x11 option from modular X deps.
 
   26 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
   openmotif-2.2.3-r3.ebuild:
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r14.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r14.ebuild
index 80ef5a708bae..4eb422e37c99 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r14.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r14.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/openmotif/openmotif-2.1.30-r14.ebuild,v 1.2 2006/07/13 07:08:59 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r14.ebuild,v 1.3 2006/09/24 08:20:09 dberkholz Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,21 +18,15 @@ IUSE=""
 PROVIDE="virtual/motif"
 
 RDEPEND="virtual/libc
-	|| ( ( x11-libs/libXmu
-	       x11-libs/libXaw
-		   x11-libs/libXp
-			x11-proto/printproto
-	   )
-	   virtual/x11
-	)
+	x11-libs/libXmu
+	x11-libs/libXaw
+	x11-libs/libXp
+	x11-proto/printproto
 	>=x11-libs/motif-config-0.9"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
-	|| ( ( x11-proto/xextproto
-		   x11-misc/xbitmaps
-	)
-	virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-misc/xbitmaps"
 
 SLOT="2.1"
 
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild
index 151cbd7c5a6a..ca7d79d4027f 100644
--- a/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3-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/openmotif/openmotif-2.2.3-r3.ebuild,v 1.14 2006/08/26 06:33:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild,v 1.15 2006/09/24 08:20:09 dberkholz Exp $
 
 inherit eutils libtool flag-o-matic multilib
 
@@ -17,23 +17,17 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc
-	|| ( ( x11-libs/libXmu
-			x11-libs/libXaw
-			x11-libs/libXp
-			x11-proto/printproto
-		)
-		virtual/x11
-	)
+	x11-libs/libXmu
+	x11-libs/libXaw
+	x11-libs/libXp
+	x11-proto/printproto
 	>=sys-apps/sed-4
 	!ppc-macos? ( =sys-devel/automake-1.4* )
 	sys-devel/autoconf
 	!virtual/motif"
 RDEPEND="virtual/libc
-	|| ( ( x11-proto/xextproto
-			x11-misc/xbitmaps
-		)
-		virtual/x11
-		)
+	x11-proto/xextproto
+	x11-misc/xbitmaps
 	!virtual/motif"
 PROVIDE="virtual/motif"
 
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild
index c58eb47315ab..f0ef16643570 100644
--- a/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3-r8.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/openmotif/openmotif-2.2.3-r8.ebuild,v 1.14 2006/07/13 07:08:59 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild,v 1.15 2006/09/24 08:20:09 dberkholz Exp $
 
 inherit eutils libtool flag-o-matic multilib
 
@@ -17,23 +17,17 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc-macos ppc64 sh sparc x86"
 IUSE=""
 
 RDEPEND="virtual/libc
-	|| ( ( x11-libs/libXmu
-			x11-libs/libXaw
-			x11-libs/libXp
-			x11-proto/printproto
-		)
-		virtual/x11
-	)
+	x11-libs/libXmu
+	x11-libs/libXaw
+	x11-libs/libXp
+	x11-proto/printproto
 	>=x11-libs/motif-config-0.9"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
 	!ppc-macos? ( =sys-devel/automake-1.4* )
 	sys-devel/autoconf
-	|| ( ( x11-proto/xextproto
-			x11-misc/xbitmaps
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-misc/xbitmaps"
 
 PROVIDE="virtual/motif"
 
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild
index f09f5ba7d172..d10167d609bf 100644
--- a/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3-r9.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/openmotif/openmotif-2.2.3-r9.ebuild,v 1.9 2006/07/13 07:08:59 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild,v 1.10 2006/09/24 08:20:09 dberkholz Exp $
 
 inherit eutils libtool flag-o-matic multilib autotools
 
@@ -17,21 +17,15 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 sh sparc x86 ~x86
 IUSE=""
 
 RDEPEND="virtual/libc
-	|| ( ( x11-libs/libXmu
-			x11-libs/libXaw
-			x11-libs/libXp
-			x11-proto/printproto
-		)
-		virtual/x11
-	)
+	x11-libs/libXmu
+	x11-libs/libXaw
+	x11-libs/libXp
+	x11-proto/printproto
 	>=x11-libs/motif-config-0.9"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
-	|| ( ( x11-proto/xextproto
-			x11-misc/xbitmaps
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-misc/xbitmaps"
 
 PROVIDE="virtual/motif"