Require >=jdk-1.5 for javacc-5.0. #315557

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

3 files changed, 67 insertions, 3 deletions

diff --git a/dev-java/xjavadoc/ChangeLog b/dev-java/xjavadoc/ChangeLog
index c48735551b50..648fc08048b2 100644
--- a/dev-java/xjavadoc/ChangeLog
+++ b/dev-java/xjavadoc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xjavadoc
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/ChangeLog,v 1.12 2007/08/03 15:46:13 betelgeuse Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/ChangeLog,v 1.13 2012/09/27 19:16:46 sera Exp $
+
+*xjavadoc-1.1-r2 (27 Sep 2012)
+
+  27 Sep 2012; Ralph Sennhauser <sera@gentoo.org> +xjavadoc-1.1-r2.ebuild:
+  Require >=jdk-1.5 for javacc-5.0. #315557
 
   03 Aug 2007; Petteri Räty <betelgeuse@gentoo.org> xjavadoc-1.1-r1.ebuild:
   Remove monolithic ant support as split ant is stable now.
diff --git a/dev-java/xjavadoc/Manifest b/dev-java/xjavadoc/Manifest
index 1aebe5cc87d0..2d4aee9643fd 100644
--- a/dev-java/xjavadoc/Manifest
+++ b/dev-java/xjavadoc/Manifest
@@ -1,7 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX xjavadoc-1.1-buildfile.patch 1094 SHA256 9e47de14cea9105743d4f1e11206778419a90dd5cdc64b33c204185feca86c57 SHA512 7b65568af2392da62d5bb4f6ea7622047c553c40b55b19e8f8bf525714fdf7ec99096f4665bb296af6819b9063904db2aca5b2bc34bf54bf0ac679ad063f2a28 WHIRLPOOL 94c69fa9eeec8f53a7653ed2acfc1fa88828bfac302ab184352e4ee46271e011ac9082fd39386468736ec9b6b41f294861162532c828712cdf1bbf405d7e1bb9
 AUX xjavadoc-1.1-nojunit.patch 1073 SHA256 4dff308db89d52e830dd5224b72e4c3f886885a54fd8aedd5bf14550586479f1 SHA512 a023962f642defa2523a56b709efe9c7c026117c14274fa29962a9dc676c28f82e8dac68822eb2a631d3a763a60c532a916bdadf0b9717f3547765b5ffdc10a4 WHIRLPOOL 8245644d2a3c65b01518ca0f4ec14ed9276c3e88d93e1b6d918d972c36e34d4d9f6eae888e226d7e40bf329d5819c5b07ca4a34237a85d38bd747011928b2165
 DIST xjavadoc-1.1-src.tar.gz 58804 SHA256 dca21a4568f0ce349e797c4c942c788735f8e637d2a3305a781378b8b26a3c67 SHA512 e186d2b790def023bde797ca1693b06bcd00e564cf99400b0bd4c95b46a43ee65ee6b37528878afd8c415820972b43c35ba660f4321b15ca8be4d27342b64a92 WHIRLPOOL eea59a799cd5e14dae11771ae01560400c4f4f4f673b8dc56f723057e0cb9377ee9801dd08c67d34730c605e4c7303680e004f8ee4e272c983e5c517f7cb7946
 DIST xjavadoc-1.1-supplement.tar.bz2 458861 SHA256 e9f704c01f0891d386792821a7cf0cad0bcefb3af5b7f0c105a7db634526d16b SHA512 64d9c43ea75ebb9c1faf22b69e6f818e2deadfb4064cfc5d0fdda7e18bcd4fb8c806bb0d12b42080f10488c8ae466764de26a7f070085a1db108b0b9e801cc2b WHIRLPOOL 25ccf314eaa80972849d569aec434a7486fc04670bb7320e33d98e5c5da35c190a0ecff24827feb857201e9aad034d2e279978cef1b45ecd0a4e83b7c14dc549
 EBUILD xjavadoc-1.1-r1.ebuild 1134 SHA256 f2952cf76c191b3c62973318e5171035c4931b04c4db599dc377ee54167f4032 SHA512 4615efa49f18cdc888fee7eb2f4940b4f7344454e94390b00db68f6bab3d13450e71a19ff6718a6d74d85bc2e607a37f932a384f5f6e5847c7e3cea3d903e739 WHIRLPOOL a1398c45f550038042116ea96a8ee39e22b430ae433e7f71e85272f923d26eb2b38f5148ee6748d46dac84e3755a3b510bd5aa8e985e1948bc78e6fa0b4da898
-MISC ChangeLog 1724 SHA256 012204ee3977a3e98c9ee57ec7bcef163b54b7862c3165ccf49cb5dd965dba0d SHA512 a6fcd03d6ed42baf804f4a47f69233d6a6ac1d7caab6ae2ddc61dd53d438a01ce50d3f67867fd5cae78a0c2db64dc8d28a59ab90f02b398ee31c2c4a02bebb8b WHIRLPOOL dea9a96d69f62053b30fb6eaa975367ff4f5874da774aedf0b3c74caf4690c13414ef8a45481b07d032cc923d5fdb06af9c8110e8ad6c975ab8f0f8e601bb204
+EBUILD xjavadoc-1.1-r2.ebuild 1128 SHA256 b131f09d864e6f136734136167fa5a857f1c60b7d389d3109b7806a6a8238c98 SHA512 80d7caa4753eaa22f1c46fc3c2f13d8769c111cec39ae2ca080677e35a402cc1c03955deaaf08c5baa58faec1b2c30c7c894e34a698020ebdbf8048624db6a4b WHIRLPOOL 927847e5586ca7a2523ae36270f6ed4653b138bbe6980168b4f7ffa2e467a0e180fca7a41e43eb08de32cd01207f72807b999717effbc30353ab918e597757bc
+MISC ChangeLog 1870 SHA256 f480352a5e06a32dfa72fe91ed41fd64ec860c5e41a3f646eb7be86d848b458d SHA512 548b78269d7800dc0c494dfb1e024243db9da710a2af1ec2a97d89f34f1f55b0b2f2a6ff20e3eee8890fa70981ccedfdd051f85f8e83d3c98a49fa9b842ed9f9 WHIRLPOOL a4693eb8ca993bd69d533ed432fb534ea8c1d838a286a3270b5c78f3d5c2c7c12044bdc410fc92b0f6b79e9d9b6e53c4f8d0e506e4801ac42a379da98991cdfd
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQZKYtAAoJEIUJ+svaV163ILcH/0zRxDDEqo1YgBJ0+5RdjRnt
+csONyMnRpK1wxrhagxyqSYCc2DRloe/zW4tBeR+0wKtEa6VmhA9/fFAy2nCIdJ8t
+gUw9ccEADfNZQnDsscETWPElaWdBLzXXCx6+2bzft7B0/Dy002a1GdphRLOHzUmo
+N4RXXJB3Lv+MOSRPd6Zfiz+VPkaSQOM1yUkOHlDtU21iAEkDocT0idYbXPjTAtAH
+GAWO+bmpHYbbMyFMW7TMxxgO4kjONtcgCwxjGx0Q+Gzu9yTe4HTKgbsiAsyN4fJX
+Q9UppKe+sjiQlayN6fedWze9pWEGUvJcuE/lxXvkOv2vJJz62NfxSA+pK9A0toY=
+=naCb
+-----END PGP SIGNATURE-----
diff --git a/dev-java/xjavadoc/xjavadoc-1.1-r2.ebuild b/dev-java/xjavadoc/xjavadoc-1.1-r2.ebuild
new file mode 100644
index 000000000000..73d841710e7e
--- /dev/null
+++ b/dev-java/xjavadoc/xjavadoc-1.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/xjavadoc-1.1-r2.ebuild,v 1.1 2012/09/27 19:16:46 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A standalone implementation of JavaDoc engine suited for XDoclet"
+HOMEPAGE="http://xdoclet.sourceforge.net/xjavadoc/"
+SRC_URI="mirror://sourceforge/xdoclet/${P}-src.tar.gz
+	mirror://gentoo/${P}-supplement.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-java/commons-collections:0
+	dev-java/junit:0"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	dev-java/javacc
+	${COMMON_DEPEND}"
+
+java_prepare() {
+	# remove the junit tests, would need xdoclet, causing circular dep
+	epatch "${FILESDIR}"/${P}-nojunit.patch
+
+	cd "${S}"/lib || die
+	rm -v *.jar || die
+	java-pkg_jar-from commons-collections,junit
+	java-pkg_jar-from --build-only javacc
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use source && java-pkg_dosrc src/*
+}