Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

7 files changed, 27 insertions, 37 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index ad3c44d90217..db22c6c78620 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/root
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.6 2007/03/05 19:02:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.7 2007/07/22 06:53:29 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; root-3.05.04.ebuild,
+  root-3.10.02-r1.ebuild, root-4.02.00.ebuild:
+  Drop virtual/x11 references.
 
 *root-5.14.00c (05 Mar 2007)
 
diff --git a/sci-physics/root/root-3.05.04.ebuild b/sci-physics/root/root-3.05.04.ebuild
index 5869bd6cc6c2..bf36bc6fb5a2 100644
--- a/sci-physics/root/root-3.05.04.ebuild
+++ b/sci-physics/root/root-3.05.04.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-physics/root/root-3.05.04.ebuild,v 1.2 2006/11/23 20:05:43 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-3.05.04.ebuild,v 1.3 2007/07/22 06:53:29 dberkholz Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,20 +14,14 @@ LICENSE="as-is"
 KEYWORDS="x86 sparc ppc"
 IUSE="mysql postgres opengl"
 
-RDEPEND="|| (
-				virtual/x11
-				x11-libs/libXpm
-			)
+RDEPEND="x11-libs/libXpm
 	>=media-libs/freetype-2.0.9
 	opengl? ( virtual/opengl virtual/glu )
 	mysql? ( virtual/mysql )
 	postgres? ( >=dev-db/postgresql-7.1.3-r4 )"
 
 DEPEND="${RDEPEND}
-		|| (
-			virtual/x11
-			x11-proto/xproto
-		   )"
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sci-physics/root/root-3.10.02-r1.ebuild b/sci-physics/root/root-3.10.02-r1.ebuild
index 9b781c5f0fd2..3a09e7b62dc5 100644
--- a/sci-physics/root/root-3.10.02-r1.ebuild
+++ b/sci-physics/root/root-3.10.02-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-physics/root/root-3.10.02-r1.ebuild,v 1.2 2006/11/23 20:05:43 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-3.10.02-r1.ebuild,v 1.3 2007/07/22 06:53:29 dberkholz Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,10 +14,7 @@ LICENSE="as-is"
 KEYWORDS="~x86 ~amd64"
 IUSE="mysql postgres opengl afs kerberos ldap qt3"
 
-RDEPEND="|| (
-				virtual/x11
-				x11-libs/libXpm
-			)
+RDEPEND="x11-libs/libXpm
 	>=media-libs/freetype-2.0.9
 	sys-apps/shadow
 	opengl? ( virtual/opengl virtual/glu )
@@ -29,10 +26,7 @@ RDEPEND="|| (
 	qt3? ( =x11-libs/qt-3* )"
 
 DEPEND="${RDEPEND}
-		|| (
-			virtual/x11
-			x11-proto/xproto
-		   )"
+	x11-proto/xproto"
 
 src_compile() {
 	local myconf
diff --git a/sci-physics/root/root-4.02.00.ebuild b/sci-physics/root/root-4.02.00.ebuild
index 911a1aeeee09..51656474c619 100644
--- a/sci-physics/root/root-4.02.00.ebuild
+++ b/sci-physics/root/root-4.02.00.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-physics/root/root-4.02.00.ebuild,v 1.2 2006/11/23 20:05:43 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-4.02.00.ebuild,v 1.3 2007/07/22 06:53:29 dberkholz Exp $
 
 inherit flag-o-matic eutils
 
@@ -16,10 +16,7 @@ LICENSE="as-is"
 KEYWORDS="x86 -sparc -ppc"
 IUSE="afs kerberos ldap mysql opengl postgres python qt3"
 
-RDEPEND="|| (
-				virtual/x11
-				x11-libs/libXpm
-			)
+RDEPEND="x11-libs/libXpm
 	>=media-libs/freetype-2.0.9
 	sys-apps/shadow
 	opengl? ( virtual/opengl virtual/glu )
@@ -32,10 +29,7 @@ RDEPEND="|| (
 	python? ( dev-lang/python )"
 
 DEPEND="${RDEPEND}
-		|| (
-			virtual/x11
-			x11-proto/xproto
-		   )"
+	x11-proto/xproto"
 
 src_compile() {
 
diff --git a/sci-physics/xfoil/ChangeLog b/sci-physics/xfoil/ChangeLog
index d7a85418d644..4f79f03c43ac 100644
--- a/sci-physics/xfoil/ChangeLog
+++ b/sci-physics/xfoil/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/xfoil
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/ChangeLog,v 1.5 2007/05/23 13:17:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/ChangeLog,v 1.6 2007/07/22 06:51:22 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xfoil-6.94-r1.ebuild,
+  xfoil-6.96.ebuild:
+  Drop virtual/x11 references.
 
 *xfoil-6.96 (23 May 2007)
 
diff --git a/sci-physics/xfoil/xfoil-6.94-r1.ebuild b/sci-physics/xfoil/xfoil-6.94-r1.ebuild
index 1c8f25c9bbe0..dffa2ea33317 100644
--- a/sci-physics/xfoil/xfoil-6.94-r1.ebuild
+++ b/sci-physics/xfoil/xfoil-6.94-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-physics/xfoil/xfoil-6.94-r1.ebuild,v 1.1 2006/07/02 23:22:00 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/xfoil-6.94-r1.ebuild,v 1.2 2007/07/22 06:51:22 dberkholz Exp $
 
 inherit toolchain-funcs fortran
 
@@ -21,7 +21,7 @@ IUSE="doc"
 
 DEPEND="virtual/blas
 		sci-libs/blas-config
-		|| ( x11-libs/libX11 virtual/x11 )"
+		x11-libs/libX11"
 
 S=${WORKDIR}/XFOIL${MY_PV}
 
diff --git a/sci-physics/xfoil/xfoil-6.96.ebuild b/sci-physics/xfoil/xfoil-6.96.ebuild
index 034ad862437f..56f6c142c8a9 100644
--- a/sci-physics/xfoil/xfoil-6.96.ebuild
+++ b/sci-physics/xfoil/xfoil-6.96.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-physics/xfoil/xfoil-6.96.ebuild,v 1.1 2007/05/23 13:17:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/xfoil-6.96.ebuild,v 1.2 2007/07/22 06:51:22 dberkholz Exp $
 
 inherit toolchain-funcs fortran
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="doc examples"
 
-DEPEND="|| ( x11-libs/libX11 virtual/x11 )"
+DEPEND="x11-libs/libX11"
 
 RESTRICT="test"