EAPI bump for Prefix support by Christoph Junghans <ottxor@gentoo.org>. #435470

Also fix HOMEPAGE and SRC_URI.
Dont leak jre into DEPEND as it may confuse vm switching code.
Register run dep on junit. #298720
Make better use of eclasses, drop hacks.
Use java-pkg_doexamples to install examples.

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

3 files changed, 93 insertions, 2 deletions

diff --git a/dev-java/javacc/ChangeLog b/dev-java/javacc/ChangeLog
index 0237686e9325..45118dddf388 100644
--- a/dev-java/javacc/ChangeLog
+++ b/dev-java/javacc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-java/javacc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.37 2012/05/12 03:17:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.38 2012/09/28 10:18:50 sera Exp $
+
+*javacc-5.0-r1 (28 Sep 2012)
+
+  28 Sep 2012; Ralph Sennhauser <sera@gentoo.org> +javacc-5.0-r1.ebuild:
+  EAPI bump for Prefix support by Christoph Junghans <ottxor@gentoo.org>.
+  #435470
+  Also fix HOMEPAGE and SRC_URI.
+  Dont leak jre into DEPEND as it may confuse vm switching code.
+  Register run dep on junit. #298720
+  Make better use of eclasses, drop hacks.
+  Use java-pkg_doexamples to install examples.
 
   12 May 2012; Alexis Ballier <aballier@gentoo.org> javacc-4.2.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 4720925d9c8e..761ea6b4ba67 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,9 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX javacc-4.0-javadoc.patch 420 SHA256 4bef6b418576e68921583a28e9ec7789ddea35c8b8b7b2a9a7e8803c2c67774d SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438 WHIRLPOOL 56bdd4a910ef840b2899990302a018087f20b1deffa305df8b2b588bec4baf4f3e60054434edc8306aedd09c4bde01a072fd90dd9b26a165d06cd47f41fdb3db
 DIST javacc-4.0src.tar.gz 765150 SHA256 062a35b89cf1bb4260627c32f480d26e17bf4595024e4b4e472a46fe1b24655f SHA512 1c4363ed318d1c29d44243847b54af97e477095c9070ea434349c79ed0e20c1ff90bd5e8bdc07e6d95237412d0c6fcaa8674ee1309f0926a4e165d4c52370ac0 WHIRLPOOL 1bd3e2c6b3d5e7467d9f2288d9a45436bf848c0e5cbce426ec96ceadf70680f20a6b2e44fa2eabbbe0362cd58d5ef52e025c2ffbcaa88002c2c3a5f3208f1512
 DIST javacc-4.2src.tar.gz 843455 SHA256 504d452ea1904e5b3a2728cbcacf0b9916630bd2ba746112104f741cec230139 SHA512 5dae37425b3aaf64390261ef4c452ef9a0a9b9cdc386c6d818cbea577b1c7b539b2012ef3a4044723ddf07cabb602cd46c26bfcb731610d6876750ffe85472b1 WHIRLPOOL 6a33d6a93c10c208b45887728fb834e6e5180bd045b9cb15aebc8c4042ea8c7d44e78b1bf5586ab3b7db06e08502411f0c30e777e49a395c4e19c1cd3794a484
 DIST javacc-5.0src.tar.gz 810123 SHA256 766cae9d3710054f452a7f0779db885eacfdae363152cb2e7fe025aa7ea17370 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6 WHIRLPOOL 11b299f2e2c0f0d699b0eb5f150e2200b60c0b385a0f3c8e4ca2be38971b71b52c7d351c7219af636d4fbab451fe9e471b9f2f676bc79cc2e76740e702159825
 EBUILD javacc-4.0-r4.ebuild 1602 SHA256 a8e18da98e449151f558e7c8f97a9fd152c87107e319906d57e6ad10491683e6 SHA512 f488eb3a5df2bce6ed3631c179d040cb9e67dcde7763909998f6185934de1e95925d900381585d69460febdba21978152eecf2104252dd2abda884659ad1620b WHIRLPOOL c3bd76671a31c76461612793b3c0ff49be0ff6b2065cb6eab5b6c0799fff58c81ad0d3183e11bf7718b8115ddfae063d39c7bb731ce78c008d013ccaf5caef05
 EBUILD javacc-4.2.ebuild 1907 SHA256 0b5f79755b3ac5225d1348c6b47fda16fb88f0ac93599f5db36a6f335a126915 SHA512 e8f8601de2f39ad96525d1a8bcab316116c9ace1149650d6aea42e3f3f6238c106ad458d492e50b44e2649cd26ac58cc2f66270fb7ed211215141be161d8e017 WHIRLPOOL 2769a89568ce8a3c8cd9abba9eb720e2f5bf090e6ab3bdc9f273a07a605809759db5df7322b47207c10548c11307226d20c15200166b6da922ca5261f7b21415
+EBUILD javacc-5.0-r1.ebuild 1508 SHA256 82b61d661735716e0143f10d7398f65d3f28148bfe12e62130d144507d588942 SHA512 2ef11f7c2af83b39463bf571311eaa75069f07efef1ddf93c48f67231fd41256a200448539768a562f2ed1326717e3d9a03e526369b207fb59839b7ef72f2271 WHIRLPOOL de61e99f9754b02f08a2a242cbbeee8af0f07bdf5ad00bf29192396ad7bbcec4b754717428ffffd92a6bd696ed5287e90ab8cd702e27e2d8f14ab79666d417d3
 EBUILD javacc-5.0.ebuild 1718 SHA256 d305280c208c984571290cb03b583b96c9c3b24424ff21fc99217998ac7ce7d8 SHA512 f7220391c3dec1591882c25fc97b8182acdfcf3e5c2e55f796f4a1a2670e709ead0606468257ccab8138efb631cb05acfee8cf8aa7820a0ced8dd4d2e0a64b08 WHIRLPOOL f3f0a650ede120c41faaf24777c5061ceefcb48eb226c6d377ca8abd5c24f5c8c5c2242f76b5eb3eb7611e3ff122bd0899d37cd19358148327b5e31a00e11f39
-MISC ChangeLog 5740 SHA256 8c7cc0128108e85f7363c1ded05ef2ee780fe1e03cc3920aa73207d072975330 SHA512 297fc7e5cbe79543deed936f384a2000fbed37820b2f37fd03c6198c3650a7435b023ae9d947193727936f5fc06a6449cd3ab7563fdcabda898a558ee9516b99 WHIRLPOOL 986200631c7bcb6149a4919786ef833c7e4583d413dc8084ffa49b59b5eca4c3c3cecfa5c3dbb0bfbf2a518fbfb0a145681313607147b81a4db21c19400bdd60
+MISC ChangeLog 6149 SHA256 c42c81eb584566786c7224310ed97a9641ee217686b6fd1e34111456bde110d5 SHA512 fda20c4728f518fddadbae664b6dacbbb9267f30703553b7882d71d001a54ab632a9744d27b3d07e8ed6ed42358a18be82984c9a7d6101c8aff60dcd4c8209ba WHIRLPOOL 163456044171cfc39b0d4df745b94424b5f23c6e62aa7a7a42ef5577d77e4007c6788137ed5f1854736c0e36d5f6ffb1ba7d584c39c608fb84c371ea32a601e4
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQZXmaAAoJEIUJ+svaV1632lMIALlkkqQrOTTOtFqioVCYC4Qc
+oVLSQVRVBRJC5uUh4Qfam3Fhl7pT4TShrnfkOxydK/li2lqwfe3rVZcyxAeIkQ61
+NmhHanFlbzaWqWduoyJNnmdkTBiwUkrbnpATdn8Pi7ls0Bep8aRJ9CbdVNiN2QvF
+XQGFK7PJtPiAKuYwdwZkfZazdz42YgMo7HsY1i8tb/EyS0DGR/J41E1KF9KG2+Tr
+ttQwanxv2cIJ9q/C5Wv3i6f6ue07c1bdHH8zDG0Ui0OPhXNNJXuCIaEoW2jH9Ec5
+H5WOCaSfYEFYEwwMc/6fS3bV+25Kah3C6sdMRFr5m9EoOiCYQBmx+oD681KRrGg=
+=Sb+X
+-----END PGP SIGNATURE-----
diff --git a/dev-java/javacc/javacc-5.0-r1.ebuild b/dev-java/javacc/javacc-5.0-r1.ebuild
new file mode 100644
index 000000000000..d5fb8f206c32
--- /dev/null
+++ b/dev-java/javacc/javacc-5.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-5.0-r1.ebuild,v 1.1 2012/09/28 10:18:50 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.java.net/"
+SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+COMMON_DEP="
+	dev-java/junit:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (	dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.0-javadoc.patch
+	rm -v lib/junit*/*.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="junit"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar bin/lib/${PN}.jar
+
+	dodoc README
+
+	if use doc; then
+		java-pkg_dohtml -r www/*
+		java-pkg_dojavadoc doc/api
+	fi
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/*
+
+	echo "JAVACC_HOME=${EPREFIX}/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
+}