From: Petteri Räty <betelgeuse@gentoo.org>
Date: Sat, 28 Apr 2007 22:02:57 +0000 (+0000)
Subject: Fix emerging with JAVA_PKG_STRICT and migrate to splitted ant.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0cb73bd0c7625722bd74b1896f437d4653afe9fe;p=gentoo.git

Fix emerging with JAVA_PKG_STRICT and migrate to splitted ant.
Package-Manager: portage-2.1.2.5
---

diff --git a/app-misc/openjnlp/ChangeLog b/app-misc/openjnlp/ChangeLog
index e4bf9c1f2952..25d43fbafa49 100644
--- a/app-misc/openjnlp/ChangeLog
+++ b/app-misc/openjnlp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/openjnlp
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/openjnlp/ChangeLog,v 1.13 2007/02/21 22:38:27 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/openjnlp/ChangeLog,v 1.14 2007/04/28 22:02:57 betelgeuse Exp $
+
+  28 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  openjnlp-0.7.1-r2.ebuild:
+  Fix emerging with JAVA_PKG_STRICT and migrate to splitted ant.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-misc/openjnlp/Manifest b/app-misc/openjnlp/Manifest
index a85a1be94bc5..cd60271b160e 100644
--- a/app-misc/openjnlp/Manifest
+++ b/app-misc/openjnlp/Manifest
@@ -1,21 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST OpenJNLP-0.7.1.tar.gz 255370 RMD160 c1d169ae0c7c6b53e50fdc42e36036755b0d8966 SHA1 c0147364bda9d6026bf5958d63f5107cafc2b43e SHA256 8951a29298fda72b826d788de5fd8922ba1a94eff100af3c7de99b326d284672
 DIST OpenJNLP-src-rel_ver-0-7-1.zip 369989 RMD160 e902c9be453aaf0dc71bda5827eb7232535facaa SHA1 13c823674eb0d001cb06fadd0aae6766fd377839 SHA256 ad940bc52c2bbc8a2f0f19ec06eb5a2114e5713c62111b3bd2932303a2abb412
 EBUILD openjnlp-0.7.1-r1.ebuild 1259 RMD160 938693e89211e5bf765e687ecb4779db9fae5a06 SHA1 1ab2e47781c327b91e4951847ceb05a564966539 SHA256 d88338b265f838c3a091ee59198833ac470dd96d705ced7b2e2fc82fc331e880
 MD5 186cd2f71c3fa2a44074a2ca7002ad3b openjnlp-0.7.1-r1.ebuild 1259
 RMD160 938693e89211e5bf765e687ecb4779db9fae5a06 openjnlp-0.7.1-r1.ebuild 1259
 SHA256 d88338b265f838c3a091ee59198833ac470dd96d705ced7b2e2fc82fc331e880 openjnlp-0.7.1-r1.ebuild 1259
-EBUILD openjnlp-0.7.1-r2.ebuild 1435 RMD160 d3ed6466d1b871da442e4d27a16773f82b84b388 SHA1 f5f02c5d1184e702fd67cf9e74153425681bd595 SHA256 56d5a2823d09efb21fedac2610b5ad508f67782ea73d0e78df6ab6cfd68b75b0
-MD5 0bedc8321b324c4ba74697af1b3aeb7a openjnlp-0.7.1-r2.ebuild 1435
-RMD160 d3ed6466d1b871da442e4d27a16773f82b84b388 openjnlp-0.7.1-r2.ebuild 1435
-SHA256 56d5a2823d09efb21fedac2610b5ad508f67782ea73d0e78df6ab6cfd68b75b0 openjnlp-0.7.1-r2.ebuild 1435
+EBUILD openjnlp-0.7.1-r2.ebuild 1440 RMD160 7846e2d72af7fe25e71a8fabea2be0328f234880 SHA1 697d107e95b30b506db0b3a9c4ddcf65aa585038 SHA256 a9004ee48a5ba80b81aa15a3f8c908195a83bd64880016ad84ad9b98919657fe
+MD5 21e288af0108c48dad1e757178af9107 openjnlp-0.7.1-r2.ebuild 1440
+RMD160 7846e2d72af7fe25e71a8fabea2be0328f234880 openjnlp-0.7.1-r2.ebuild 1440
+SHA256 a9004ee48a5ba80b81aa15a3f8c908195a83bd64880016ad84ad9b98919657fe openjnlp-0.7.1-r2.ebuild 1440
 EBUILD openjnlp-0.7.1.ebuild 778 RMD160 aeb26b4b27a8f318c2f1c42d01954f8f2764c011 SHA1 f580f3c19f7316986080a9b4653f479ef3a7e5e5 SHA256 de39d20bc9b801ecb36f788c3f6b093a4a140062ea448cb03c626b149630e886
 MD5 7b96ce5e389ab572e9e9d2bf8700e3c3 openjnlp-0.7.1.ebuild 778
 RMD160 aeb26b4b27a8f318c2f1c42d01954f8f2764c011 openjnlp-0.7.1.ebuild 778
 SHA256 de39d20bc9b801ecb36f788c3f6b093a4a140062ea448cb03c626b149630e886 openjnlp-0.7.1.ebuild 778
-MISC ChangeLog 1495 RMD160 4ae01166368dea7a7c892e120116e52eb9ab726c SHA1 88f511b55a97ecd92602edb724800e362632f25d SHA256 60f2002b052d5fb312ac9b66a9fa8d372ab1a6a568fd04119214c7197207dbb4
-MD5 0162fcad25cdc41b097c098b2987184a ChangeLog 1495
-RMD160 4ae01166368dea7a7c892e120116e52eb9ab726c ChangeLog 1495
-SHA256 60f2002b052d5fb312ac9b66a9fa8d372ab1a6a568fd04119214c7197207dbb4 ChangeLog 1495
+MISC ChangeLog 1647 RMD160 d860aea83f7753b3ad971cfb616f8888cbd6772c SHA1 43d27084cc67b418fb410edd65f51db977ee0827 SHA256 e92f3ab68c2be0d9f077358f433fbbebf9dd3ad267fad125fdb9095d426554bf
+MD5 4f55a4f817212124e87f92ff7ff16263 ChangeLog 1647
+RMD160 d860aea83f7753b3ad971cfb616f8888cbd6772c ChangeLog 1647
+SHA256 e92f3ab68c2be0d9f077358f433fbbebf9dd3ad267fad125fdb9095d426554bf ChangeLog 1647
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -29,3 +32,10 @@ SHA256 79bde2e5b3fb037ffaed00e6e57caf952d7f1bbbf41fe31c77bde17420ee00ad files/di
 MD5 1b5159e97438ae8e76081d053c4e3f80 files/digest-openjnlp-0.7.1-r2 271
 RMD160 d3b7524d16b00a163b314dd99ecb0497eec17fe0 files/digest-openjnlp-0.7.1-r2 271
 SHA256 79bde2e5b3fb037ffaed00e6e57caf952d7f1bbbf41fe31c77bde17420ee00ad files/digest-openjnlp-0.7.1-r2 271
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGM8SScxLzpIGCsLQRAnQYAJkBIJg23RG9VzJwzkBjNct/xfvCbQCdFnve
+ZqfUWB9ump6zt+LY8a6LYWI=
+=JpTN
+-----END PGP SIGNATURE-----
diff --git a/app-misc/openjnlp/openjnlp-0.7.1-r2.ebuild b/app-misc/openjnlp/openjnlp-0.7.1-r2.ebuild
index 827fdea80edb..54ef728094d6 100644
--- a/app-misc/openjnlp/openjnlp-0.7.1-r2.ebuild
+++ b/app-misc/openjnlp/openjnlp-0.7.1-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/openjnlp/openjnlp-0.7.1-r2.ebuild,v 1.1 2006/08/01 01:51:56 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/openjnlp/openjnlp-0.7.1-r2.ebuild,v 1.2 2007/04/28 22:02:57 betelgeuse Exp $
 
-inherit java-pkg-2
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="An open-source implementation of the JNLP"
 HOMEPAGE="http://openjnlp.nanode.org/"
@@ -17,30 +19,27 @@ RDEPEND=">=virtual/jre-1.3
 		dev-java/nanoxml"
 DEPEND=">=virtual/jdk-1.3
 		${RDEPEND}
-		app-arch/unzip
-		>=dev-java/ant-1.6"
+		app-arch/unzip"
 
 S="${WORKDIR}/OpenJNLP-src-rel_ver-${PV//./-}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/jars
-	rm *.jar
+	cd "${S}/jars"
+	rm -v *.jar || die
 	java-pkg_jar-from jnlp-bin
 	java-pkg_jar-from sax
 	java-pkg_jar-from nanoxml nanoxml.jar nanoxml-2.2.jar
 	java-pkg_jar-from nanoxml nanoxml-sax.jar nanoxml-sax-2.2.jar
 
-	cd ${S}
-	# Fix javac stuff that can't be handled by java-ant-2
-	sed -e 's/<javac/<javac target="1.3" source="1.3"/' -i targets/common.xml || die "sed failed"
+	sed -e "s/<javac/<javac target=\"$(java-pkg_get-target)\" source=\"$(java-pkg_get-source)\"/" \
+		-i "${S}/targets/common.xml" || die "failed to sed javac"
+	java-ant_rewrite-classpath "${S}/targets/OpenJNLP/build.xml"
 }
 
 src_compile() {
 	cd ${S}/targets
-	# FIXME patch targets/OpenJNLP/build.xml to do classpath correctly
-	# so we don't have to pass -lib to ant
-	eant -lib ../jars/MRJToolkitStubs.zip build
+	eant -Dgentoo.classpath=jars/MRJToolkitStubs.zip build
 }
 
 src_install() {
@@ -49,6 +48,6 @@ src_install() {
 	java-pkg_dojar lib/*.jar
 	java-pkg_dolauncher ${PN} --main org.nanode.app.OpenJNLP
 
-	dodoc {History,ReadMe}.txt
+	dodoc {History,ReadMe}.txt || die
 }