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

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

2 files changed, 22 insertions, 19 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/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
 }