remove obsolete java-scheme virtual. remove versions from provide: bug 93028

32 files changed, 117 insertions, 97 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index fe9d8ed50f16..211078541ba3 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.27 2005/04/22 08:31:20 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.28 2005/05/18 15:45:53 axxo Exp $
+
+  18 May 2005; Thomas Matthijs <axxo@gentoo.org>
+  ibm-jdk-bin-1.4.1-r2.ebuild, ibm-jdk-bin-1.4.2.ebuild:
+  remove obsolete java-scheme virtual. remove versions from provide: bug 93028
 
   22 Apr 2005; Simon Stelling <blubb@gentoo.org> ibm-jdk-bin-1.4.2.ebuild:
   stable on amd64
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild
index c4a586be400c..e6604cce3a5c 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2005 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.4.1-r2.ebuild,v 1.10 2005/01/09 10:46:44 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild,v 1.11 2005/05/18 15:45:53 axxo Exp $
 
 inherit java eutils
 
 DESCRIPTION="IBM Java Development Kit ${PV}"
+HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/"
 SRC_URI="ppc? ( mirror://gentoo/IBMJava2-SDK-141.ppc.tgz )
 	ppc64? ( mirror://gentoo/IBMJava2-SDK-141.ppc64.tgz )
 	x86? ( mirror://gentoo/IBMJava2-SDK-141.tgz )
@@ -12,9 +13,8 @@ SRC_URI="ppc? ( mirror://gentoo/IBMJava2-SDK-141.ppc.tgz )
 		x86? ( mirror://gentoo/IBMJava2-JAVACOMM-141.tgz )
 		ppc64? ( mirror://gentoo/IBMJava2-JAVACOMM-141.tgz )
 		)"
-PROVIDE="virtual/jdk-1.4.1
-	virtual/jre-1.4.1
-	virtual/java-scheme-2"
+PROVIDE="virtual/jdk
+	virtual/jre"
 SLOT="1.4"
 LICENSE="IBM-J1.4"
 KEYWORDS="ppc ~x86 ppc64"
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild
index 89333a92bfe1..0244a77e12ff 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2005 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.4.2.ebuild,v 1.21 2005/04/22 08:31:20 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v 1.22 2005/05/18 15:45:53 axxo Exp $
 
 inherit java eutils
 
 DESCRIPTION="IBM Java Development Kit ${PV}"
+HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/"
 SRC_URI="ppc? ( mirror://gentoo/IBMJava2-SDK-142.ppc.tgz )
 	ppc64? ( mirror://gentoo/IBMJava2-SDK-142.ppc64.tgz )
 	x86? ( mirror://gentoo/IBMJava2-SDK-142.tgz )
@@ -14,9 +15,8 @@ SRC_URI="ppc? ( mirror://gentoo/IBMJava2-SDK-142.ppc.tgz )
 		ppc64? ( mirror://gentoo/IBMJava2-JAVACOMM-142.tgz )
 		amd64? ( mirror://gentoo/IBMJava2-JAVACOMM-AMD64-142.x86_64.tgz )
 		)"
-PROVIDE="virtual/jdk-1.4.2
-	virtual/jre-1.4.2
-	virtual/java-scheme-2"
+PROVIDE="virtual/jdk
+	virtual/jre"
 SLOT="1.4"
 LICENSE="IBM-J1.4"
 KEYWORDS="ppc ~x86 ppc64 amd64"
diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 8d9fdd027491..7c7e22dcc428 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ibm-jre-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.16 2005/05/10 08:20:28 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.17 2005/05/18 15:45:12 axxo Exp $
+
+  18 May 2005; Thomas Matthijs <axxo@gentoo.org>
+  ibm-jre-bin-1.4.1-r1.ebuild, ibm-jre-bin-1.4.2.ebuild:
+  remove obsolete java-scheme virtual. remove versions from provide: bug 93028
 
   10 May 2005; Markus Rothe <corsair@gentoo.org> ibm-jre-bin-1.4.2.ebuild:
   don't install mozilla plugin on ppc64
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild
index 930dd3a97f36..69774fed4a5e 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild,v 1.13 2005/03/31 22:29:53 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild,v 1.14 2005/05/18 15:45:12 axxo Exp $
 
 inherit java
 
 S="${WORKDIR}/j2sdk${PV}"
 DESCRIPTION="IBM Java Development Kit ${PV}"
+HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/"
 SRC_URI="ppc?(mirror://gentoo/IBMJava2-JRE-141.ppc.tgz)
 	ppc64?(mirror://gentoo/IBMJava2-JRE-141.ppc64.tgz)
 	x86?(mirror://gentoo/IBMJava2-JRE-141.tgz)"
-PROVIDE="virtual/jre-1.4.1
-	virtual/java-scheme-2"
+PROVIDE="virtual/jre"
 IUSE="mozilla"
 SLOT="1.4"
 LICENSE="IBM-J1.4"
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild
index 24223a4fc556..6d638793b2c2 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild,v 1.7 2005/05/10 08:20:28 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild,v 1.8 2005/05/18 15:45:12 axxo Exp $
 
 inherit java
 
 S="${WORKDIR}/j2sdk${PV}"
 DESCRIPTION="IBM Java Development Kit ${PV}"
+HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/"
 SRC_URI="ppc?(mirror://gentoo/IBMJava2-JRE-142.ppc.tgz)
 	ppc64?(mirror://gentoo/IBMJava2-JRE-142.ppc64.tgz)
 	x86?(mirror://gentoo/IBMJava2-JRE-142.tgz)"
-PROVIDE="virtual/jre-1.4.2
-	virtual/java-scheme-2"
+PROVIDE="virtual/jre"
 IUSE="mozilla"
 SLOT="1.4"
 LICENSE="IBM-J1.4"
diff --git a/dev-java/jrockit-jdk-bin/ChangeLog b/dev-java/jrockit-jdk-bin/ChangeLog
index 08e4b310e172..62496a19608d 100644
--- a/dev-java/jrockit-jdk-bin/ChangeLog
+++ b/dev-java/jrockit-jdk-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jrockit-jdk-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/ChangeLog,v 1.9 2005/03/27 23:31:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/ChangeLog,v 1.10 2005/05/18 15:46:07 axxo Exp $
+
+  18 May 2005; Thomas Matthijs <axxo@gentoo.org>
+  jrockit-jdk-bin-1.4.2.04.ebuild, jrockit-jdk-bin-1.4.2.05.ebuild,
+  jrockit-jdk-bin-5.0.ebuild:
+  remove obsolete java-scheme virtual. remove versions from provide: bug 93028
 
 *jrockit-jdk-bin-1.4.2.05 (28 Mar 2005)
 
diff --git a/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.04.ebuild b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.04.ebuild
index 6213b94ac10f..096d6abce077 100644
--- a/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.04.ebuild
+++ b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.04.ebuild,v 1.5 2005/02/04 17:57:07 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.04.ebuild,v 1.6 2005/05/18 15:46:07 axxo Exp $
 
 IUSE=""
 
@@ -23,9 +23,8 @@ DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.5
 	>=app-arch/unzip-5.50-r1"
 
-PROVIDE="virtual/jre-1.4
-	virtual/jdk-1.4
-	virtual/java-scheme-2"
+PROVIDE="virtual/jre
+	virtual/jdk"
 
 pkg_nofetch() {
 	einfo "Please download ${A} from:"
diff --git a/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.05.ebuild b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.05.ebuild
index 78b6f4fc79f6..8bb1cf7358d6 100644
--- a/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.05.ebuild
+++ b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.05.ebuild,v 1.1 2005/03/27 23:31:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.05.ebuild,v 1.2 2005/05/18 15:46:07 axxo Exp $
 
 IUSE=""
 
@@ -29,9 +29,8 @@ DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.5
 	>=app-arch/unzip-5.50-r1"
 
-PROVIDE="virtual/jre-1.4
-	virtual/jdk-1.4
-	virtual/java-scheme-2"
+PROVIDE="virtual/jre
+	virtual/jdk"
 
 pkg_nofetch() {
 	einfo "Please download ${A} from:"
diff --git a/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-5.0.ebuild b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-5.0.ebuild
index cd7fea97a43a..a65d2d64ebe7 100644
--- a/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-5.0.ebuild
+++ b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-5.0.ebuild,v 1.3 2005/02/13 13:38:50 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-5.0.ebuild,v 1.4 2005/05/18 15:46:07 axxo Exp $
 
 # WARNING: This is the default VM on ia64, so treat this ebuild
 # with proper care.
@@ -23,9 +23,8 @@ IUSE=""
 DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.5
 	>=app-arch/unzip-5.50-r1"
-PROVIDE="virtual/jre-1.5
-	virtual/jdk-1.5
-	virtual/java-scheme-2"
+PROVIDE="virtual/jre
+	virtual/jdk"
 
 pkg_nofetch() {
 	einfo "Please download ${A} by"
diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index 5a3ac370ab9e..14eeee4abecb 100644
--- a/dev-java/kaffe/ChangeLog
+++ b/dev-java/kaffe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/kaffe
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.31 2005/04/11 12:48:00 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.32 2005/05/18 15:46:55 axxo Exp $
+
+  18 May 2005; Thomas Matthijs <axxo@gentoo.org> kaffe-1.1.4.ebuild,
+  kaffe-1.1.4_p20041220.ebuild, kaffe-1.1.5.ebuild:
+  remove obsolete java-scheme virtual. remove versions from provide: bug 93028
 
   11 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> kaffe-1.1.4.ebuild,
   kaffe-1.1.4_p20041220.ebuild, kaffe-1.1.5.ebuild:
diff --git a/dev-java/kaffe/kaffe-1.1.4.ebuild b/dev-java/kaffe/kaffe-1.1.4.ebuild
index 9431c4b22711..4f4bb2af62dd 100644
--- a/dev-java/kaffe/kaffe-1.1.4.ebuild
+++ b/dev-java/kaffe/kaffe-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.4.ebuild,v 1.14 2005/04/11 12:48:00 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.4.ebuild,v 1.15 2005/05/18 15:46:55 axxo Exp $
 
 inherit java flag-o-matic
 
@@ -18,9 +18,8 @@ SLOT="0"
 KEYWORDS="x86 sparc ~ppc hppa amd64"
 IUSE="alsa esd"
 
-PROVIDE="virtual/jdk-1.4
-		virtual/jre-1.4
-		virtual/java-scheme-2"
+PROVIDE="virtual/jdk
+		virtual/jre"
 
 src_compile() {
 	# see #88330
diff --git a/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild b/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild
index 9db661b06f49..cae24d1bce02 100644
--- a/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild
+++ b/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild,v 1.3 2005/04/11 12:48:00 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild,v 1.4 2005/05/18 15:46:55 axxo Exp $
 
 inherit java flag-o-matic
 
@@ -20,9 +20,8 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="alsa esd"
 
-PROVIDE="virtual/jdk-1.4
-	virtual/jre-1.4
-	virtual/java-scheme-2"
+PROVIDE="virtual/jdk
+	virtual/jre"
 S=${WORKDIR}/kaffe-${date}
 
 src_compile() {
diff --git a/dev-java/kaffe/kaffe-1.1.5.ebuild b/dev-java/kaffe/kaffe-1.1.5.ebuild
index 7d440e30ebae..9f9f62726f52 100644
--- a/dev-java/kaffe/kaffe-1.1.5.ebuild
+++ b/dev-java/kaffe/kaffe-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.5.ebuild,v 1.5 2005/04/11 12:48:00 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.5.ebuild,v 1.6 2005/05/18 15:46:55 axxo Exp $
 
 inherit java flag-o-matic
 
@@ -19,9 +19,8 @@ SLOT="0"
 KEYWORDS="~x86 ~sparc ~amd64 -ppc"
 IUSE="alsa esd"
 
-PROVIDE="virtual/jdk-1.4
-	virtual/jre-1.4
-	virtual/java-scheme-2"
+PROVIDE="virtual/jdk
+	virtual/jre"
 #S=${WORKDIR}/kaffe-${date}
 
 src_compile() {
diff --git a/dev-java/sun-j2ee/ChangeLog b/dev-java/sun-j2ee/ChangeLog
index e74377939b7a..15d97c112c98 100644
--- a/dev-java/sun-j2ee/ChangeLog
+++ b/dev-java/sun-j2ee/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/sun-j2ee
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/ChangeLog,v 1.17 2004/11/30 21:41:31 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/ChangeLog,v 1.18 2005/05/18 15:49:41 axxo Exp $
+
+  18 May 2005; Thomas Matthijs <axxo@gentoo.org> sun-j2ee-1.3.1-r2.ebuild:
+  remove obsolete java-scheme virtual. remove versions from provide: bug 93028
 
   30 Nov 2004; Sven Wegener <swegener@gentoo.org> sun-j2ee-1.3.1-r2.ebuild:
   Fixed invalid atoms in *DEPEND.
diff --git a/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild b/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild
index b09c4903f881..10646828705d 100644
--- a/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild
+++ b/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild,v 1.5 2004/11/30 21:41:31 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/sun-j2ee-1.3.1-r2.ebuild,v 1.6 2005/05/18 15:49:41 axxo Exp $
 
 inherit java-pkg
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://java.sun.com/j2ee/download.html#sdk"
 DEPEND="virtual/libc
 		>=sys-libs/lib-compat-1.1"
 RDEPEND=">=virtual/jre-1.3.1"
-PROVIDE="virtual/j2ee-1.3.1"
+PROVIDE="virtual/j2ee"
 LICENSE="sun-bcla-j2ee"
 RESTRICT="fetch"
 SLOT="0"
diff --git a/dev-java/sun-j2sdk/ChangeLog b/dev-java/sun-j2sdk/ChangeLog
index ac0ceab319de..6f487fef731a 100644
--- a/dev-java/sun-j2sdk/ChangeLog
+++ b/dev-java/sun-j2sdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-j2sdk
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.35 2005/04/21 22:56:04 cretin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.36 2005/05/18 15:47:16 axxo Exp $
+
+  18 May 2005; Thomas Matthijs <axxo@gentoo.org> sun-j2sdk-1.4.1-r1.ebuild,
+  sun-j2sdk-1.4.2.ebuild, sun-j2sdk-1.5.0.ebuild:
+  remove obsolete java-scheme virtual. remove versions from provide: bug 93028
 
   21 Apr 2005; Stefan Jones <cretin@gentoo.org>
   files/1.5.0/j2sdk-1.5.0-syntax.patch:
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild
index 3009bb98bc9b..04d5b1ba9467 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild,v 1.14 2004/09/29 21:01:53 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild,v 1.15 2005/05/18 15:47:16 axxo Exp $
 
 # Maintainer: Stefan Jones <cretin@gentoo.org>
 # Author: Stefan Jones <cretin@gentoo.org>
@@ -45,9 +45,8 @@ DEPEND="${RDEPEND}
 	>=virtual/jdk-1.4"
 PDEPEND="doc? ( =dev-java/java-sdk-docs-1.4.1* )"
 
-PROVIDE="virtual/jre-1.4.1
-	virtual/jdk-1.4.1
-	virtual/java-scheme-2"
+PROVIDE="virtual/jre
+	virtual/jdk"
 
 IUSE="nptl doc mozilla"
 
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild
index 119a99b39a37..1b3badc0920f 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild,v 1.14 2004/11/03 19:07:58 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild,v 1.15 2005/05/18 15:47:16 axxo Exp $
 
 inherit java
 
@@ -39,9 +39,8 @@ DEPEND="${RDEPEND}
 	>=media-libs/alsa-lib-0.9.0_rc5"
 PDEPEND="doc? ( =dev-java/java-sdk-docs-1.4.2* )"
 
-PROVIDE="virtual/jre-1.4.2
-	virtual/jdk-1.4.2
-	virtual/java-scheme-2"
+PROVIDE="virtual/jre
+	virtual/jdk"
 
 RESTRICT="fetch"
 
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild
index 5eb210c2fc23..ac42becb7121 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild,v 1.3 2005/04/21 22:56:04 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild,v 1.4 2005/05/18 15:47:16 axxo Exp $
 
 inherit java
 
@@ -34,9 +34,8 @@ DEPEND="${RDEPEND}
 	>=media-libs/alsa-lib-0.9.1"
 PDEPEND="doc? ( =dev-java/java-sdk-docs-1.4.2* )"
 
-PROVIDE="virtual/jre-1.4.2
-	virtual/jdk-1.4.2
-	virtual/java-scheme-2"
+PROVIDE="virtual/jre
+	virtual/jdk"
 
 RESTRICT="fetch"
 
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index dec8f011cf8e..f259b126b56b 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.111 2005/05/04 12:23:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.112 2005/05/18 15:48:35 axxo Exp $
+
+  18 May 2005; Thomas Matthijs <axxo@gentoo.org> sun-jdk-1.2.2.017.ebuild,
+  sun-jdk-1.3.1.13.ebuild, sun-jdk-1.4.2.07-r1.ebuild,
+  sun-jdk-1.4.2.08.ebuild, sun-jdk-1.5.0.02-r1.ebuild,
+  sun-jdk-1.5.0.03.ebuild:
+  remove obsolete java-scheme virtual. remove versions from provide: bug 93028
 
 *sun-jdk-1.5.0.03 (04 May 2005)
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild b/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild
index f94758ceec6c..585ee6e27991 100644
--- a/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.2.2.017.ebuild,v 1.4 2005/01/01 18:19:47 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild,v 1.5 2005/05/18 15:48:35 axxo Exp $
 
 inherit java
 
@@ -9,9 +9,8 @@ S="${WORKDIR}/jdk1.2.2"
 SRC_URI="${At}"
 DESCRIPTION="Sun Java Development"
 HOMEPAGE="http://java.sun.com/products/archive/"
-PROVIDE="virtual/jre-1.2.2
-	virtual/jdk-1.2.2
-	virtual/java-scheme-2"
+PROVIDE="virtual/jre
+	virtual/jdk"
 LICENSE="sun-bcla-java-vm-1.2"
 SLOT="1.2"
 KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa -arm"
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
index 24d7592fa405..e6a2109820b1 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.3.1.13.ebuild,v 1.6 2005/05/04 12:23:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild,v 1.7 2005/05/18 15:48:35 axxo Exp $
 
 inherit java eutils
 
@@ -17,9 +17,8 @@ DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.7
 	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
 RDEPEND="sys-libs/lib-compat"
-PROVIDE="virtual/jre-1.3.1
-	virtual/jdk-1.3.1
-	virtual/java-scheme-2"
+PROVIDE="virtual/jre
+	virtual/jdk"
 LICENSE="sun-bcla-java-vm"
 SLOT="1.3"
 KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa"
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild
index f5a0872ed3bd..3332fa71ede5 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.07-r1.ebuild,v 1.4 2005/05/04 12:23:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild,v 1.5 2005/05/18 15:48:35 axxo Exp $
 
 inherit java eutils
 
@@ -29,9 +29,8 @@ DEPEND=">=dev-java/java-config-1.1.5
 
 RDEPEND="sys-libs/lib-compat"
 
-PROVIDE="virtual/jre-1.4.2
-	virtual/jdk-1.4.2
-	virtual/java-scheme-2"
+PROVIDE="virtual/jre
+	virtual/jdk"
 
 PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar
 jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild
index 2fb1805edfdb..b3a4953c2999 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.08.ebuild,v 1.4 2005/05/04 12:23:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild,v 1.5 2005/05/18 15:48:35 axxo Exp $
 
 inherit java eutils
 
@@ -29,9 +29,8 @@ DEPEND=">=dev-java/java-config-1.1.5
 
 RDEPEND="sys-libs/lib-compat"
 
-PROVIDE="virtual/jre-1.4.2
-	virtual/jdk-1.4.2
-	virtual/java-scheme-2"
+PROVIDE="virtual/jre
+	virtual/jdk"
 
 PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar
 jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild
index 5e252a5e4402..73d12a42dff4 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.02-r1.ebuild,v 1.4 2005/05/04 12:23:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild,v 1.5 2005/05/18 15:48:35 axxo Exp $
 
 inherit java eutils
 
@@ -38,8 +38,8 @@ DEPEND=">=dev-java/java-config-1.2
 RDEPEND="x86? ( sys-libs/lib-compat )
 	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
 
-PROVIDE="virtual/jre-1.5
-	virtual/jdk-1.5"
+PROVIDE="virtual/jre
+	virtual/jdk"
 
 PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar"
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.03.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.03.ebuild
index a23c455bedd8..068ee6c0dd81 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.03.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.03.ebuild,v 1.1 2005/05/04 12:23:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.03.ebuild,v 1.2 2005/05/18 15:48:35 axxo Exp $
 
 inherit java eutils
 
@@ -38,8 +38,8 @@ DEPEND=">=dev-java/java-config-1.2
 RDEPEND="x86? ( sys-libs/lib-compat )
 	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
 
-PROVIDE="virtual/jre-1.5
-	virtual/jdk-1.5"
+PROVIDE="virtual/jre
+	virtual/jdk"
 
 PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar"
 
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index a6409b127251..5a23130fa4f7 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.24 2005/05/05 18:13:06 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.25 2005/05/18 15:48:38 axxo Exp $
+
+  18 May 2005; Thomas Matthijs <axxo@gentoo.org>
+  sun-jre-bin-1.4.2.07-r1.ebuild, sun-jre-bin-1.4.2.08.ebuild,
+  sun-jre-bin-1.5.0.02.ebuild, sun-jre-bin-1.5.0.03.ebuild:
+  remove obsolete java-scheme virtual. remove versions from provide: bug 93028
 
 *sun-jre-bin-1.5.0.03 (05 May 2005)
 
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild
index d4a9abfd2a94..607dd4008e3b 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.07-r1.ebuild,v 1.3 2005/04/03 20:11:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild,v 1.4 2005/05/18 15:48:38 axxo Exp $
 
 inherit java eutils
 
@@ -22,8 +22,7 @@ DEPEND=">=dev-java/java-config-1.1.5
 
 RDEPEND="sys-libs/lib-compat"
 
-PROVIDE="virtual/jre-1.4.2
-	virtual/java-scheme-2"
+PROVIDE="virtual/jre"
 
 PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar
 lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild
index 37b7a397f0be..a7aefd01e2b4 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.08.ebuild,v 1.1 2005/04/06 15:17:36 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild,v 1.2 2005/05/18 15:48:38 axxo Exp $
 
 inherit java eutils
 
@@ -22,8 +22,7 @@ DEPEND=">=dev-java/java-config-1.1.5
 
 RDEPEND="sys-libs/lib-compat"
 
-PROVIDE="virtual/jre-1.4.2
-	virtual/java-scheme-2"
+PROVIDE="virtual/jre"
 
 PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar
 lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild
index a6e6b3cc50ff..c3f4ff6d4cb4 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.02.ebuild,v 1.3 2005/04/03 20:11:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild,v 1.4 2005/05/18 15:48:38 axxo Exp $
 
 inherit java eutils
 
@@ -33,7 +33,7 @@ DEPEND=">=dev-java/java-config-1.2
 RDEPEND="x86? ( sys-libs/lib-compat )
 	virtual/lpr"
 
-PROVIDE="virtual/jre-1.5"
+PROVIDE="virtual/jre"
 
 PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
 
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.03.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.03.ebuild
index b0a6b2e151c0..a0563669cb21 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.03.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.03.ebuild,v 1.1 2005/05/05 18:13:06 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.03.ebuild,v 1.2 2005/05/18 15:48:38 axxo Exp $
 
 inherit java eutils
 
@@ -33,7 +33,7 @@ DEPEND=">=dev-java/java-config-1.2
 RDEPEND="x86? ( sys-libs/lib-compat )
 	virtual/lpr"
 
-PROVIDE="virtual/jre-1.5"
+PROVIDE="virtual/jre"
 
 PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"