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

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r8 x86_64

4 files changed, 97 insertions, 2 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/Manifest b/dev-java/japitools/Manifest
index ff94b2d52552..136e3b756223 100644
--- a/dev-java/japitools/Manifest
+++ b/dev-java/japitools/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX japitools-0.9.7-classpath.patch 1294 RMD160 785bddce27790cc5b3a2509d8a47557cb3a9638e SHA1 c2d10590517b9e32e071f62960026e0cf9da718a SHA256 ac117d4365108c45e82a1722c254cf2ca1d67b8df7b3f53b5cc46b6f003b7d48
 DIST japitools-0.9.7.tar.gz 92537 RMD160 e9bc64400edd44badca2cce5944800ef23b1adc8 SHA1 3f6fc674f27f679180ea19c6732fefb42ad4afaf SHA256 2201fe0252713938e70bdf0fc118c640477d8b9fc0ad2967734f4b8ee1630b80
+EBUILD japitools-0.9.7-r1.ebuild 1202 RMD160 47f6f79bc30505d9b019307f0852c0d268cd99eb SHA1 5204d9a29481fdf49c3f8163f5ddec3e18db73e4 SHA256 17fc3dfef938b5c4e27086f72ce028741ea5bcb6cac36d49cbf39b156ecf1461
 EBUILD japitools-0.9.7.ebuild 1149 RMD160 a3a29aacb194eab1c080ad185a2db8c591ce1dcd SHA1 2868d70fffda1f4ccc5cc008ef7da3af0b148491 SHA256 4c367dff19b5e6eefc1f4083adc722e4502101bf9a84e7d003075c0b5666720b
-MISC ChangeLog 1457 RMD160 02dd74807f9df0974c587ce8394fffabbbdd9a1f SHA1 cb8d69814a9fe2a2b4eaacfdef6c513663c7c3a7 SHA256 4a5125da575da42554facbcf2046a581b72d056a89ef5d51e6fdcd18d355fd62
+MISC ChangeLog 1717 RMD160 05a060d2ad164cf938a47b8816408c041eeb6778 SHA1 5f869503d31077ce599734d83d513e850900e3c4 SHA256 e7c9d43bd98ac2c0b320b18793c57d8c26ea9e51db9ad7089801e0f964b775a0
 MISC metadata.xml 583 RMD160 861fc7d3c0cc809a40c6da8b905e439a218021c5 SHA1 baed8216e8df545861bc240e3846b2b27af31349 SHA256 69accbee1670a3d6e902422dbf7634af82c55c6b1ea43a53ee74871ef0f22807
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhtG0oACgkQRh6X64ivZaKsdQCfR037CB7TlPbCrIvCZRo9jgW8
+Hy8AnRyrlLq7Pdpui7y48xML3d5qSewe
+=qEjO
+-----END PGP SIGNATURE-----
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/*
+}