Drop virtual/x11 references.

(Portage version: 2.1.2.9)

5 files changed, 42 insertions, 58 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 7b4d1a1741bc..ceb3529120fc 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.120 2007/06/17 09:01:57 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.121 2007/07/22 09:39:06 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org>
+  ibm-jdk-bin-1.5.0.3-r1.ebuild, ibm-jdk-bin-1.5.0.4.ebuild,
+  ibm-jdk-bin-1.5.0.4-r1.ebuild, ibm-jdk-bin-1.5.0.5.ebuild:
+  Drop virtual/x11 references.
 
   17 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   ibm-jdk-bin-1.4.2.8.ebuild:
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild
index 9d83c828e670..2b38ad92e3ca 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-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/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild,v 1.8 2007/07/11 19:58:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild,v 1.9 2007/07/22 09:39:06 graaff Exp $
 
 inherit java-vm-2 versionator eutils rpm
 
@@ -67,20 +67,14 @@ RESTRICT="fetch"
 
 RDEPEND="
 		=virtual/libstdc++-3.3
-		X? ( || (
-					(
-						x11-libs/libXt
-						x11-libs/libX11
-						x11-libs/libXtst
-						x11-libs/libXp
-						x11-libs/libXext
-						x11-libs/libXi
-						x11-libs/libXmu
-						x11-libs/libXft
-					)
-					virtual/x11
-				)
-			)
+		X? ( x11-libs/libXt
+		    x11-libs/libX11
+		    x11-libs/libXtst
+		    x11-libs/libXp
+		    x11-libs/libXext
+		    x11-libs/libXi
+		    x11-libs/libXmu
+		    x11-libs/libXft )
 		alsa? ( media-libs/alsa-lib )
 		nsplugin? (
 			x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* )
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4-r1.ebuild
index 4faf80ef1b70..ab8574cfbbfd 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4-r1.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4-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/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4-r1.ebuild,v 1.2 2007/07/11 19:58:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4-r1.ebuild,v 1.3 2007/07/22 09:39:06 graaff Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -71,19 +71,14 @@ IUSE="X alsa doc examples javacomm nsplugin"
 
 RDEPEND="
 		=virtual/libstdc++-3.3
-		X? ( || (
-					(
-						x11-libs/libXt
-						x11-libs/libX11
-						x11-libs/libXtst
-						x11-libs/libXp
-						x11-libs/libXext
-						x11-libs/libXi
-						x11-libs/libXmu
-						x11-libs/libXft
-					)
-					virtual/x11
-				)
+		X? ( x11-libs/libXt
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXp
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXmu
+			x11-libs/libXft
 			)
 		alsa? ( media-libs/alsa-lib )
 		doc? ( =dev-java/java-sdk-docs-1.5.0* )
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4.ebuild
index 62daaca43b26..a276dccd4e28 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4.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/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4.ebuild,v 1.6 2007/07/11 19:58:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4.ebuild,v 1.7 2007/07/22 09:39:06 graaff Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -70,19 +70,14 @@ RESTRICT="fetch"
 
 RDEPEND="
 		=virtual/libstdc++-3.3
-		X? ( || (
-					(
-						x11-libs/libXt
-						x11-libs/libX11
-						x11-libs/libXtst
-						x11-libs/libXp
-						x11-libs/libXext
-						x11-libs/libXi
-						x11-libs/libXmu
-						x11-libs/libXft
-					)
-					virtual/x11
-				)
+		X? ( x11-libs/libXt
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXp
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXmu
+			x11-libs/libXft
 			)
 		alsa? ( media-libs/alsa-lib )
 		nsplugin? (
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.5.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.5.ebuild
index 26b7857e86e1..7e5e05f8e92c 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.5.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.5.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/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.5.ebuild,v 1.2 2007/07/11 19:58:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.5.ebuild,v 1.3 2007/07/22 09:39:06 graaff Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -71,19 +71,14 @@ IUSE="X alsa doc examples javacomm nsplugin"
 
 RDEPEND="
 		=virtual/libstdc++-3.3
-		X? ( || (
-					(
-						x11-libs/libXt
-						x11-libs/libX11
-						x11-libs/libXtst
-						x11-libs/libXp
-						x11-libs/libXext
-						x11-libs/libXi
-						x11-libs/libXmu
-						x11-libs/libXft
-					)
-					virtual/x11
-				)
+		X? ( x11-libs/libXt
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXp
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXmu
+			x11-libs/libXft
 			)
 		alsa? ( media-libs/alsa-lib )
 		doc? ( =dev-java/java-sdk-docs-1.5.0* )