From 8fd555bdde8bf3dfe9ff277b3f1a0a93c093ef3e Mon Sep 17 00:00:00 2001
From: "William L. Thomson Jr" <wlt@o-sinc.com>
Date: Mon, 22 Aug 2016 17:58:30 -0400
Subject: 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>
---
 dev-java/japitools/japitools-0.9.7-r2.ebuild | 41 ----------------------
 dev-java/japitools/japitools-0.9.7-r3.ebuild | 52 ++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 41 deletions(-)
 delete mode 100644 dev-java/japitools/japitools-0.9.7-r2.ebuild
 create mode 100644 dev-java/japitools/japitools-0.9.7-r3.ebuild

(limited to 'dev-java')

diff --git a/dev-java/japitools/japitools-0.9.7-r2.ebuild b/dev-java/japitools/japitools-0.9.7-r2.ebuild
deleted file mode 100644
index bff697fd2d2c..000000000000
--- a/dev-java/japitools/japitools-0.9.7-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java API compatibility testing tools"
-HOMEPAGE="http://sab39.netreach.com/japi/"
-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"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="ant-core"
-
-JAVA_SRC_DIR="src"
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_register-ant-task
-}
diff --git a/dev-java/japitools/japitools-0.9.7-r3.ebuild b/dev-java/japitools/japitools-0.9.7-r3.ebuild
new file mode 100644
index 000000000000..c80e8b9fe045
--- /dev/null
+++ b/dev-java/japitools/japitools-0.9.7-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java API compatibility testing tools"
+HOMEPAGE="http://sab39.netreach.com/japi/"
+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"
+
+RDEPEND="
+	dev-lang/perl
+	${CDEPEND}
+	>=virtual/jre-1.7"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.7"
+
+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 * \
+		|| 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
+}
-- 
cgit v1.2.3-65-gdbad