dev-java/japitools: Various bug fixes and changes

install bins, correct classpath in bins, add missing runtime dep
dev-lang/perl, switched EAPI to 6, updated java version to 1.7

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2122

Signed-off-by: James Le Cuirot <chewi@gentoo.org>

diff --git a/dev-java/japitools/japitools-0.9.7-r2.ebuild b/dev-java/japitools/japitools-0.9.7-r3.ebuild
similarity index 69%
rename from dev-java/japitools/japitools-0.9.7-r2.ebuild
rename to dev-java/japitools/japitools-0.9.7-r3.ebuild
index bff697fd2d2c48e8b6177faad9db722a69bdff03..c80e8b9fe045bd7bdef3596a2aed7b6effc7c487 100644 (file)
--- a/dev-java/japitools/japitools-0.9.7-r2.ebuild
+++ b/dev-java/japitools/japitools-0.9.7-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
@@ -22,12 +22,13 @@ RESTRICT="test"
 CDEPEND="dev-java/ant-core:0"
 
 RDEPEND="
+       dev-lang/perl
        ${CDEPEND}
-       >=virtual/jre-1.6"
+       >=virtual/jre-1.7"
 
 DEPEND="
        ${CDEPEND}
-       >=virtual/jdk-1.6"
+       >=virtual/jdk-1.7"
 
 S="${WORKDIR}/${P}"
 
@@ -35,7 +36,17 @@ 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 * \
+               || die "Failed to correct the location of the jar file in perl scripts."
+}
+
 src_install() {
+       dobin bin/*
+
        java-pkg-simple_src_install
        java-pkg_register-ant-task
 }