Add icedtea-7 alternative.

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index bcda89c6296cd3cdb04bbd118fc279c845ebd479..51fffef79eb7d082731baa057a1ee7d73e18b86d 100644 (file)
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for virtual/jdk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.38 2011/10/30 14:08:48 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.39 2011/11/04 15:07:54 caster Exp $
+
+  04 Nov 2011; Vlastimil Babka <caster@gentoo.org> jdk-1.7.0.ebuild:
+  Add icedtea-7 alternative.
 
   30 Oct 2011; Vlastimil Babka <caster@gentoo.org> jdk-1.6.0.ebuild:
   Package move icedtea6-bin to icedtea-bin.

diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 3e9b256ae83f253eeb387a1c7774c614f7782b29..f4c2b1c0ca60dd4231a9ccbeadb8fd58636b21f3 100644 (file)
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,5 +1,5 @@
 EBUILD jdk-1.5.0.ebuild 1301 RMD160 16ce027f4cbe4f156a822cf1e4b928a90802aaea SHA1 5e90e0da64b90f9b6c2d3dfd2c954a29978d33d1 SHA256 f53d12e5f31d67fe450206aa077580719789e431a2d8266b919904d43a9ffe79
 EBUILD jdk-1.6.0.ebuild 1898 RMD160 8de640546fbbb4b6deb03552dbab43bd4409c7bf SHA1 8c603a5543e620cb2cdb499dc6c1176cc5b0e5c7 SHA256 dbb10f958c22f9b32bd16a7a308fdb380b8ee2675c6cbddc031fda016de6367d
-EBUILD jdk-1.7.0.ebuild 424 RMD160 cf70eeb0187107fb98743c7ae15d233d3afbdc53 SHA1 573616748da1c4b1af268e68386ccbf4aa27a116 SHA256 1a07838a115a24a6494e96070186ad64e879947a2579212476f7309081d769bc
-MISC ChangeLog 5264 RMD160 d89aa046d5bd9124fc38820d98f2668f3a495ee6 SHA1 904057becdcc851f109783f8a68ba9fbefa651ed SHA256 1ca2c35324e61875f8457d2cbe24d3828be2dd907945275886e23ec031ef3217
+EBUILD jdk-1.7.0.ebuild 447 RMD160 064b7d1db22a8a84e06490bf6e3e04798fafdd1c SHA1 c85a2c414f685c220275772bbcccbb2d6d29ca10 SHA256 d94c96efefe42294559d471573e0fdcf2927c007cc00e5692700985dfde25956
+MISC ChangeLog 5363 RMD160 a25d88f22d8c86eb714eb5c26d67ed1848742edf SHA1 ef39e618215eba89751187d0d7097d611f8f0d96 SHA256 59650391d5610aae1a7c7ae120c48cfcac6e3c55416506e2afd4880dce3fd05c
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb

diff --git a/virtual/jdk/jdk-1.7.0.ebuild b/virtual/jdk/jdk-1.7.0.ebuild
index fe886ef2ffc22bd31af947494b7c3f30d8c6f3ab..15a7d4f3a4a54b6dce9d6ddfde1f6d41d8f48b41 100644 (file)
--- a/virtual/jdk/jdk-1.7.0.ebuild
+++ b/virtual/jdk/jdk-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.1 2011/09/08 07:33:39 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.2 2011/11/04 15:07:54 caster Exp $
 
 DESCRIPTION="Virtual for JDK"
 HOMEPAGE=""
@@ -13,6 +13,7 @@ IUSE=""
 
 # Keeps this and java-virtuals/jaf in sync
 RDEPEND="|| (
+               =dev-java/icedtea-7*
                =dev-java/oracle-jdk-bin-1.7.0*
        )"
 DEPEND=""