summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-04-23 12:13:36 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-04-23 12:13:36 +0000
commit81dfebee028c2e87796ee8707566d117f1af6641 (patch)
tree702d1f7325984065299074848187fdae6524ee9f
parentMaintenance. EAPI=3. LICENSE fix. (diff)
downloadgentoo-2-81dfebee028c2e87796ee8707566d117f1af6641.tar.gz
gentoo-2-81dfebee028c2e87796ee8707566d117f1af6641.tar.bz2
gentoo-2-81dfebee028c2e87796ee8707566d117f1af6641.zip
change diablo-jdk:1.5 to 1.6, 1.5 is gone
(Portage version: 2.2_rc67/cvs/Linux x86_64)
-rw-r--r--java-virtuals/jdk-with-com-sun/ChangeLog6
-rw-r--r--java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20080505-r1.ebuild8
-rw-r--r--java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.ebuild6
3 files changed, 12 insertions, 8 deletions
diff --git a/java-virtuals/jdk-with-com-sun/ChangeLog b/java-virtuals/jdk-with-com-sun/ChangeLog
index 7a17332f610e..71b5914ecb0d 100644
--- a/java-virtuals/jdk-with-com-sun/ChangeLog
+++ b/java-virtuals/jdk-with-com-sun/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for java-virtuals/jdk-with-com-sun
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/ChangeLog,v 1.8 2010/04/19 14:38:32 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/ChangeLog,v 1.9 2010/04/23 12:13:36 aballier Exp $
+
+ 23 Apr 2010; Alexis Ballier <aballier@gentoo.org>
+ jdk-with-com-sun-20080505-r1.ebuild, jdk-with-com-sun-20100419.ebuild:
+ change diablo-jdk:1.5 to 1.6, 1.5 is gone
*jdk-with-com-sun-20100419 (19 Apr 2010)
diff --git a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20080505-r1.ebuild b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20080505-r1.ebuild
index 888f4ce67fd5..9892f0cfe3ac 100644
--- a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20080505-r1.ebuild
+++ b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20080505-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20080505-r1.ebuild,v 1.2 2008/09/13 18:31:42 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20080505-r1.ebuild,v 1.3 2010/04/23 12:13:36 aballier Exp $
EAPI=1
@@ -20,10 +20,10 @@ RDEPEND="|| (
dev-java/sun-jdk:1.6
dev-java/sun-jdk:1.5
dev-java/sun-jdk:1.4
- dev-java/diablo-jdk:1.5
+ dev-java/diablo-jdk:1.6
dev-java/blackdown-jdk:1.4.2
)
>=dev-java/java-config-2.1.6
"
-JAVA_VIRTUAL_VM="sun-jdk-1.6 sun-jdk-1.5 sun-jdk-1.4 diable-jdk-1.5 blackdown-jdk-1.4.2"
+JAVA_VIRTUAL_VM="sun-jdk-1.6 sun-jdk-1.5 sun-jdk-1.4 diablo-jdk-1.6 blackdown-jdk-1.4.2"
diff --git a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.ebuild b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.ebuild
index b7bf64d8ba14..cc70611842bb 100644
--- a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.ebuild
+++ b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.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/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.ebuild,v 1.1 2010/04/19 14:38:32 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.ebuild,v 1.2 2010/04/23 12:13:36 aballier Exp $
EAPI=1
@@ -22,10 +22,10 @@ RDEPEND="|| (
dev-java/sun-jdk:1.6
dev-java/sun-jdk:1.5
dev-java/sun-jdk:1.4
- dev-java/diablo-jdk:1.5
+ dev-java/diablo-jdk:1.6
dev-java/blackdown-jdk:1.4.2
)
>=dev-java/java-config-2.1.6
"
-JAVA_VIRTUAL_VM="icedtea6-bin icedtea6 sun-jdk-1.6 sun-jdk-1.5 sun-jdk-1.4 diablo-jdk-1.5 blackdown-jdk-1.4.2"
+JAVA_VIRTUAL_VM="icedtea6-bin icedtea6 sun-jdk-1.6 sun-jdk-1.5 sun-jdk-1.4 diablo-jdk-1.6 blackdown-jdk-1.4.2"