summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2015-04-14 21:40:53 +0000
committerJames Le Cuirot <chewi@gentoo.org>2015-04-14 21:40:53 +0000
commit888059062ba0d58eb23ce09376eee76425bb440b (patch)
treea2187dfc2266e2306246f0aeda74fb11f59c26e8 /java-virtuals
parentdiablo-jre-bin is about to be last-rited. (diff)
downloadgentoo-2-888059062ba0d58eb23ce09376eee76425bb440b.tar.gz
gentoo-2-888059062ba0d58eb23ce09376eee76425bb440b.tar.bz2
gentoo-2-888059062ba0d58eb23ce09376eee76425bb440b.zip
diablo-jdk is about to be last-rited. Also remove ye olde
apple-jdk-bin versions. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 9C6D7DE4)
Diffstat (limited to 'java-virtuals')
-rw-r--r--java-virtuals/jdk-with-com-sun/ChangeLog9
-rw-r--r--java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild9
2 files changed, 10 insertions, 8 deletions
diff --git a/java-virtuals/jdk-with-com-sun/ChangeLog b/java-virtuals/jdk-with-com-sun/ChangeLog
index 1b64958ba455..c0a351070657 100644
--- a/java-virtuals/jdk-with-com-sun/ChangeLog
+++ b/java-virtuals/jdk-with-com-sun/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for java-virtuals/jdk-with-com-sun
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/ChangeLog,v 1.22 2014/08/02 18:49:02 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/ChangeLog,v 1.23 2015/04/14 21:40:53 chewi Exp $
+
+ 14 Apr 2015; James Le Cuirot <chewi@gentoo.org>
+ jdk-with-com-sun-20111111-r2.ebuild:
+ diablo-jdk is about to be last-rited. Also remove ye olde apple-jdk-bin
+ versions.
02 Aug 2014; Ralph Sennhauser <sera@gentoo.org>
-jdk-with-com-sun-20111111-r1.ebuild:
diff --git a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild
index 2284ff5fe99d..7ff9844bd889 100644
--- a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild
+++ b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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-20111111-r2.ebuild,v 1.1 2014/05/03 18:53:36 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild,v 1.2 2015/04/14 21:40:53 chewi Exp $
EAPI="5"
@@ -23,10 +23,7 @@ RDEPEND="|| (
dev-java/icedtea:7
dev-java/oracle-jdk-bin:1.7
dev-java/oracle-jdk-bin:1.8
- dev-java/diablo-jdk:1.6
dev-java/apple-jdk-bin:1.6
- dev-java/apple-jdk-bin:1.5
- dev-java/apple-jdk-bin:1.4
)"
-JAVA_VIRTUAL_VM="icedtea-bin-6 icedtea6-bin icedtea-6 icedtea6 icedtea-bin-6 icedtea-bin-7 icedtea-7 oracle-jdk-bin-1.7 oracle-jdk-bin-1.8 diablo-jdk-1.6 apple-jdk-bin-1.6 apple-jdk-bin-1.5 apple-jdk-bin-1.4"
+JAVA_VIRTUAL_VM="icedtea-bin-6 icedtea6-bin icedtea-6 icedtea6 icedtea-bin-6 icedtea-bin-7 icedtea-7 oracle-jdk-bin-1.7 oracle-jdk-bin-1.8 apple-jdk-bin-1.6"