Version bump. Fixes bug #146952. Keywording tracked in bug #264195. Adding support for runtimes tracked in bug #264196.

Package-Manager: portage-2.2_rc27/cvs/Linux i686

3 files changed, 115 insertions, 2 deletions

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index 585753e1a901..1149c7035a56 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/antlr
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.66 2009/01/03 15:54:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.67 2009/03/29 16:26:25 betelgeuse Exp $
+
+*antlr-3.1.3 (29 Mar 2009)
+
+  29 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> +antlr-3.1.3.ebuild:
+  Version bump. Fixes bug #146952. Keywording tracked in bug #264195. Adding
+  support for runtimes tracked in bug #264196.
 
   03 Jan 2009; Raúl Porcel <armin76@gentoo.org> antlr-2.7.7.ebuild:
   Drop ia64 keyword
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 3c232f7056c9..ddda744291ca 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,6 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.7.7-gcc-4.3.patch 383 RMD160 b07b999bd1fe9ed4e90c2c4240c6b8dcececa460 SHA1 9561c692ccfad5f320739897da0ce985d8c804d7 SHA256 de68d3a12a03d7bcdbd3e1cf5ab7d773123a55b4d9e8bb9f3a873fa2c2be84e2
 AUX antlr.pc.in 155 RMD160 9e65e2d813b035fceba2893da2b14e21b579ff22 SHA1 008e6316a5f75884749bd88925a888fa0f7de78e SHA256 31bf717831c33e3088958712f2c6629427a505ee0a48030e65b4f733e0bf277f
 DIST antlr-2.7.7.tar.gz 1816180 RMD160 0b7951a28b748e912721fe0f6de4095d9f8da57d SHA1 802655c343cc7806aaf1ec2177a0e663ff209de1 SHA256 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9
+DIST antlr-3.1.3-generated.tar.bz2 47167 RMD160 9ea64a67aba65bf27e8abbdfbd1a28a0ea2b7698 SHA1 21addec96267b43742e2b2bbd6c7e245db644c38 SHA256 ed326de0f1f92dd72e8d9644e8eaf59d02b9725b4b5218f5c54e12100f8d05f4
+DIST antlr-3.1.3.tar.gz 10743515 RMD160 e772197a8a89783ec7cb3e0005913e0396a0ca4c SHA1 2558d373c1d94d8fdd9d26a5be390316aa6b5350 SHA256 1fca0fc7304140807e64ec263a58d93ef1b380cfb6407084e6909f8220bc1039
 EBUILD antlr-2.7.7.ebuild 2642 RMD160 2b071317f5297000382dbf4f0537acccf473078f SHA1 1847e87d7775268b973dee7dc64539bf91eb51ca SHA256 9da778888ccae81dd86ae5744a611078ac19ec58ab0bfd1ab97f043a23ef98e8
-MISC ChangeLog 9179 RMD160 f85c18be0766641c7f64fd3ab5b5838eca17c141 SHA1 9ceeaee9e14112536af4b44144635e77de5f18ff SHA256 74cd36371aba85246aa2e3c078ae1fe0b2bd9a4af011b87d8672be5106b791e0
+EBUILD antlr-3.1.3.ebuild 2610 RMD160 d628ace3fd0c44c2518eb3bc896488dae0be34aa SHA1 72da6b66dab2a0cf8221df5b36c9f2c0abe928db SHA256 ac84992acb2e389bf76c20c4961a6b9a9a9ef4e7d4c15532bdbbb6dab758aeb2
+MISC ChangeLog 9409 RMD160 344d41be0816499324292817d92376414d651601 SHA1 aa79fb439cdd0ddb983eae218b4eb9bc80571788 SHA256 69ae5800fcb3cc06b7be17b425da0f8d7d829951199b1cfc3ce2f227f6ffd155
 MISC metadata.xml 237 RMD160 3f4bc2addb977798173b802ed139eddc82935279 SHA1 19099efa23f7059bcd4a2b0c792e67c9dd90413b SHA256 f200b3d23c03ca390b7fa6f7d3ef4d67af8c3ea2584ba063bb47fefa06a0870e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknPoUQACgkQcxLzpIGCsLQgwACePrpP0JSQUSshwJpWGJ36R7dy
+hRAAn0JLAr7pe0Rr6Q5grkZLgaWvfN3x
+=6FNJ
+-----END PGP SIGNATURE-----
diff --git a/dev-java/antlr/antlr-3.1.3.ebuild b/dev-java/antlr/antlr-3.1.3.ebuild
new file mode 100644
index 000000000000..48dc0c5dac88
--- /dev/null
+++ b/dev-java/antlr/antlr-3.1.3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-3.1.3.ebuild,v 1.1 2009/03/29 16:26:25 betelgeuse Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A parser generator for C++, C#, Java, and Python"
+HOMEPAGE="http://www.antlr.org/"
+# You need to generate v3 grammars so that boostrapping works
+SRC_URI="http://www.antlr.org/download/${P}.tar.gz
+	mirror://gentoo/${P}-generated.tar.bz2"
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-java/stringtemplate-3.2
+	 dev-java/antlr:0"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.5"
+
+java_prepare() {
+	rm -v lib/*.jar lib/.*.jar || die
+	rm -v runtime/ActionScript/project/lib/*.jar || die
+	# We must bundle this as we can't depend on ourselves
+	cp -v "${WORKDIR}"/*.java tool/src/main/antlr/org/antlr/grammar/v3 || die
+}
+
+antlr2() {
+	java -cp $(java-pkg_getjars antlr) antlr.Tool "${@}" || die "antlr2 failed"
+}
+
+build_antlr() {
+	cd "${S}"
+	local dest="${1}"
+	# runtime
+	find runtime -name "*.java" > "${T}/sources" || die
+	# tool
+	find tool/src/main -name "*.java" >> "${T}/sources" || die
+	ejavac -d "${dest}" -cp $(java-pkg_getjars antlr,stringtemplate) "@${T}/sources"
+}
+
+# Uses maven so let's just do things manully for now
+# when bumping use jardiff and apicheck to make sure
+# produced jars are good
+src_compile() {
+	einfo "Bootstrapping antlr3 with bundled sources"
+	cd tool/src/main/antlr2/org/antlr/grammar/v2/ || die
+	# the command line only takes one at a time
+	for grammar in *.g; do
+		antlr2 ${grammar} || die
+	done
+
+	cd "${S}" || die
+	mkdir bootstrap || die
+	build_antlr bootstrap
+
+	einfo "Building v3 grammars with boostrapped antlr"
+	cd tool/src/main/antlr/org/antlr/grammar/v3/ || die
+	rm -v *.java || die
+	local cp="${S}/bootstrap:${S}/tool/src/main/resources/"
+	java -cp "${cp}":$(java-pkg_getjars antlr,stringtemplate) \
+		org.antlr.Tool *.g || die "building v3 grammars failed"
+
+	cd "${S}"
+	mkdir build || die
+	cp -r "${S}"/tool/src/main/resources/* build || die
+	build_antlr build
+
+	# jar things up
+	cd build
+	find -type f > "${T}/classes" || die
+	jar cf ${PN}3.jar "@${T}/classes" || die "jar failed"
+}
+
+src_install() {
+	java-pkg_dojar build/antlr3.jar
+	java-pkg_dolauncher antlr3 --main org.antlr.Tool
+
+	use source && java-pkg_dosrc tool/src/main/org \
+		runtime/Java/src/main/java/org/
+}
+
+pkg_postinst() {
+	elog "Currently the ebuild only has support for the Java backend."
+	elog "gunit support is not included yet either."
+}