Add JDK variants and keywords that were added to the ebuilds in main tree.

(Portage version: 2.2_rc61/svn/Linux x86_64)

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

6 files changed, 31 insertions, 14 deletions

diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 351a31a7..ac7ac58c 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for virtual/jdk
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jan 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:
+  Add JDK variants and keywords that were added to the ebuilds in main tree.
+
   20 Dec 2008; Vlastimil Babka <caster@gentoo.org> +metadata.xml:
   Add icedtea6-bin as a jdk-1.6.0 provider.
 
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index c54ac9fc..9fedcfd5 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,7 +1,7 @@
 EBUILD jdk-1.4.2-r1.ebuild 477 RMD160 7bad27e2b9350a3ae0373f95d20cebfd5ea048af SHA1 23e4d9e9901afd128c66996bd2fbdc99cb5c2c7a SHA256 fc93026823e8683960560df706b98066beab29cfcab966914c0c81e59f025ca8
-EBUILD jdk-1.5.0-r1.ebuild 491 RMD160 0e6f661bf3832bca439d655f300a51c734517ec9 SHA1 56ad0fddad5ffa412af935854aa90258c1204511 SHA256 b4a28067d043bec997936cf47b986ca3b46a7b1ad27cfacf8f50631b3725b2e3
-EBUILD jdk-1.5.0-r2.ebuild 450 RMD160 4119cfdc3a545c21648c19464f10e55d10982a54 SHA1 264541633f5c1add04cae5aed358c4154be39a72 SHA256 5ed67fb167e06beb85d1a842f26725ef7f4cf364cdd66552ee5b44ed51e784d0
-EBUILD jdk-1.6.0-r1.ebuild 503 RMD160 c90aa96e7739f99bb9a1fd2741fdcdd7a49845e8 SHA1 5a280c0e21020fa31002d619aad1d3628fb83d8d SHA256 585b83f494f77279942ca5a24c3fd7e500e7ebfb8d0f72f7c27025c931294631
-EBUILD jdk-1.6.0-r2.ebuild 534 RMD160 1e6b917155e79ef4401ec4d098e9442c02d35f9d SHA1 727e8420969478e4122e2b571b3f98c8a538c4f8 SHA256 91ed3f4959e65cc510de4b6bb610ab9e3d631075287eae303d6c0366ebc5364f
-MISC ChangeLog 2403 RMD160 18d3a718dd5ea1e8b93bc3fc3c5d7c1fd97111df SHA1 786de7d6b0355927a32f3be22f631fe26df6dece SHA256 7d80c33adfbd5b5887ecd66a029016d32004a9123cb7e236845324a96a8b6bff
+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 849 RMD160 e8fc0c0cd21d8b9ba82a31fa488f5160b6aaa80d SHA1 b790a27937cf6125ed317e2a61eb2ab44a123492 SHA256 2539bb283cf6f1e2b6239fed9a75579f8884037a3bc1ced546acfdd579d563ab
+MISC ChangeLog 2618 RMD160 74740896a7efefe746ec86ae01b38c0aceb471fe SHA1 e6008031058dda35e73b65fee98f87129b88a267 SHA256 ced53ca1f02bd3e6ae3023dd6427cd3a27adaf8b061b53b2bb177a93b1473c6d
 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
index cfb31feb..b3b8ce17 100644
--- a/virtual/jdk/jdk-1.5.0-r1.ebuild
+++ b/virtual/jdk/jdk-1.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE="as-is"
 SLOT="1.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+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="|| (
@@ -19,5 +19,6 @@ RDEPEND="|| (
 		=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 368876ab..90e0e6d2 100644
--- a/virtual/jdk/jdk-1.5.0-r2.ebuild
+++ b/virtual/jdk/jdk-1.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE="as-is"
 SLOT="1.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+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="|| (
@@ -17,5 +17,6 @@ RDEPEND="|| (
 		=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.6.0-r1.ebuild b/virtual/jdk/jdk-1.6.0-r1.ebuild
index ae3abc0f..68818186 100644
--- a/virtual/jdk/jdk-1.6.0-r1.ebuild
+++ b/virtual/jdk/jdk-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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 $
 
@@ -8,13 +8,19 @@ SRC_URI=""
 
 LICENSE="as-is"
 SLOT="1.6"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+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 9a056816..8a3ae572 100644
--- a/virtual/jdk/jdk-1.6.0-r2.ebuild
+++ b/virtual/jdk/jdk-1.6.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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 $
 
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE="as-is"
 SLOT="1.6"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+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
@@ -17,5 +17,10 @@ RDEPEND="|| (
 		=virtual/icedtea-jdk-1.6
 		=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=""