[gentoo-commits] repo/gentoo:master commit in: dev-java/japitools/

[James Le Cuirot]

commit:     7496c26e03e5823dbbcba332a434e71da07e119b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 13:38:23 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 13:38:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7496c26e

dev-java/japitools: Fix classpath adjustment, broken by eclass change

Straight to stable, the current version is totally broken.

Package-Manager: portage-2.3.2

 ...apitools-0.9.7-r3.ebuild => japitools-0.9.7-r4.ebuild} | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/dev-java/japitools/japitools-0.9.7-r3.ebuild b/dev-java/japitools/japitools-0.9.7-r4.ebuild
similarity index 85%
rename from dev-java/japitools/japitools-0.9.7-r3.ebuild
rename to dev-java/japitools/japitools-0.9.7-r4.ebuild
index c80e8b9..dfcead4 100644
--- a/dev-java/japitools/japitools-0.9.7-r3.ebuild
+++ b/dev-java/japitools/japitools-0.9.7-r4.ebuild
@@ -15,8 +15,6 @@ SRC_URI="http://www.kaffe.org/~stuart/japi/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
 RESTRICT="test"
 
 CDEPEND="dev-java/ant-core:0"
@@ -33,15 +31,16 @@ DEPEND="
 S="${WORKDIR}/${P}"
 
 JAVA_GENTOO_CLASSPATH="ant-core"
-
 JAVA_SRC_DIR="src"
 
-java_prepare() {
-	eapply_user
-	cd "${S}"/bin || die
-	rm *.bat || die
-	sed -e "s:../share/java:../share/${PN}/lib:" -i * \
+src_prepare() {
+	default
+
+	rm bin/*.bat || die
+	sed -e "s:\.\./share/java:../share/${PN}/lib:" -i bin/* \
 		|| die "Failed to correct the location of the jar file in perl scripts."
+
+	java-pkg-2_src_prepare
 }
 
 src_install() {