Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

9 files changed, 81 insertions, 105 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index c0535838e3e5..c96bf7493613 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.27 2007/06/11 03:04:29 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.28 2007/07/22 07:10:12 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; gpsd-2.32.ebuild,
+  gpsd-2.33-r1.ebuild, gpsd-2.34-r1.ebuild:
+  Drop virtual/x11 references.
 
 *gpsd-2.34-r1 (11 Jun 2007)
 
diff --git a/sci-geosciences/gpsd/gpsd-2.32.ebuild b/sci-geosciences/gpsd/gpsd-2.32.ebuild
index 1b91ff03e8e3..2793fdbf25ec 100644
--- a/sci-geosciences/gpsd/gpsd-2.32.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.32.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/sci-geosciences/gpsd/gpsd-2.32.ebuild,v 1.2 2006/07/18 06:09:06 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.32.ebuild,v 1.3 2007/07/22 07:10:12 dberkholz Exp $
 
 inherit eutils libtool distutils
 
@@ -14,8 +14,8 @@ KEYWORDS="~arm amd64 ppc ppc64 ~sparc x86"
 
 IUSE="X usb dbus"
 
-RDEPEND="X? ( || (
-		( x11-libs/libXmu
+RDEPEND="X? (
+		x11-libs/libXmu
 		x11-libs/libXext
 		x11-libs/libXp
 		x11-libs/libX11
@@ -23,14 +23,8 @@ RDEPEND="X? ( || (
 		x11-libs/libSM
 		x11-libs/libICE
 		x11-libs/libXpm
-		x11-libs/libXaw )
-		|| (
-		    x11-libs/openmotif
-		    x11-libs/lesstif
-		)
-		( virtual/motif
-			virtual/x11 )
-		)
+		x11-libs/libXaw
+		virtual/motif
 	)
 	usb? ( sys-apps/hotplug )
 	dbus? ( >=sys-apps/dbus-0.6 )
@@ -40,10 +34,9 @@ RDEPEND="X? ( || (
 	sys-devel/gcc"
 
 DEPEND="${RDEPEND}
-	X? ( || (
-	    ( x11-proto/xproto x11-proto/xextproto )
-		virtual/x11
-	    )
+	X? (
+		x11-proto/xproto
+		x11-proto/xextproto
 	)"
 
 src_unpack() {
diff --git a/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild
index 03f9709a0def..32c451a115a2 100644
--- a/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.33-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/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild,v 1.2 2006/10/24 00:43:07 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild,v 1.3 2007/07/22 07:10:12 dberkholz Exp $
 
 inherit eutils libtool distutils
 
@@ -14,8 +14,8 @@ KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="dbus ntp static tntc usb X"
 
-RDEPEND="X? ( || (
-		( x11-libs/libXmu
+RDEPEND="X? (
+		x11-libs/libXmu
 		x11-libs/libXext
 		x11-libs/libXp
 		x11-libs/libX11
@@ -23,14 +23,8 @@ RDEPEND="X? ( || (
 		x11-libs/libSM
 		x11-libs/libICE
 		x11-libs/libXpm
-		x11-libs/libXaw )
-		|| (
-		    x11-libs/openmotif
-		    x11-libs/lesstif
-		)
-		( virtual/motif
-			virtual/x11 )
-		)
+		x11-libs/libXaw
+		virtual/motif
 	)
 	dev-lang/python
 	app-text/xmlto
@@ -39,10 +33,9 @@ RDEPEND="X? ( || (
 	usb? ( sys-apps/hotplug )"
 
 DEPEND="${RDEPEND}
-	X? ( || (
-	    ( x11-proto/xproto x11-proto/xextproto )
-		virtual/x11
-	    )
+	X? (
+		x11-proto/xproto
+		x11-proto/xextproto
 	)"
 
 RESTRICT="test"
diff --git a/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild
index 568e34ccb1c5..694b4c13c444 100644
--- a/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.34-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/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild,v 1.1 2007/06/11 03:04:29 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild,v 1.2 2007/07/22 07:10:12 dberkholz Exp $
 
 inherit eutils autotools distutils
 
@@ -14,8 +14,8 @@ KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="dbus italk itrax minimal ntp python static tntc usb X"
 
-RDEPEND="X? ( || (
-		( x11-libs/libXmu
+RDEPEND="X? (
+		x11-libs/libXmu
 		x11-libs/libXext
 		x11-libs/libXp
 		x11-libs/libX11
@@ -23,14 +23,8 @@ RDEPEND="X? ( || (
 		x11-libs/libSM
 		x11-libs/libICE
 		x11-libs/libXpm
-		x11-libs/libXaw )
-		|| (
-		    x11-libs/lesstif
-		    x11-libs/openmotif
-		)
-		( virtual/motif
-			virtual/x11 )
-		)
+		x11-libs/libXaw
+		virtual/motif
 	)
 	python? ( dev-lang/python )
 	app-text/xmlto
@@ -41,10 +35,9 @@ RDEPEND="X? ( || (
 	usb? ( virtual/dev-manager )"
 
 DEPEND="${RDEPEND}
-	X? ( || (
-	    ( x11-proto/xproto x11-proto/xextproto )
-		virtual/x11
-	    )
+	X? (
+		x11-proto/xproto
+		x11-proto/xextproto
 	)"
 
 RESTRICT="test"
diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 1ef960cb3432..84a028038031 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.42 2007/07/02 15:26:00 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.43 2007/07/22 07:13:53 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; grass-5.4.0.ebuild,
+  grass-6.0.1.ebuild, grass-6.2.0-r1.ebuild, grass-6.2.1.ebuild:
+  Drop virtual/x11 references.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> grass-6.0.1.ebuild,
   grass-6.2.0-r1.ebuild, grass-6.2.1.ebuild:
diff --git a/sci-geosciences/grass/grass-5.4.0.ebuild b/sci-geosciences/grass/grass-5.4.0.ebuild
index 2231b5cef693..599ab7d80d0f 100644
--- a/sci-geosciences/grass/grass-5.4.0.ebuild
+++ b/sci-geosciences/grass/grass-5.4.0.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/sci-geosciences/grass/grass-5.4.0.ebuild,v 1.11 2007/04/23 20:13:33 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.4.0.ebuild,v 1.12 2007/07/22 07:13:53 dberkholz Exp $
 
 inherit eutils toolchain-funcs
 
@@ -38,8 +38,8 @@ RDEPEND=">=sys-devel/make-3.80
 	tk? ( >=dev-lang/tk-8.3.4 )
 	truetype? ( >=media-libs/freetype-2.0.0 )
 	motif? ( x11-libs/openmotif )
-	X? ( || (
-		( x11-libs/libXmu
+	X? (
+		x11-libs/libXmu
 		x11-libs/libXext
 		x11-libs/libXp
 		x11-libs/libX11
@@ -47,15 +47,13 @@ RDEPEND=">=sys-devel/make-3.80
 		x11-libs/libSM
 		x11-libs/libICE
 		x11-libs/libXpm
-		x11-libs/libXaw )
-	virtual/x11 )
+		x11-libs/libXaw
 	)"
 
 DEPEND="${RDEPEND}
-	X? ( || (
-		( x11-proto/xproto x11-proto/xextproto )
-			virtual/x11
-		)
+	X? (
+		x11-proto/xproto
+		x11-proto/xextproto
 	)"
 
 src_unpack() {
diff --git a/sci-geosciences/grass/grass-6.0.1.ebuild b/sci-geosciences/grass/grass-6.0.1.ebuild
index 5ea2750b9e14..4de8854cd48a 100644
--- a/sci-geosciences/grass/grass-6.0.1.ebuild
+++ b/sci-geosciences/grass/grass-6.0.1.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/sci-geosciences/grass/grass-6.0.1.ebuild,v 1.14 2007/07/02 15:26:00 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.1.ebuild,v 1.15 2007/07/22 07:13:53 dberkholz Exp $
 
 inherit eutils
 
@@ -43,24 +43,19 @@ RDEPEND=">=sys-devel/make-3.80
 	opengl? ( virtual/opengl )
 	tk? ( >=dev-lang/tk-8.3.4 )
 	motif? ( x11-libs/openmotif )
-	|| (
-		( x11-libs/libXmu
-		x11-libs/libXext
-		x11-libs/libXp
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libXpm
-		x11-libs/libXaw )
-	virtual/x11
-	)"
+	x11-libs/libXmu
+	x11-libs/libXext
+	x11-libs/libXp
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXpm
+	x11-libs/libXaw"
 
 DEPEND="${RDEPEND}
-	|| (
-		( x11-proto/xproto x11-proto/xextproto )
-			virtual/x11
-	)"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sci-geosciences/grass/grass-6.2.0-r1.ebuild b/sci-geosciences/grass/grass-6.2.0-r1.ebuild
index 4da1021d988e..efd8bf4278e0 100644
--- a/sci-geosciences/grass/grass-6.2.0-r1.ebuild
+++ b/sci-geosciences/grass/grass-6.2.0-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/sci-geosciences/grass/grass-6.2.0-r1.ebuild,v 1.7 2007/07/02 15:26:00 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.0-r1.ebuild,v 1.8 2007/07/22 07:13:53 dberkholz Exp $
 
 inherit eutils autotools
 
@@ -49,22 +49,19 @@ RDEPEND=">=sys-devel/make-3.80
 	tk? ( >=dev-lang/tk-8.4 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	truetype? ( >=media-libs/freetype-2.0 )
-	|| (
-	    ( x11-libs/libXmu
-	    x11-libs/libXext
-	    x11-libs/libXp
-	    x11-libs/libX11
-	    x11-libs/libXt
-	    x11-libs/libSM
-	    x11-libs/libICE
-	    x11-libs/libXpm
-	    x11-libs/libXaw )
-	virtual/x11 )"
+	x11-libs/libXmu
+	x11-libs/libXext
+	x11-libs/libXp
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXpm
+	x11-libs/libXaw"
 
 DEPEND="${RDEPEND}
-	|| (
-	    ( x11-proto/xproto x11-proto/xextproto )
-	        virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 src_unpack() {
 	if use glw && ! use opengl; then
diff --git a/sci-geosciences/grass/grass-6.2.1.ebuild b/sci-geosciences/grass/grass-6.2.1.ebuild
index 513e15a9e747..7b0e484d4355 100644
--- a/sci-geosciences/grass/grass-6.2.1.ebuild
+++ b/sci-geosciences/grass/grass-6.2.1.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/sci-geosciences/grass/grass-6.2.1.ebuild,v 1.3 2007/07/02 15:26:00 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebuild,v 1.4 2007/07/22 07:13:53 dberkholz Exp $
 
 inherit eutils autotools
 
@@ -49,23 +49,22 @@ RDEPEND=">=sys-devel/make-3.80
 	tk? ( >=dev-lang/tk-8.4 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	truetype? ( >=media-libs/freetype-2.0 )
-	X? ( || (
-	    ( x11-libs/libXmu
-	    x11-libs/libXext
-	    x11-libs/libXp
-	    x11-libs/libX11
-	    x11-libs/libXt
-	    x11-libs/libSM
-	    x11-libs/libICE
-	    x11-libs/libXpm
-	    x11-libs/libXaw )
-	virtual/x11 )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXext
+		x11-libs/libXp
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-libs/libXpm
+		x11-libs/libXaw
 	)"
 
 DEPEND="${RDEPEND}
-	X? ( || (
-	    ( x11-proto/xproto x11-proto/xextproto )
-	        virtual/x11 )
+	X? (
+		x11-proto/xproto
+		x11-proto/xextproto
 	)"
 
 src_unpack() {