Fixed build with USE +doc and repoman warnings. Fixes bug #453142 reported by Diego Elio Pettenò (flameeyes).

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 38 insertions, 21 deletions

diff --git a/dev-java/jdynamite/ChangeLog b/dev-java/jdynamite/ChangeLog
index ea87c673615b..3480b58740ea 100644
--- a/dev-java/jdynamite/ChangeLog
+++ b/dev-java/jdynamite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdynamite
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdynamite/ChangeLog,v 1.8 2008/06/19 19:54:04 nelchael Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdynamite/ChangeLog,v 1.9 2013/05/10 09:37:31 tomwij Exp $
+
+  10 May 2013; Tom Wijsman <TomWij@gentoo.org> jdynamite-1.2.ebuild:
+  Fixed build with USE +doc and repoman warnings. Fixes bug #453142 reported by
+  Diego Elio Pettenò (flameeyes).
 
   19 Jun 2008; Krzysiek Pawlik <nelchael@gentoo.org> jdynamite-1.2.ebuild:
   Add ~amd64 keyword.
@@ -29,4 +33,3 @@
   06 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> +files/1.2-build.xml,
   +metadata.xml, +jdynamite-1.2.ebuild:
   Initial version.
-
diff --git a/dev-java/jdynamite/Manifest b/dev-java/jdynamite/Manifest
index e5e7264064ef..fb8473e20e0b 100644
--- a/dev-java/jdynamite/Manifest
+++ b/dev-java/jdynamite/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.2-build.xml 310 SHA256 ef47fdd12fa3daa2caac4bab0c2e9c188b9f462e757b4997a02ea4875cb15c62 SHA512 1459dccb91857b093985d49d14e97a9378265de621e26c152a923d3ee10c5f7d8504584616d5c502ca8a4617bead402e4dc72c021b6e295685aa5665ad12361b WHIRLPOOL 7daddd44a230a73f72ff71017e8367ffc9a6169f200e339c4a8dbc75b85d6cf73666c27f26cdd4ff1dc8558d3dc2507023beb2127a84e6c7f8ae18ee313fd3c9
 DIST jdynamite1_2.tar.gz 216501 SHA256 cc7fade32f35f84bc0cf64a37b205c45f719b7234299f523e9da58546d9e57de SHA512 922dc3755fc673d228edcbb7d20084a7d2123b936b5c38514781bd0c5eeef4a6420a4ca7256fb3ca8796fb057b854c49c6bacd9ca76ac9fdb24b3d3404ea4aea WHIRLPOOL d1a1f1f43aa73dcad9dae1646b9069945cb4ec0f6fc1833dd88e64dbdf7cd9fa526d16d8a7683cac9f56a88d6a4fc4c8737c1c753b3cee2956b58ea74caa09c9
-EBUILD jdynamite-1.2.ebuild 1045 SHA256 dbd8d4e68ffe39d51d2047b45278f395dbd00c02473a0097e5ac8547fb5a34fd SHA512 f5bbcfe6d6635be7d3e35bfa68609bb29c82eb29411512ee71ca9141116a12d6b6ba044b7ecb11556b1dcbb6b89af85bdfbe36b9f3c8012f137baf9a0e0c14fa WHIRLPOOL 56a0349e23670aeb9d980fb6882b8e4afe926552fdd7b88a4f42ac8153ff9a562c3847e91041f893ab9857a776e4d79451ea86472739ae7d9f433b068642c248
-MISC ChangeLog 1090 SHA256 3d5ae6ba6ad4c67fcb0b07430a8d0894c13ffc29f1dc7d083bce7afe09a34129 SHA512 3f77acd62f24ad93d9dadd1385b1d97300beedb6c3cf82051264863e85e192e037267b306e39ce050593eeece73e3d4d307dc20e5c51f031595f2d686954dd39 WHIRLPOOL 3e6e3961e6765c483af6dd703364136883f83d25e9dd522251f183f579076cdebff970c42a9c336daf8f356e4411ec09ce5932be5373de4b01b73cbf058b7d3e
+EBUILD jdynamite-1.2.ebuild 1150 SHA256 6bcb0249c945be81854a891f967d17c0f1024fa7b4c980c0ce98f20f125f224a SHA512 af117c9e82e9f0ba403efd6607059c70f07e3dbabfe0996ca7faff4fc85e49fff1bb2d7921a836d78e537bffea6683c0a26d7665f0dda62544deaa551f69f144 WHIRLPOOL 95090fcbc5ac7669bdae8e860e8afa3c8344b180cf57ecc068b895acf4c89ce3ea20dd34067809dafb7ad62ffb87ccf3b7ce37175c80979d9b35bd620366a981
+MISC ChangeLog 1272 SHA256 d2a362071c8728fea42d85620c41e871f220080efc5c72984edf30ccd0af9a26 SHA512 0f5863dce7f9c5ddf67e46da39142953aa573f8ee3dffe4baf7b42fb0c4192aaa01da71b96a89a1851ce59c1f7970898184d34c072af8e608d81518c6972b8c2 WHIRLPOOL 4dd8d2a80c9b6a748b34b8ba8d7952f9e549d9aa1d9c286d06e968d580f94bf0df56fe57241c2b9a86a1589f8ff7c0952e986135feb7285e9d533923ecedfed3
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRjL+AAAoJEJWyH81tNOV9RrsH/1FYRSrlcyiHFzMlWNc7mhw/
+XPE6Tr4Jrt52m9lTIL5Ko2QaoOcpcwypuYNzs4CRWcQTo8XrHJ6HKn2/h5agIDCW
+21BjyHKrRB4cdODWakbppLc0tqPlq1lJ+mm07FdCqIXYMpbul4Lfg9pc6MH3hAu8
+rCU/BTJlzcWFYHC0FBQAb3tfvdiQNL0zmBl3EXsDKEZs8fWznw7u70fNxjrhafrz
+hcYh7s8YN9Lt4Dx4hbj43WF26UbVLMGST2i9l19P3cw4e87Tk9Bq916pLs/08wLF
+6AMdhzYDJz8oEXDJKXSzbXWCk4Pw2ZSAKy+IQP5tqWP2PxInaT9Iny/XH7yXvTc=
+=2ASQ
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jdynamite/jdynamite-1.2.ebuild b/dev-java/jdynamite/jdynamite-1.2.ebuild
index e8d2a9832e86..8f0ffce4c29a 100644
--- a/dev-java/jdynamite/jdynamite-1.2.ebuild
+++ b/dev-java/jdynamite/jdynamite-1.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdynamite/jdynamite-1.2.ebuild,v 1.7 2008/06/19 19:54:04 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdynamite/jdynamite-1.2.ebuild,v 1.8 2013/05/10 09:37:31 tomwij Exp $
+
+EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
@@ -14,41 +16,39 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}${MY_PV}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 DEPEND=">=virtual/jdk-1.2
-	>=dev-java/gnu-regexp-1.0.8"
+	dev-java/gnu-regexp:1"
+RDEPEND=">=virtual/jre-1.2"
 
 S="${WORKDIR}/${PN}${PV}"
 
-src_unpack() {
-
-	unpack "${A}"
+# Do not generate docs that don't exist, use bundled.
+EANT_DOC_TARGET=""
 
+java_prepare() {
 	# Yuck! Already compiled!
 	cd "${S}"
 	rm -fr lib/*
 	rm -fr cb
 	rm -fr src/gnu
 
-	cp "${FILESDIR}/${PV}-build.xml" "${S}/build.xml"
-
-	mkdir "${S}/build" || die "mkdir failed"
+	cp "${FILESDIR}/${PV}-build.xml" build.xml || die
+	mkdir build || die
 }
 
 src_compile() {
-	EANT_GENTOO_CLASSPATH="gnu-regexp-1" \
-		java-pkg-2_src_compile
+	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only gnu-regexp-1 gnu-regexp.jar)"
+
+	java-pkg-2_src_compile
 }
 
 src_install() {
-
-	java-pkg_dojar "${PN}.jar"
+	java-pkg_dojar ${PN}.jar
 
 	if use doc; then
 		java-pkg_dohtml -r doc/*
 	fi
 
-	use source && java-pkg_dosrc "${S}/src/cb"
-
+	use source && java-pkg_dosrc src/cb
 }