Fix building with ecj (bug #249288) and depend on 1.5 jdk only when tests enabled.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 15 insertions, 10 deletions

diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog
index 20ebcb3ac223..e0fb2a051add 100644
--- a/dev-java/javacc/ChangeLog
+++ b/dev-java/javacc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/javacc
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.29 2009/04/28 11:42:03 ali_bush Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.30 2009/06/21 09:21:22 caster Exp $
+
+  21 Jun 2009; Vlastimil Babka <caster@gentoo.org> javacc-4.2.ebuild:
+  Fix building with ecj (bug #249288) and depend on 1.5 jdk only when tests
+  enabled.
 
 *javacc-4.2 (28 Apr 2009)
 
diff --git a/dev-java/javacc/javacc-4.2.ebuild b/dev-java/javacc/javacc-4.2.ebuild
index d06398a283ba..e0864427d6e9 100644
--- a/dev-java/javacc/javacc-4.2.ebuild
+++ b/dev-java/javacc/javacc-4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-4.2.ebuild,v 1.1 2009/04/28 11:42:03 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-4.2.ebuild,v 1.2 2009/06/21 09:21:22 caster Exp $
 
 JAVA_PKG_IUSE="doc examples source test"
 EAPI="2"
@@ -16,16 +16,15 @@ IUSE=""
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 DEPEND=">=virtual/jdk-1.5
 	dev-java/junit:0
-	test? ( dev-java/ant-junit )"
+	test? (
+		>=virtual/jdk-1.5
+		dev-java/ant-junit
+	)
+	!test? ( >=virtual/jdk-1.4 )"
 RDEPEND=">=virtual/jre-1.4
 	dev-java/junit:0"
 
-#There are test cases that require >=1.5
-#currently the build system handles producing
-#the correct bytecode for the jar we are
-#wanting. So lets just let it do its
-#part.
-JAVA_PKG_BSFIX="off"
+# We don't want 1.5 bytecode just because of the testcase
 JAVA_PKG_WANT_TARGET="1.4"
 JAVA_PKG_WANT_SOURCE="1.4"
 
@@ -45,6 +44,8 @@ src_compile() {
 }
 
 src_test() {
+	# this testcase wants 1.5 and this seems the easiest way to do it
+	JAVA_PKG_WANT_SOURCE="1.5" JAVA_PKG_WANT_TARGET="1.5" java-ant_bsfix_one examples/JavaGrammars/1.5/build.xml
 	ANT_TASKS="ant-junit" _eant test
 }