Revbump to fix the tests for IBM JDK's. Reported by Kenneth Prugh <ken69267@gentoo.org> in bug #220479.

(Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo-r8 x86_64)

3 files changed, 84 insertions, 1 deletions

diff --git a/dev-java/japitools/ChangeLog b/dev-java/japitools/ChangeLog
index 516b607d5cce..450a200283fe 100644
--- a/dev-java/japitools/ChangeLog
+++ b/dev-java/japitools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/japitools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/japitools/ChangeLog,v 1.9 2008/03/28 22:42:30 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/japitools/ChangeLog,v 1.10 2008/07/03 18:32:31 serkan Exp $
+
+*japitools-0.9.7-r1 (03 Jul 2008)
+
+  03 Jul 2008; Serkan Kaba <serkan@gentoo.org>
+  +files/japitools-0.9.7-classpath.patch, +japitools-0.9.7-r1.ebuild:
+  Revbump to fix the tests for IBM JDK's. Reported by Kenneth Prugh
+  <ken69267@gentoo.org> in bug #220479.
 
   28 Mar 2008; Kenneth Prugh <ken69267@gentoo.org> japitools-0.9.7.ebuild:
   amd64 stable, bug #214769
diff --git a/dev-java/japitools/files/japitools-0.9.7-classpath.patch b/dev-java/japitools/files/japitools-0.9.7-classpath.patch
new file mode 100644
index 000000000000..caf3f1a7f296
--- /dev/null
+++ b/dev-java/japitools/files/japitools-0.9.7-classpath.patch
@@ -0,0 +1,20 @@
+diff -Nur japitools-0.9.7/src/net/wuffies/japi/JapiantTask.java japitools-0.9.7_patched/src/net/wuffies/japi/JapiantTask.java
+--- japitools-0.9.7/src/net/wuffies/japi/JapiantTask.java	2006-10-23 02:42:44.000000000 +0300
++++ japitools-0.9.7_patched/src/net/wuffies/japi/JapiantTask.java	2008-07-03 20:46:59.000000000 +0300
+@@ -130,7 +130,15 @@
+         }
+ 
+         {
+-            args.add(System.getProperty("java.home") + File.separator + "lib" + File.separator + "rt.jar");
++            File rtJar=new File(System.getProperty("java.home") + File.separator + "lib" + File.separator + "rt.jar");
++            if(rtJar.exists())
++            	args.add(System.getProperty("java.home") + File.separator + "lib" + File.separator + "rt.jar");
++            File vmJar=new File(System.getProperty("java.home") + File.separator + "lib" + File.separator + "vm.jar");
++            if(vmJar.exists())
++            	args.add(System.getProperty("java.home") + File.separator + "lib" + File.separator + "vm.jar");
++            File coreJar=new File(System.getProperty("java.home") + File.separator + "lib" + File.separator + "core.jar");
++            if(coreJar.exists())
++            	args.add(System.getProperty("java.home") + File.separator + "lib" + File.separator + "core.jar");
+         }
+ 
+         {
diff --git a/dev-java/japitools/japitools-0.9.7-r1.ebuild b/dev-java/japitools/japitools-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..462dc6576647
--- /dev/null
+++ b/dev-java/japitools/japitools-0.9.7-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/japitools/japitools-0.9.7-r1.ebuild,v 1.1 2008/07/03 18:32:31 serkan Exp $
+
+JAVA_PKG_IUSE="doc source test"
+inherit eutils java-pkg-2 java-ant-2
+
+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=""
+
+DEPEND="dev-java/ant-core
+	>=virtual/jdk-1.4
+	test? (
+		=dev-java/junit-3*
+		dev-java/ant-junit
+	)"
+
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-classpath.patch
+
+	cd "${S}"/bin || die
+	rm japize.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_compile() {
+	eant jar
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test
+}
+src_install() {
+	java-pkg_dojar share/java/*.jar
+	dobin bin/*
+
+	if use doc; then
+		cp -r design "${T}"
+		dohtml "${T}"/design/{*.css,*.html}
+		rm "${T}"/design/{*.css,*.html}
+		dodoc "${T}"/design/*
+	fi
+
+	use source && java-pkg_dosrc src/*
+}