Version Bump javacc to 5.0.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog
index e0fb2a051add7633188acea6be2f27d19c717ea0..5926d31e6618f5476673706298d7ca33d8d05c73 100644 (file)
--- a/dev-java/javacc/ChangeLog
+++ b/dev-java/javacc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/javacc
-# 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 $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.31 2010/03/16 11:12:41 ali_bush Exp $
+
+*javacc-5.0 (16 Mar 2010)
+
+  16 Mar 2010; Alistair Bush <ali_bush@gentoo.org> +javacc-5.0.ebuild:
+  Version Bump javacc to 5.0
 
   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

diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 75f61516e807a6cc087837502a4b786e9e91bc77..c0a989669c1aa1e8bbd27961e1ee3222d3c772a3 100644 (file)
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,7 +1,9 @@
 AUX javacc-4.0-javadoc.patch 420 RMD160 c6f5a4eae5171a56c2c4e97b2acd1173474c140d SHA1 0850545426fd8f5ee557abe6f7b2399c24f3bf50 SHA256 4bef6b418576e68921583a28e9ec7789ddea35c8b8b7b2a9a7e8803c2c67774d
 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
+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 1887 RMD160 fb81bf960e6b62fb2aa95b80241695eee2c23df3 SHA1 f0e53774bf42726ac27d1535d9439a37074cc031 SHA256 b1bda6566fe3f9322746673dfba3fdb2c04a7bdb176a86ad827ff7717e275158
-MISC ChangeLog 4907 RMD160 57196b7c20fd155f95248a662fba36ebaa355d75 SHA1 314873545a13188d4f7ccf15f1c06d93d034e4ab SHA256 d1e859630114d89df936cc1d8b355415d958f92bec17dc550130a11b2cd31795
+EBUILD javacc-5.0.ebuild 1889 RMD160 faa1c8273655a74e4ac067ce27040e5c65c9d81d SHA1 7b8fad325fe431691daf0300fcb186811295cdc5 SHA256 c1c53c710e3422fc77c3e4841c9ebbfef31faea9010cf2da0a7a9c9ebc9327a9
+MISC ChangeLog 5037 RMD160 5217789510d642bb5d41fd1c6d36c141188ec514 SHA1 e2362da1eab1651f1957683047417dc74da54d21 SHA256 fd99135d29c5a56f7cd3948513ed5321b86cb4f20242ce3857b49b2bb0be2b1d
 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
new file mode 100644 (file)
index 0000000..2f87d94
--- /dev/null
+++ b/dev-java/javacc/javacc-5.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2010 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 $
+
+JAVA_PKG_IUSE="doc examples source test"
+EAPI="2"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.dev.java.net/"
+SRC_URI="https://${PN}.dev.java.net/files/documents/17/142527/${P}src.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+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
+       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() {
+       epatch "${FILESDIR}"/${PN}-4.0-javadoc.patch
+       rm -v lib/junit*/*.jar || die
+}
+
+_eant() {
+       eant -Djunit.jar="$(java-pkg_getjar --build-only junit junit.jar)" "${@}"
+}
+
+src_compile() {
+       _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
+}
+
+src_install() {
+       java-pkg_dojar bin/lib/${PN}.jar
+
+       dodoc README || die
+
+       if use doc; then
+               java-pkg_dohtml -r www/*
+               java-pkg_dojavadoc doc/api
+       fi
+       if use examples; then
+               dodir /usr/share/doc/${PF}/examples
+               cp -R examples/* "${D}"/usr/share/doc/${PF}/examples
+       fi
+       use source && java-pkg_dosrc src/*
+
+       echo "JAVACC_HOME=/usr/share/javacc/" > "${T}"/22javacc
+       doenvd "${T}"/22javacc
+
+       echo "export VERSION=${PV}" > "${T}"/pre
+
+       local launcher
+       for launcher in javacc jjdoc jjtree
+       do
+               java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
+       done
+}