Instead of gnu-classpath-jdk, list all its alternatives directly. The extra dep indirection was only causing dependency resolution troubles. Remove the old icedtea6 name.

(Portage version: 2.2_rc67/svn/Linux x86_64, RepoMan options: --force)

svn path=/java-overlay/; revision=8150

6 files changed, 12 insertions, 57 deletions

diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 1043fb44..400930e5 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Apr 2010; Vlastimil Babka <caster@gentoo.org> -jdk-1.5.0-r1.ebuild,
+  jdk-1.5.0-r2.ebuild, -jdk-1.6.0-r1.ebuild, jdk-1.6.0-r2.ebuild:
+  Instead of gnu-classpath-jdk, list all its alternatives directly. The
+  extra dep indirection was only causing dependency resolution troubles.
+  Remove the old icedtea6 name.
+
   22 Feb 2010; Vlastimil Babka <caster@gentoo.org> jdk-1.4.2-r1.ebuild:
   Add 1.4 from main tree.
 
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 8f48a9a7..efbca9f5 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,7 +1,5 @@
 EBUILD jdk-1.4.2-r1.ebuild 573 RMD160 71f92afd309fb03877a41ed9ca32eff6b35a50d4 SHA1 29462a9026d011ad3e191e916664457635f8c3cb SHA256 0634a8b3715a15a8b2f1657d4c17a02464b7a23921f9de924009ccb135caed5b
-EBUILD jdk-1.5.0-r1.ebuild 660 RMD160 a6483d726edeabf748bf34da186a3e4f88c1eba2 SHA1 646fda9b45f91a87ec32149e50a06f65c3d740cc SHA256 42da855b634b99d48cda9936b99725146fe75dc2eac9c01e98e66a133020fc2f
-EBUILD jdk-1.5.0-r2.ebuild 619 RMD160 05d1829ffdf3f24a6b8c7cf9e071ef05c9c1788f SHA1 4832563dc39290f582da0bd7935c789d97bea6c6 SHA256 8835776603d82a548714976dec6685b9b4faec1c16c5ffdd6f493bb91fcd56ba
-EBUILD jdk-1.6.0-r1.ebuild 842 RMD160 883ad7f4cfc4dea05f66fb487e0400aaeaa1c7a8 SHA1 76a892716b357443c44e4bfe7d6f3f9ac9ae30ed SHA256 17f63327352fc23ee4b7580f54d892f5f423bedf804c0c093d0edc5aefd3f913
-EBUILD jdk-1.6.0-r2.ebuild 873 RMD160 4e81c2385588e1fb99b507e1913145cd2ad6611c SHA1 6c631c2a123f35dccab7e2450b41e1c71f027350 SHA256 951dc47627f3e0c7cd8e978fe47609ec93fe1d170ebf5e3f719750f331ab74fe
-MISC ChangeLog 2826 RMD160 e8002d6a5dcee81a0cf59c1f9ba99ae664a97fca SHA1 ba045fbb434c0448c808b0501bd21ff000b944d6 SHA256 5488e7eb4f3d72bcfcd5204cf758f102c0cbe7192fff8001e2fd8f1b028e12a4
+EBUILD jdk-1.5.0-r2.ebuild 660 RMD160 a6483d726edeabf748bf34da186a3e4f88c1eba2 SHA1 646fda9b45f91a87ec32149e50a06f65c3d740cc SHA256 42da855b634b99d48cda9936b99725146fe75dc2eac9c01e98e66a133020fc2f
+EBUILD jdk-1.6.0-r2.ebuild 853 RMD160 a2248d607029ad5751b807cb06dfa795e7f82ae7 SHA1 e04f770028a20d1b3304ab52beb669bb47f079a6 SHA256 28f595c68f457e3fe9c23b57cf67cedac3d662cb77538cff538e1dcdf397fb0a
+MISC ChangeLog 3143 RMD160 652d62bc4dfc1836f7d246f0942716398ada722a SHA1 0493814a2ec39df5aa5cb3d3d42ca77e530d1aa2 SHA256 175d381dfa3bb66e429b5bf7a67f31988be75a6ca96db28d6ea71d2d6efb782b
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
diff --git a/virtual/jdk/jdk-1.5.0-r1.ebuild b/virtual/jdk/jdk-1.5.0-r1.ebuild
deleted file mode 100644
index b3b8ce17..00000000
--- a/virtual/jdk/jdk-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Virtual for JDK"
-HOMEPAGE="http://java.sun.com/"
-SRC_URI=""
-
-LICENSE="as-is"
-SLOT="1.5"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="|| (
-		>=dev-java/gcj-jdk-4.3
-		=dev-java/jamvm-1.5*
-		>=dev-java/cacao-0.99.2
-		=dev-java/sun-jdk-1.5.0*
-		=dev-java/ibm-jdk-bin-1.5.0*
-		=dev-java/jrockit-jdk-bin-1.5.0*
-		=dev-java/diablo-jdk-1.5.0*
-		=dev-java/apple-jdk-bin-1.5.0*
-	)"
-DEPEND=""
diff --git a/virtual/jdk/jdk-1.5.0-r2.ebuild b/virtual/jdk/jdk-1.5.0-r2.ebuild
index 90e0e6d2..b3b8ce17 100644
--- a/virtual/jdk/jdk-1.5.0-r2.ebuild
+++ b/virtual/jdk/jdk-1.5.0-r2.ebuild
@@ -12,7 +12,9 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-l
 IUSE=""
 
 RDEPEND="|| (
-		=virtual/gnu-classpath-jdk-1.5
+		>=dev-java/gcj-jdk-4.3
+		=dev-java/jamvm-1.5*
+		>=dev-java/cacao-0.99.2
 		=dev-java/sun-jdk-1.5.0*
 		=dev-java/ibm-jdk-bin-1.5.0*
 		=dev-java/jrockit-jdk-bin-1.5.0*
diff --git a/virtual/jdk/jdk-1.6.0-r1.ebuild b/virtual/jdk/jdk-1.6.0-r1.ebuild
deleted file mode 100644
index 68818186..00000000
--- a/virtual/jdk/jdk-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.6 2008/01/18 01:41:42 ranger Exp $
-
-DESCRIPTION="Virtual for JDK"
-HOMEPAGE="http://java.sun.com/"
-SRC_URI=""
-
-LICENSE="as-is"
-SLOT="1.6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-# Keeps this and java-virtuals/jaf in sync
-RDEPEND="|| (
-		dev-java/icedtea6
-		dev-java/icedtea6-bin
-		=dev-java/sun-jdk-1.6.0*
-		=dev-java/ibm-jdk-bin-1.6.0*
-		=dev-java/hp-jdk-bin-1.6.0*
-		=dev-java/diablo-jdk-1.6.0*
-		=dev-java/soylatte-jdk-bin-1.0*
-		=dev-java/apple-jdk-bin-1.6.0*
-		=dev-java/winjdk-bin-1.6.0*
-	)"
-DEPEND=""
diff --git a/virtual/jdk/jdk-1.6.0-r2.ebuild b/virtual/jdk/jdk-1.6.0-r2.ebuild
index d3192209..c9ba4001 100644
--- a/virtual/jdk/jdk-1.6.0-r2.ebuild
+++ b/virtual/jdk/jdk-1.6.0-r2.ebuild
@@ -17,7 +17,6 @@ IUSE=""
 RDEPEND="|| (
 		dev-java/icedtea6-bin
 		dev-java/icedtea:6
-		dev-java/icedtea6
 		=dev-java/sun-jdk-1.6.0*
 		=dev-java/ibm-jdk-bin-1.6.0*
 		=dev-java/hp-jdk-bin-1.6.0*