diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-03-04 23:47:11 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-03-04 23:47:11 +0000 |
| commit | 68196520f07ef5483d976bb310a9376cccfc89b7 (patch) | |
| tree | 604764e1410120393e9bdd1c0cdcf2c5d4c2e074 /virtual | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-68196520f07ef5483d976bb310a9376cccfc89b7.tar.gz gentoo-2-68196520f07ef5483d976bb310a9376cccfc89b7.tar.bz2 gentoo-2-68196520f07ef5483d976bb310a9376cccfc89b7.zip | |
Add icedtea-6 in the alternatives.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'virtual')
| -rw-r--r-- | virtual/jdk/ChangeLog | 5 | ||||
| -rw-r--r-- | virtual/jdk/jdk-1.6.0.ebuild | 8 |
2 files changed, 9 insertions, 4 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 <caster@gentoo.org> jdk-1.6.0.ebuild: + Add icedtea-6 in the alternatives. 22 Feb 2010; Vlastimil Babka <caster@gentoo.org> -jdk-1.4.1.ebuild, -jdk-1.4.2.ebuild: 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* ) |