From 4d130ecdbee936e0706e6c52ee3d1f8557bb5651 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Thu, 4 Mar 2010 23:47:11 +0000 Subject: [PATCH] Add icedtea-6 in the alternatives. Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- virtual/jdk/ChangeLog | 5 ++++- virtual/jdk/Manifest | 4 ++-- virtual/jdk/jdk-1.6.0.ebuild | 8 +++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog index 5d5a15eadf78..b15cd814ee05 100644 --- a/virtual/jdk/ChangeLog +++ b/virtual/jdk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for virtual/jdk # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.31 2010/02/22 22:29:46 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.32 2010/03/04 23:47:11 caster Exp $ + + 04 Mar 2010; Vlastimil Babka jdk-1.6.0.ebuild: + Add icedtea-6 in the alternatives. 22 Feb 2010; Vlastimil Babka -jdk-1.4.1.ebuild, -jdk-1.4.2.ebuild: diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest index 23cc087c3b90..cef6302f5778 100644 --- a/virtual/jdk/Manifest +++ b/virtual/jdk/Manifest @@ -1,4 +1,4 @@ EBUILD jdk-1.5.0.ebuild 1266 RMD160 fe1be192997dbe3d1b813912f01737c003539a94 SHA1 8d5e3acaac8f56b9ed76c5135cdc20c8a4ed34db SHA256 9579ab6e127d2ef6d8f8a454c78886c28d0376f3c98a9cc8c89a046f6cf99aa5 -EBUILD jdk-1.6.0.ebuild 1529 RMD160 69448f02ea5955c9dea17333bc6b8b33cb26be56 SHA1 ef927cd1f9d2766b67272d2f74d00dbc290cba7f SHA256 cf4b992358162434cc73957851a2aa26529d52b49129e2616e44fc90d875c5c0 -MISC ChangeLog 4435 RMD160 44a5ae72f8cdef6776eaf7b104e12fec1a36f1cf SHA1 861854e2da5cf4086463247c602714a668814985 SHA256 2d9ef0ec64853637f6a9e88f2d7b74e8b82c006088826ca962d9ccc5941aace7 +EBUILD jdk-1.6.0.ebuild 1594 RMD160 7a5797f7a47ac926f98ca5a93f5b412c3349f56d SHA1 6e05b6c6f5dc4178a86365863758952abe74ba4e SHA256 cd6d279b8d017b87b2d850bae2c5fd7f9e997c7be6e8b239a7081e13613f38b7 +MISC ChangeLog 4542 RMD160 e1dccc5456a8f4a9a2db15adf38599b7a7aee03a SHA1 e0d98afcfbf13dfb2906a9dc384d9c52f4b14258 SHA256 0256da818cd04c70322fdda9324cb2f972d2d6a244c4673cb0568cb258f76a95 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb diff --git a/virtual/jdk/jdk-1.6.0.ebuild b/virtual/jdk/jdk-1.6.0.ebuild index 7cf2f4c888fa..1f3705e34a0a 100644 --- a/virtual/jdk/jdk-1.6.0.ebuild +++ b/virtual/jdk/jdk-1.6.0.ebuild @@ -1,6 +1,6 @@ # 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.17 2010/02/09 17:23:19 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.18 2010/03/04 23:47:11 caster Exp $ DESCRIPTION="Virtual for JDK" HOMEPAGE="" @@ -21,10 +21,12 @@ IUSE="" RDEPEND="|| ( amd64? ( dev-java/icedtea6-bin ) x86? ( dev-java/icedtea6-bin ) - amd64? ( =dev-java/sun-jdk-1.6.0* ) - x86? ( =dev-java/sun-jdk-1.6.0* ) amd64-linux? ( dev-java/icedtea6-bin ) x86-linux? ( dev-java/icedtea6-bin ) + amd64? ( =dev-java/icedtea-6* ) + x86? ( =dev-java/icedtea-6* ) + amd64? ( =dev-java/sun-jdk-1.6.0* ) + x86? ( =dev-java/sun-jdk-1.6.0* ) amd64-linux? ( =dev-java/sun-jdk-1.6.0* ) x86-linux? ( =dev-java/sun-jdk-1.6.0* ) x64-solaris? ( =dev-java/sun-jdk-1.6.0* ) -- 2.26.2