summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam L. Thomson Jr <wlt@o-sinc.com>2016-08-22 17:58:30 -0400
committerJames Le Cuirot <chewi@gentoo.org>2016-08-23 22:30:27 +0100
commit8fd555bdde8bf3dfe9ff277b3f1a0a93c093ef3e (patch)
treeb0c66fca410c265f68003d01bb49688e4e405060 /dev-java/japitools
parentMask upnp-av USE flag on media-sound/rhythmbox, bug #521972 (diff)
downloadgentoo-8fd555bdde8bf3dfe9ff277b3f1a0a93c093ef3e.tar.gz
gentoo-8fd555bdde8bf3dfe9ff277b3f1a0a93c093ef3e.tar.bz2
gentoo-8fd555bdde8bf3dfe9ff277b3f1a0a93c093ef3e.zip
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>
Diffstat (limited to 'dev-java/japitools')
-rw-r--r--dev-java/japitools/japitools-0.9.7-r3.ebuild (renamed from dev-java/japitools/japitools-0.9.7-r2.ebuild)17
1 files 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
index bff697fd2d2c..c80e8b9fe045 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
}