commit: d51ef07080d7d18282827a6978995862f5931c45
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Mon Aug 3 00:17:59 2015 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Mon Aug 3 00:17:59 2015 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=d51ef070
Make default source/target 1.6 for CACAO JDK as it's reporting as a 1.6 JDK.
Package-Manager: portage-2.2.20
dev-java/cacao/ChangeLog | 6 ++++++
dev-java/cacao/{cacao-1.6.0-r2.ebuild => cacao-1.6.0-r3.ebuild} | 0
dev-java/cacao/files/javac.in | 4 ++--
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog
index 44d56b7..ff20540 100644
--- a/dev-java/cacao/ChangeLog
+++ b/dev-java/cacao/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.22 2012/06/14
21:25:44 radhermit Exp $
+*cacao-1.6.0-r3 (03 Aug 2015)
+
+ 03 Aug 2015; Andrew John Hughes <[email protected]>
+ +cacao-1.6.0-r3.ebuild, -cacao-1.6.0-r2.ebuild, files/javac.in:
+ Make default source/target 1.6 for CACAO JDK as it's reporting as a 1.6 JDK.
+
08 Jul 2015; Andrew John Hughes <[email protected]>
cacao-1.6.0-r2.ebuild:
Add use of EPREFIX and get_libdir to CACAO ebuild.
diff --git a/dev-java/cacao/cacao-1.6.0-r2.ebuild
b/dev-java/cacao/cacao-1.6.0-r3.ebuild
similarity index 100%
rename from dev-java/cacao/cacao-1.6.0-r2.ebuild
rename to dev-java/cacao/cacao-1.6.0-r3.ebuild
diff --git a/dev-java/cacao/files/javac.in b/dev-java/cacao/files/javac.in
index 8eeda68..70803c8 100644
--- a/dev-java/cacao/files/javac.in
+++ b/dev-java/cacao/files/javac.in
@@ -8,9 +8,9 @@ my $ECJ_WARNINGS="-nowarn";
my ( @bcoption, @source15, @target15, @cp );
push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@'
unless grep {$_ eq '-bootclasspath'} @ARGV;
-push @source15, '-source', '1.5'
+push @source15, '-source', '1.6'
unless grep {$_ eq '-source'} @ARGV;
-push @target15, '-target', '1.5'
+push @target15, '-target', '1.6'
unless grep {$_ eq '-target'} @ARGV;
push @cp, '-cp', '.'
unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH};
