commit: 8fd555bdde8bf3dfe9ff277b3f1a0a93c093ef3e Author: William L. Thomson Jr <wlt <AT> o-sinc <DOT> com> AuthorDate: Mon Aug 22 21:58:30 2016 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Tue Aug 23 21:30:27 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd555bd
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 <AT> gentoo.org> ...itools-0.9.7-r2.ebuild => japitools-0.9.7-r3.ebuild} | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) 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 bff697f..c80e8b9 100644 --- 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 }
