summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2011-11-07 16:05:27 +0000
committerVlastimil Babka <caster@gentoo.org>2011-11-07 16:05:27 +0000
commit8b746e04e248ebd678043591085ec2125fd7d27f (patch)
tree26dc78b4e915d97ccf673fc849f7dbecfb55bfe7 /virtual/jdk
parentPrepare for icedtea-bin version and VMHANDLE migration. (diff)
downloadgentoo-2-8b746e04e248ebd678043591085ec2125fd7d27f.tar.gz
gentoo-2-8b746e04e248ebd678043591085ec2125fd7d27f.tar.bz2
gentoo-2-8b746e04e248ebd678043591085ec2125fd7d27f.zip
Prepare for icedtea-bin version and VMHANDLE migration.
(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)
Diffstat (limited to 'virtual/jdk')
-rw-r--r--virtual/jdk/ChangeLog5
-rw-r--r--virtual/jdk/jdk-1.6.0.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 751628f65da9..5232594a6e47 100644
--- 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.40 2011/11/04 15:14:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.41 2011/11/07 16:05:27 caster Exp $
+
+ 07 Nov 2011; Vlastimil Babka <caster@gentoo.org> jdk-1.6.0.ebuild:
+ Prepare for icedtea-bin version and VMHANDLE migration.
04 Nov 2011; Vlastimil Babka <caster@gentoo.org> jdk-1.5.0.ebuild,
jdk-1.6.0.ebuild, jdk-1.7.0.ebuild:
diff --git a/virtual/jdk/jdk-1.6.0.ebuild b/virtual/jdk/jdk-1.6.0.ebuild
index fe0d2166363f..db1395329f03 100644
--- a/virtual/jdk/jdk-1.6.0.ebuild
+++ b/virtual/jdk/jdk-1.6.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.6.0.ebuild,v 1.22 2011/11/04 15:14:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.23 2011/11/07 16:05:27 caster Exp $
DESCRIPTION="Virtual for JDK"
HOMEPAGE=""
@@ -27,7 +27,9 @@ COMMON_INC="
=dev-java/winjdk-bin-1.6.0*
"
+# icedtea-bin-1* is old versioning scheme of icedtea-bin-6*
X86_OPTS="|| (
+ =dev-java/icedtea-bin-6*
=dev-java/icedtea-bin-1*
=dev-java/icedtea-6*
=dev-java/sun-jdk-1.6.0*
@@ -35,6 +37,7 @@ X86_OPTS="|| (
)"
X86_PREFIX_OPTS="|| (
+ =dev-java/icedtea-bin-6*
=dev-java/icedtea-bin-1*
=dev-java/sun-jdk-1.6.0*
${COMMON_INC}