diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2009-06-21 09:21:22 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2009-06-21 09:21:22 +0000 |
| commit | 7abdd484d0f8fada94a5b1bf2fa51550d31247c0 (patch) | |
| tree | 453092bcb29a42ae5166768a5897aa88ea484c75 /dev-java/javacc | |
| parent | Bump to 0.6.2 (diff) | |
| download | historical-7abdd484d0f8fada94a5b1bf2fa51550d31247c0.tar.gz historical-7abdd484d0f8fada94a5b1bf2fa51550d31247c0.tar.bz2 historical-7abdd484d0f8fada94a5b1bf2fa51550d31247c0.zip | |
Fix building with ecj (bug #249288) and depend on 1.5 jdk only when tests enabled.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'dev-java/javacc')
| -rw-r--r-- | dev-java/javacc/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/javacc/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/javacc/javacc-4.2.ebuild | 17 |
3 files changed, 17 insertions, 12 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/Manifest b/dev-java/javacc/Manifest index 6539b5dea693..75f61516e807 100644 --- a/dev-java/javacc/Manifest +++ b/dev-java/javacc/Manifest @@ -2,6 +2,6 @@ AUX javacc-4.0-javadoc.patch 420 RMD160 c6f5a4eae5171a56c2c4e97b2acd1173474c140d DIST javacc-4.0src.tar.gz 765150 RMD160 c33b1b9a518c229a87265bb4b200444a5b921380 SHA1 8aeb145aba941afc01e9c1d2c815161d5eef89f2 SHA256 062a35b89cf1bb4260627c32f480d26e17bf4595024e4b4e472a46fe1b24655f DIST javacc-4.2src.tar.gz 843455 RMD160 4ba13c1bb9ca938967aa528178b5fcb6e59eeb20 SHA1 77c69c13544d78402c0484e78574f7bd3dd10de4 SHA256 504d452ea1904e5b3a2728cbcacf0b9916630bd2ba746112104f741cec230139 EBUILD javacc-4.0-r4.ebuild 1592 RMD160 f592fb279a8885bc2d41b2f0cc566c983f95c0df SHA1 2c12cefde8196904e5daf29d1307cf382a22af1b SHA256 2b4f873839ce8933ccac962855b57e01d07b647bfe2eaa7b072eb182495e4a92 -EBUILD javacc-4.2.ebuild 1794 RMD160 0a114340bb29d9a08d97de8bc493879ec268e1ac SHA1 28e935499761cb31d8fe918508f4b66840eeacff SHA256 d3276cb9fb72e1830ee8b20fb0d7d943be4dedf8f4b1a492c83dade319dbf187 -MISC ChangeLog 4751 RMD160 0830ab7769140f6ece611d1e09cdad62714dbe44 SHA1 8e00686d7471a0f6cc9aac33b6fa82e9f061a006 SHA256 e67078aa8010cf7141278f146c8a6e5f84041f90ad30ea2d26b7a95475ef11a8 +EBUILD javacc-4.2.ebuild 1887 RMD160 fb81bf960e6b62fb2aa95b80241695eee2c23df3 SHA1 f0e53774bf42726ac27d1535d9439a37074cc031 SHA256 b1bda6566fe3f9322746673dfba3fdb2c04a7bdb176a86ad827ff7717e275158 +MISC ChangeLog 4907 RMD160 57196b7c20fd155f95248a662fba36ebaa355d75 SHA1 314873545a13188d4f7ccf15f1c06d93d034e4ab SHA256 d1e859630114d89df936cc1d8b355415d958f92bec17dc550130a11b2cd31795 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 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 } |