Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

11 files changed, 37 insertions, 28 deletions

diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog
index a43732e3b0a9..7ec4fa41a54c 100644
--- a/sci-mathematics/axiom/ChangeLog
+++ b/sci-mathematics/axiom/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/axiom
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.13 2007/03/19 00:06:23 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.14 2007/07/22 06:57:09 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; axiom-3.9-r1.ebuild:
+  Drop virtual/x11 references.
 
   19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove plasmaroo from metadata.xml due to retirement.
diff --git a/sci-mathematics/axiom/axiom-3.9-r1.ebuild b/sci-mathematics/axiom/axiom-3.9-r1.ebuild
index 98e665810477..65e2a1c6b063 100644
--- a/sci-mathematics/axiom/axiom-3.9-r1.ebuild
+++ b/sci-mathematics/axiom/axiom-3.9-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-mathematics/axiom/axiom-3.9-r1.ebuild,v 1.4 2006/10/01 13:00:20 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-3.9-r1.ebuild,v 1.5 2007/07/22 06:57:09 dberkholz Exp $
 
 inherit eutils
 
@@ -14,10 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/tetex
-	|| (
-		x11-libs/libXaw
-		virtual/x11
-	)"
+	x11-libs/libXaw"
 
 S="${WORKDIR}/axiom"
 
diff --git a/sci-mathematics/octave-forge/ChangeLog b/sci-mathematics/octave-forge/ChangeLog
index 43119efe38bc..322f839e2e28 100644
--- a/sci-mathematics/octave-forge/ChangeLog
+++ b/sci-mathematics/octave-forge/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/octave-forge
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/ChangeLog,v 1.23 2007/07/13 15:35:23 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/ChangeLog,v 1.24 2007/07/22 07:00:50 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  octave-forge-2006.01.28.ebuild, octave-forge-2006.03.17.ebuild,
+  octave-forge-2006.03.17-r1.ebuild:
+  Drop virtual/x11 references.
 
   13 Jul 2007; Markus Dittrich <markusle@gentoo.org>
   -octave-forge-2004.11.16-r1.ebuild, -octave-forge-2005.06.13.ebuild,
diff --git a/sci-mathematics/octave-forge/octave-forge-2006.01.28.ebuild b/sci-mathematics/octave-forge/octave-forge-2006.01.28.ebuild
index c9c01d78e33c..64bbf0c0c44d 100644
--- a/sci-mathematics/octave-forge/octave-forge-2006.01.28.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2006.01.28.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-mathematics/octave-forge/octave-forge-2006.01.28.ebuild,v 1.6 2007/07/13 15:35:23 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2006.01.28.ebuild,v 1.7 2007/07/22 07:00:50 dberkholz Exp $
 
 inherit eutils
 
@@ -24,7 +24,7 @@ DEPEND="~sci-mathematics/octave-2.1.72
 		sys-libs/ncurses
 		virtual/lapack
 		virtual/blas
-		X? ( || ( x11-libs/libX11 virtual/x11 ) )
+		X? ( x11-libs/libX11 )
 		!amd64? ( ginac? ( sci-mathematics/ginac ) )
 		qhull? ( >=media-libs/qhull-3.1-r1 )"
 
diff --git a/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild b/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild
index dfa3ddbe9f0e..a74465aec3ec 100644
--- a/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2006.03.17-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-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild,v 1.3 2007/07/13 15:35:23 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild,v 1.4 2007/07/22 07:00:50 dberkholz Exp $
 
 inherit eutils
 
@@ -25,7 +25,7 @@ DEPEND=">=sci-mathematics/octave-2.1.72
 		virtual/lapack
 		virtual/blas
 		sci-calculators/units
-		X? ( || ( x11-libs/libX11 virtual/x11 ) )
+		X? ( x11-libs/libX11 )
 		!amd64? ( ginac? ( sci-mathematics/ginac ) )
 		qhull? ( >=media-libs/qhull-3.1-r1 )"
 
diff --git a/sci-mathematics/octave-forge/octave-forge-2006.03.17.ebuild b/sci-mathematics/octave-forge/octave-forge-2006.03.17.ebuild
index e1e5066e77e2..7255364d1d08 100644
--- a/sci-mathematics/octave-forge/octave-forge-2006.03.17.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2006.03.17.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-mathematics/octave-forge/octave-forge-2006.03.17.ebuild,v 1.8 2007/07/13 15:35:23 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2006.03.17.ebuild,v 1.9 2007/07/22 07:00:50 dberkholz Exp $
 
 inherit eutils
 
@@ -24,7 +24,7 @@ DEPEND=">=sci-mathematics/octave-2.1.72
 		sys-libs/ncurses
 		virtual/lapack
 		virtual/blas
-		X? ( || ( x11-libs/libX11 virtual/x11 ) )
+		X? ( x11-libs/libX11 )
 		!amd64? ( ginac? ( sci-mathematics/ginac ) )
 		qhull? ( >=media-libs/qhull-3.1-r1 )"
 
diff --git a/sci-mathematics/pari/ChangeLog b/sci-mathematics/pari/ChangeLog
index 6c58cb24d026..59be473aeb51 100644
--- a/sci-mathematics/pari/ChangeLog
+++ b/sci-mathematics/pari/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/pari
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.42 2007/05/06 12:25:45 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.43 2007/07/22 06:59:26 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; pari-2.3.0.ebuild,
+  pari-2.3.2.ebuild:
+  Drop virtual/x11 references.
 
 *pari-2.3.2 (06 May 2007)
 
diff --git a/sci-mathematics/pari/pari-2.3.0.ebuild b/sci-mathematics/pari/pari-2.3.0.ebuild
index 14739c48942a..994812c77207 100644
--- a/sci-mathematics/pari/pari-2.3.0.ebuild
+++ b/sci-mathematics/pari/pari-2.3.0.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-mathematics/pari/pari-2.3.0.ebuild,v 1.4 2006/09/26 15:18:10 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.0.ebuild,v 1.5 2007/07/22 06:59:26 dberkholz Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -15,7 +15,7 @@ IUSE="doc emacs X"
 
 DEPEND="doc? ( virtual/tetex )
 		sys-libs/readline
-		X? ( || ( x11-libs/libX11 virtual/x11 ) )"
+		X? ( x11-libs/libX11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sci-mathematics/pari/pari-2.3.2.ebuild b/sci-mathematics/pari/pari-2.3.2.ebuild
index 7dbe79b5079c..b0752ae98597 100644
--- a/sci-mathematics/pari/pari-2.3.2.ebuild
+++ b/sci-mathematics/pari/pari-2.3.2.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-mathematics/pari/pari-2.3.2.ebuild,v 1.1 2007/05/06 12:25:45 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.2.ebuild,v 1.2 2007/07/22 06:59:26 dberkholz Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -15,7 +15,7 @@ IUSE="doc emacs X"
 
 DEPEND="doc? ( virtual/tetex )
 		sys-libs/readline
-		X? ( || ( x11-libs/libX11 virtual/x11 ) )"
+		X? ( x11-libs/libX11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sci-mathematics/snns/ChangeLog b/sci-mathematics/snns/ChangeLog
index e01f07bcfbe2..0f0fbd4d9d44 100644
--- a/sci-mathematics/snns/ChangeLog
+++ b/sci-mathematics/snns/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/snns
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v 1.11 2006/11/02 16:16:12 phosphan Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v 1.12 2007/07/22 06:58:17 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; snns-4.2-r7.ebuild:
+  Drop virtual/x11 references.
 
   02 Nov 2006; Patrick Kursawe <phosphan@gentoo.org> snns-4.2-r7.ebuild:
   Using correct Xaw3d includes now, bug #151053
diff --git a/sci-mathematics/snns/snns-4.2-r7.ebuild b/sci-mathematics/snns/snns-4.2-r7.ebuild
index b77e3ce70a10..749cdd6fb8b6 100644
--- a/sci-mathematics/snns/snns-4.2-r7.ebuild
+++ b/sci-mathematics/snns/snns-4.2-r7.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-mathematics/snns/snns-4.2-r7.ebuild,v 1.7 2006/11/02 16:16:12 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/snns-4.2-r7.ebuild,v 1.8 2007/07/22 06:58:17 dberkholz Exp $
 
 inherit eutils python
 
@@ -22,10 +22,7 @@ KEYWORDS="~amd64 ppc x86"
 SLOT="0"
 IUSE="X doc python"
 
-DEPEND="X? ( || (
-					x11-proto/xproto
-					<virtual/x11-7.0
-				)
+DEPEND="X? ( x11-proto/xproto
 	x11-libs/Xaw3d )
 	>=sys-apps/sed-4
 	python? ( >=dev-lang/python-2.3 )"