Version Bump.

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

3 files changed, 87 insertions, 3 deletions

diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog
index 153a4ff933ff..20ebcb3ac223 100644
--- a/dev-java/javacc/ChangeLog
+++ b/dev-java/javacc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/javacc
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.28 2008/01/10 22:32:02 caster Exp $
+# 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 $
+
+*javacc-4.2 (28 Apr 2009)
+
+  28 Apr 2009; Alistair Bush <ali_bush@gentoo.org> +javacc-4.2.ebuild:
+  Version Bump. Thanks to Alex Busenius <the_unknown@gmx.net> for the bug
+  report and initial work.
 
   10 Jan 2008; Vlastimil Babka <caster@gentoo.org> javacc-4.0-r4.ebuild:
   Restrict junit dependency.
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 4ce4f9aec890..6539b5dea693 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD javacc-4.0-r4.ebuild 1592 RMD160 f592fb279a8885bc2d41b2f0cc566c983f95c0df SHA1 2c12cefde8196904e5daf29d1307cf382a22af1b SHA256 2b4f873839ce8933ccac962855b57e01d07b647bfe2eaa7b072eb182495e4a92
-MISC ChangeLog 4549 RMD160 31bbf97bde9602cd95ed354d5dee9a8dc9784dfa SHA1 f876be10ba3b4e6a4d174120d992384489399357 SHA256 367864c124984fbc9362a51d8313f65e802d09b2506ff336a5e46327debe1219
+EBUILD javacc-4.2.ebuild 1794 RMD160 0a114340bb29d9a08d97de8bc493879ec268e1ac SHA1 28e935499761cb31d8fe918508f4b66840eeacff SHA256 d3276cb9fb72e1830ee8b20fb0d7d943be4dedf8f4b1a492c83dade319dbf187
+MISC ChangeLog 4751 RMD160 0830ab7769140f6ece611d1e09cdad62714dbe44 SHA1 8e00686d7471a0f6cc9aac33b6fa82e9f061a006 SHA256 e67078aa8010cf7141278f146c8a6e5f84041f90ad30ea2d26b7a95475ef11a8
 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
new file mode 100644
index 000000000000..d06398a283ba
--- /dev/null
+++ b/dev-java/javacc/javacc-4.2.ebuild
@@ -0,0 +1,76 @@
+# 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 $
+
+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/117795/${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? ( dev-java/ant-junit )"
+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"
+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() {
+	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
+}