diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2011-01-29 11:07:07 +0000 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2011-01-29 11:07:07 +0000 |
| commit | bcc091c83aa8a59172b3277d5197e4af8650cdcc (patch) | |
| tree | cab9e27571909d550b6030f02a2cc66497bbb070 /dev-java | |
| parent | By default, disable building of static libs. Fix automake call in 2.2.3. (diff) | |
| download | historical-bcc091c83aa8a59172b3277d5197e4af8650cdcc.tar.gz historical-bcc091c83aa8a59172b3277d5197e4af8650cdcc.tar.bz2 historical-bcc091c83aa8a59172b3277d5197e4af8650cdcc.zip | |
dev-java/javacc: some fixes
Package-Manager: portage-2.1.9.35/cvs/Linux x86_64
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/javacc/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/javacc/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/javacc/javacc-5.0.ebuild | 20 |
3 files changed, 14 insertions, 18 deletions
diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog index 9d7b9f59a706..92695980e9ea 100644 --- a/dev-java/javacc/ChangeLog +++ b/dev-java/javacc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/javacc -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.32 2010/03/21 15:32:57 phajdan.jr Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.33 2011/01/29 11:07:07 fordfrog Exp $ + + 29 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> javacc-5.0.ebuild: + Did some fixes with regard to jdk version in the ebuild, but it still fails + tests 21 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> javacc-4.2.ebuild: x86 stable wrt bug #309265 diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest index 8962fb84fbc5..80d7ec5b885c 100644 --- a/dev-java/javacc/Manifest +++ b/dev-java/javacc/Manifest @@ -4,6 +4,6 @@ DIST javacc-4.2src.tar.gz 843455 RMD160 4ba13c1bb9ca938967aa528178b5fcb6e59eeb20 DIST javacc-5.0src.tar.gz 810123 RMD160 982c63a8b2e9fbec6a19bd110344c3a9547a7577 SHA1 41159a705cf118f8e8c687a2fe2e923361ab35f7 SHA256 766cae9d3710054f452a7f0779db885eacfdae363152cb2e7fe025aa7ea17370 EBUILD javacc-4.0-r4.ebuild 1592 RMD160 f592fb279a8885bc2d41b2f0cc566c983f95c0df SHA1 2c12cefde8196904e5daf29d1307cf382a22af1b SHA256 2b4f873839ce8933ccac962855b57e01d07b647bfe2eaa7b072eb182495e4a92 EBUILD javacc-4.2.ebuild 1890 RMD160 e6279816458314fb328223a008c936caf5ed11e0 SHA1 75a18a03d20af2b36ec1e607e0c59e3581120fa0 SHA256 3f4e61000e1690d0317c2b2fdeef3b0f0baf5dcbbef17e57a1d497f1d1a3cd07 -EBUILD javacc-5.0.ebuild 1889 RMD160 faa1c8273655a74e4ac067ce27040e5c65c9d81d SHA1 7b8fad325fe431691daf0300fcb186811295cdc5 SHA256 c1c53c710e3422fc77c3e4841c9ebbfef31faea9010cf2da0a7a9c9ebc9327a9 -MISC ChangeLog 5143 RMD160 6b3c9a651a5a6ef7cfa19824a6dab418ece3af19 SHA1 5c67787df4d65a1e90be9ef785069be0f1674c55 SHA256 7d882a94e5aadba5d4b0c93b0ee471c7f3ce5251fca854fbb824f15957eb07e5 +EBUILD javacc-5.0.ebuild 1723 RMD160 2cb0470adaffe479403afbce7af61eee431d44b2 SHA1 13446af695f5e5bb611fdaa310632219849e36d7 SHA256 eb3f537e675a695312e1de7ada50fac794b61beaf376f86fa7b2fb19ad13b593 +MISC ChangeLog 5299 RMD160 2f19fac1e073d0947615471cac762479f1dc1970 SHA1 54c39d0aa095b39b54ec7e59c9199c389be79994 SHA256 7b21afbe381d9f82631d1e3a6dfd883b424310988cc87988ad7693c9b08b9b28 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 diff --git a/dev-java/javacc/javacc-5.0.ebuild b/dev-java/javacc/javacc-5.0.ebuild index 2f87d94a257c..1cc139a75880 100644 --- a/dev-java/javacc/javacc-5.0.ebuild +++ b/dev-java/javacc/javacc-5.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild,v 1.1 2010/03/16 11:12:41 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild,v 1.2 2011/01/29 11:07:07 fordfrog Exp $ JAVA_PKG_IUSE="doc examples source test" EAPI="2" @@ -16,18 +16,10 @@ IUSE="" KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" DEPEND=">=virtual/jdk-1.5 dev-java/junit:0 - test? ( - >=virtual/jdk-1.5 - dev-java/ant-junit - ) - !test? ( >=virtual/jdk-1.4 )" -RDEPEND=">=virtual/jre-1.4 + test? ( dev-java/ant-junit )" +RDEPEND=">=virtual/jre-1.5 dev-java/junit:0" -# We don't want 1.5 bytecode just because of the testcase -JAVA_PKG_WANT_TARGET="1.4" -JAVA_PKG_WANT_SOURCE="1.4" - S="${WORKDIR}/${PN}" java_prepare() { @@ -40,12 +32,12 @@ _eant() { } src_compile() { + # 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 _eant jar $(use_doc) } 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 } |