Drop virtual/x11 references.

Package-Manager: portage-2.1.2.9

17 files changed, 45 insertions, 32 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 0a6596ca6505..a6c8e72fcb57 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.208 2007/07/15 01:46:00 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.209 2007/07/22 09:33:41 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> sun-jdk-1.4.2.14.ebuild,
+  sun-jdk-1.4.2.15.ebuild, sun-jdk-1.5.0.11.ebuild,
+  sun-jdk-1.5.0.11-r1.ebuild, sun-jdk-1.5.0.12.ebuild,
+  sun-jdk-1.6.0-r1.ebuild, sun-jdk-1.6.0-r2.ebuild, sun-jdk-1.6.0.01.ebuild,
+  sun-jdk-1.6.0.02.ebuild:
+  Drop virtual/x11 references.
 
   15 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
   sun-jdk-1.5.0.12.ebuild:
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.14.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.14.ebuild
index 7b085ca117e5..cf0d61ca12ae 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.14.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.14.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/sun-jdk/sun-jdk-1.4.2.14.ebuild,v 1.3 2007/05/04 00:48:18 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.14.ebuild,v 1.4 2007/07/22 09:33:41 graaff Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit pax-utils java-vm-2 eutils
@@ -176,7 +176,7 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if ! use X; then
-		ewarn "Some parts of Sun's JDK require virtual/x11 to be installed."
+		ewarn "Some parts of Sun's JDK require X11 libraries to be installed."
 		ewarn "Be careful which Java libraries you attempt to use."
 	fi
 	elog "Starting with 1.4.2.14 the src.zip is installed to the standard"
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.15.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.15.ebuild
index 246e075dec5c..ba18d8bbf4b6 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.15.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.15.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/sun-jdk/sun-jdk-1.4.2.15.ebuild,v 1.3 2007/07/02 18:52:31 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.15.ebuild,v 1.4 2007/07/22 09:33:41 graaff Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit pax-utils java-vm-2 eutils
@@ -167,7 +167,7 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if ! use X; then
-		ewarn "Some parts of Sun's JDK require virtual/x11 to be installed."
+		ewarn "Some parts of Sun's JDK require X11 libraries to be installed."
 		ewarn "Be careful which Java libraries you attempt to use."
 	fi
 	elog "Starting with 1.4.2.14 the src.zip is installed to the standard"
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.11-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.11-r1.ebuild
index 751942eba344..e03b3512da70 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.11-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.11-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/sun-jdk/sun-jdk-1.5.0.11-r1.ebuild,v 1.2 2007/07/02 14:37:02 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.11-r1.ebuild,v 1.3 2007/07/22 09:33:41 graaff Exp $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -135,7 +135,7 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if ! use X; then
-		local xwarn="virtual/x11 and/or"
+		local xwarn="X11 libraries and/or"
 	fi
 
 	echo
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild
index 6413aa03c462..e7f5f864264b 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.11.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/sun-jdk/sun-jdk-1.5.0.11.ebuild,v 1.6 2007/07/02 14:37:02 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild,v 1.7 2007/07/22 09:33:41 graaff Exp $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -134,7 +134,7 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if ! use X; then
-		local xwarn="virtual/x11 and/or"
+		local xwarn="X11 libraries and/or"
 	fi
 
 	echo
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.12.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.12.ebuild
index f9a65ef71559..146d31719eb3 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.12.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.12.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/sun-jdk/sun-jdk-1.5.0.12.ebuild,v 1.3 2007/07/15 01:46:00 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.12.ebuild,v 1.4 2007/07/22 09:33:41 graaff Exp $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -128,7 +128,7 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if ! use X; then
-		local xwarn="virtual/x11 and/or"
+		local xwarn="X11 libraries and/or"
 	fi
 
 	echo
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
index 58ff56e14dcd..ad9beb526aa6 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.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/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.9 2007/07/02 14:37:02 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.10 2007/07/22 09:33:41 graaff Exp $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -136,7 +136,7 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if ! use X; then
-		local xwarn="virtual/x11 and/or"
+		local xwarn="X11 libraries and/or"
 	fi
 
 	echo
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0-r2.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0-r2.ebuild
index 6658273732d1..c9abfe560b50 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0-r2.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0-r2.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/sun-jdk/sun-jdk-1.6.0-r2.ebuild,v 1.2 2007/07/02 14:37:02 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r2.ebuild,v 1.3 2007/07/22 09:33:41 graaff Exp $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -137,7 +137,7 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if ! use X; then
-		local xwarn="virtual/x11 and/or"
+		local xwarn="X11 libraries and/or"
 	fi
 
 	echo
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.01.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.01.ebuild
index ca09ddfe1c09..a7c344f36e84 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.01.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.01.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/sun-jdk/sun-jdk-1.6.0.01.ebuild,v 1.2 2007/07/02 14:37:02 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.01.ebuild,v 1.3 2007/07/22 09:33:41 graaff Exp $
 
 inherit versionator java-vm-2 eutils pax-utils
 
@@ -130,7 +130,7 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if ! use X; then
-		local xwarn="virtual/x11 and/or"
+		local xwarn="X11 libraries and/or"
 	fi
 
 	echo
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.02.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.02.ebuild
index 8acfb5f0af61..62ddc1d42173 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.02.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.02.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/sun-jdk/sun-jdk-1.6.0.02.ebuild,v 1.1 2007/07/12 21:06:58 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.02.ebuild,v 1.2 2007/07/22 09:33:41 graaff Exp $
 
 inherit versionator java-vm-2 eutils pax-utils
 
@@ -132,7 +132,7 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if ! use X; then
-		local xwarn="virtual/x11 and/or"
+		local xwarn="X11 libraries and/or"
 	fi
 
 	echo
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 0adec7732078..6f90b20b64cc 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.103 2007/07/15 01:50:57 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.104 2007/07/22 09:29:36 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org>
+  sun-jre-bin-1.4.2.14.ebuild, sun-jre-bin-1.4.2.15.ebuild,
+  sun-jre-bin-1.5.0.11.ebuild, sun-jre-bin-1.5.0.12.ebuild,
+  sun-jre-bin-1.6.0.01-r1.ebuild, sun-jre-bin-1.6.0.02.ebuild:
+  Drop virtual/x11 references.
 
   15 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
   sun-jre-bin-1.5.0.12.ebuild, sun-jre-bin-1.6.0.02.ebuild:
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.14.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.14.ebuild
index 6185af181ef8..5e7ab55dccb2 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.14.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.14.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/sun-jre-bin/sun-jre-bin-1.4.2.14.ebuild,v 1.4 2007/07/11 19:58:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.14.ebuild,v 1.5 2007/07/22 09:29:36 graaff Exp $
 
 inherit java-vm-2 eutils
 
@@ -153,7 +153,7 @@ pkg_postinst () {
 
 	if ! use X; then
 		echo
-		ewarn "Some parts of Sun's JDK require virtual/x11 to be installed."
+		ewarn "Some parts of Sun's JDK require X11 libraries to be installed."
 		ewarn "Be careful which Java libraries you attempt to use."
 	fi
 }
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.15.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.15.ebuild
index 183fc2685e10..64f7b7db1850 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.15.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.15.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/sun-jre-bin/sun-jre-bin-1.4.2.15.ebuild,v 1.2 2007/07/02 18:57:09 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.15.ebuild,v 1.3 2007/07/22 09:29:36 graaff Exp $
 
 inherit eutils pax-utils java-vm-2
 
@@ -123,7 +123,7 @@ pkg_postinst () {
 
 	if ! use X; then
 		echo
-		ewarn "Some parts of Sun's JDK require virtual/x11 to be installed."
+		ewarn "Some parts of Sun's JDK require X11 libraries to be installed."
 		ewarn "Be careful which Java libraries you attempt to use."
 	fi
 }
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild
index 698126265ecd..ee8a9935b84b 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.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/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild,v 1.5 2007/07/02 14:38:31 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild,v 1.6 2007/07/22 09:29:36 graaff Exp $
 
 inherit pax-utils eutils java-vm-2
 
@@ -119,7 +119,7 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if ! use X; then
-		local xwarn="virtual/x11 and/or"
+		local xwarn="X11 libraries and/or"
 	fi
 
 	echo
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.12.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.12.ebuild
index 9a327a9a15f1..942977719396 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.12.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.12.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/sun-jre-bin/sun-jre-bin-1.5.0.12.ebuild,v 1.3 2007/07/15 01:50:57 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.12.ebuild,v 1.4 2007/07/22 09:29:36 graaff Exp $
 
 inherit pax-utils eutils java-vm-2
 
@@ -114,7 +114,7 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if ! use X; then
-		local xwarn="virtual/x11 and/or"
+		local xwarn="X11 libraries and/or"
 	fi
 
 	echo
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild
index b7e5d495c6ea..af982070401b 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-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/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild,v 1.4 2007/07/02 14:38:31 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild,v 1.5 2007/07/22 09:29:36 graaff Exp $
 
 inherit versionator pax-utils eutils java-vm-2
 
@@ -117,7 +117,7 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if ! use X; then
-		local xwarn="virtual/x11 and/or"
+		local xwarn="X11 libraries and/or"
 	fi
 
 	echo
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.02.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.02.ebuild
index a995f7cab3be..a4110570b9ea 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.02.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.02.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/sun-jre-bin/sun-jre-bin-1.6.0.02.ebuild,v 1.2 2007/07/15 01:50:57 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.02.ebuild,v 1.3 2007/07/22 09:29:36 graaff Exp $
 
 inherit versionator pax-utils eutils java-vm-2
 
@@ -112,7 +112,7 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if ! use X; then
-		local xwarn="virtual/x11 and/or"
+		local xwarn="X11 libraries and/or"
 	fi
 
 	echo