Remove virtual/x11 option from modular X deps.

(Portage version: 2.1.2_pre1-r1)

5 files changed, 34 insertions, 53 deletions

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"