Add ANT_TASKS none as it and build.sysclasspath=ignore should be enough to fix bug #191357 although I can't reproduce.

Package-Manager: portage-2.1.4_rc9

5 files changed, 26 insertions, 66 deletions

diff --git a/dev-java/jarjar/ChangeLog b/dev-java/jarjar/ChangeLog
index fad72c2b3ae5..f693e6a4efc7 100644
--- a/dev-java/jarjar/ChangeLog
+++ b/dev-java/jarjar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jarjar
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.22 2007/08/17 00:30:47 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.23 2007/12/13 16:14:15 betelgeuse Exp $
+
+  13 Dec 2007; Petteri Räty <betelgeuse@gentoo.org> -jarjar-0.6-r1.ebuild,
+  jarjar-0.9.ebuild:
+  Add ANT_TASKS none as it and build.sysclasspath=ignore should be enough to
+  fix bug #191357 although I can't reproduce.
 
   17 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> jarjar-0.9.ebuild:
   ppc stable
diff --git a/dev-java/jarjar/Manifest b/dev-java/jarjar/Manifest
index 9065c4fac83c..2625e43249fd 100644
--- a/dev-java/jarjar/Manifest
+++ b/dev-java/jarjar/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.9-system-jars.patch 790 RMD160 74f7c22791ffaace532a0016af519f1845374580 SHA1 991a2c7caf24f98e4f1b0c6ae69ea5d79762ec20 SHA256 9e1f66b2da6c774b643e45c487815288daafa8d55ab674d5c45727609ba3fc5e
 MD5 83ab21b67b5b6f3cd03ee0090a343898 files/0.9-system-jars.patch 790
 RMD160 74f7c22791ffaace532a0016af519f1845374580 files/0.9-system-jars.patch 790
@@ -6,27 +9,26 @@ AUX asm-2.0_alpha-buildfile.patch 1507 RMD160 83563c3081b6990e7b577e6e4c6396e8f6
 MD5 898b954c34be9e78c40ef2bdef781b52 files/asm-2.0_alpha-buildfile.patch 1507
 RMD160 83563c3081b6990e7b577e6e4c6396e8f653d06f files/asm-2.0_alpha-buildfile.patch 1507
 SHA256 ed1e51fc9b5618d12a8e69616d5c185828636c5b25b80dc6a71bf9aa5696a719 files/asm-2.0_alpha-buildfile.patch 1507
-DIST jarjar-src-0.6.zip 143055 RMD160 abd6c732873dbedbe25061eaf6eed02a31346b96 SHA1 545e3ec72b37a47ebcb07ddace62cf1e02412676 SHA256 98abc8626f51c3319cf2880ad50107ec08da14855b14c2d086c62523882e6acc
 DIST jarjar-src-0.9.zip 188269 RMD160 9fadaa77b2eea9a9d3f73ca26c1966bac12bc780 SHA1 74800aca365a2682ae18bd5497f16eee8e20b4fe SHA256 da90f1cb07dbd07b8141a4541acc701a0d33abb2808fe2410dd6782c98cb9b2a
-EBUILD jarjar-0.6-r1.ebuild 1178 RMD160 a314bf6368f4ff0ce27ce2f962517b0e480b5c06 SHA1 7b48a48bf48248a276c2e203274efbf9ad0e893b SHA256 6048e668251e911719bdbe0afb9a2af4f33e4c82ec98dcd9ce04fba5c9f8dd97
-MD5 e03b223abcc525ab90b3a0e92ae63eab jarjar-0.6-r1.ebuild 1178
-RMD160 a314bf6368f4ff0ce27ce2f962517b0e480b5c06 jarjar-0.6-r1.ebuild 1178
-SHA256 6048e668251e911719bdbe0afb9a2af4f33e4c82ec98dcd9ce04fba5c9f8dd97 jarjar-0.6-r1.ebuild 1178
-EBUILD jarjar-0.9.ebuild 1468 RMD160 448eb3fc5f1208a70ed7e7446f9b3086bb213e9b SHA1 5c4c7dee1313ef2300be8e36f506ed51ecc3bcaa SHA256 e047c6d0d040275f091945cf0249de0bd73e1942498544ff4bad0d0358e9cce1
-MD5 f14ea15418ef431698283f559cd239ec jarjar-0.9.ebuild 1468
-RMD160 448eb3fc5f1208a70ed7e7446f9b3086bb213e9b jarjar-0.9.ebuild 1468
-SHA256 e047c6d0d040275f091945cf0249de0bd73e1942498544ff4bad0d0358e9cce1 jarjar-0.9.ebuild 1468
-MISC ChangeLog 3449 RMD160 7ae39b743d7c7513c77b8915be76b297349c7831 SHA1 3e31aeea8fe47d1160dca98d90a1dbf1ca1255c9 SHA256 647287014d3328224bfa7966328f33934da2412f534074748fd50ab7da3be188
-MD5 a6acf346dbaa27d8d6f51eb54fdb5a8c ChangeLog 3449
-RMD160 7ae39b743d7c7513c77b8915be76b297349c7831 ChangeLog 3449
-SHA256 647287014d3328224bfa7966328f33934da2412f534074748fd50ab7da3be188 ChangeLog 3449
+EBUILD jarjar-0.9.ebuild 1486 RMD160 46ad351573762c00a9521b1bcb6e112303791874 SHA1 02251eaff6d0bf7fc665188f2315052508fe1e74 SHA256 5255d7a0213c6df125e106e29fff2ff42ea2f25964ec5c883ca30726e717c258
+MD5 c0e99500c282829eb502a73b3cf383a6 jarjar-0.9.ebuild 1486
+RMD160 46ad351573762c00a9521b1bcb6e112303791874 jarjar-0.9.ebuild 1486
+SHA256 5255d7a0213c6df125e106e29fff2ff42ea2f25964ec5c883ca30726e717c258 jarjar-0.9.ebuild 1486
+MISC ChangeLog 3670 RMD160 ef1fa28d7e683f586b313b59220db86f3531eba5 SHA1 a1d2f2a6333e5218108026e32c70d18413b245c7 SHA256 32345f42d5d422526357982ad6eb392de3373ee4cebe825d776c843cbc3b0af4
+MD5 b60680293ce7eb6c8aff81ecc2263169 ChangeLog 3670
+RMD160 ef1fa28d7e683f586b313b59220db86f3531eba5 ChangeLog 3670
+SHA256 32345f42d5d422526357982ad6eb392de3373ee4cebe825d776c843cbc3b0af4 ChangeLog 3670
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
-MD5 d430ced52aa5bd267bdf6daffc0b1dee files/digest-jarjar-0.6-r1 235
-RMD160 5816f44419fa10700ff539264b4cc22b831d87f0 files/digest-jarjar-0.6-r1 235
-SHA256 e2b12935670115472cb52fe2f05dde873a9f5c8249b9b61acb0518ba73f6cb49 files/digest-jarjar-0.6-r1 235
 MD5 dde27e7519a63ee530e95ede9104822d files/digest-jarjar-0.9 235
 RMD160 1d68b496dbab7dd90f9c85daa9d6063d72b8dcf4 files/digest-jarjar-0.9 235
 SHA256 166c69ddc69212fc74e5cef6aa062a66950ab79607c5ab1dd40bfc591e004b03 files/digest-jarjar-0.9 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHYVnocxLzpIGCsLQRAkYNAJ9RbHmhTO3FKnMUiTFe6IaErNoa4QCaAxp8
+9B77LhKaZRPztFgT4NmjKmY=
+=Vk63
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jarjar/files/digest-jarjar-0.6-r1 b/dev-java/jarjar/files/digest-jarjar-0.6-r1
deleted file mode 100644
index 167f4895045c..000000000000
--- a/dev-java/jarjar/files/digest-jarjar-0.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea4c41ef8e3b8b4026bbe81fcd547771 jarjar-src-0.6.zip 143055
-RMD160 abd6c732873dbedbe25061eaf6eed02a31346b96 jarjar-src-0.6.zip 143055
-SHA256 98abc8626f51c3319cf2880ad50107ec08da14855b14c2d086c62523882e6acc jarjar-src-0.6.zip 143055
diff --git a/dev-java/jarjar/jarjar-0.6-r1.ebuild b/dev-java/jarjar/jarjar-0.6-r1.ebuild
deleted file mode 100644
index 9c9204f87d86..000000000000
--- a/dev-java/jarjar/jarjar-0.6-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-0.6-r1.ebuild,v 1.8 2007/05/26 17:26:12 nelchael Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tool for repackaging third-party jars."
-SRC_URI="mirror://sourceforge/jarjar/${PN}-src-${PV}.zip"
-HOMEPAGE="http://jarjar.sourceforge.net"
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-COMMON_DEP="
-	=dev-java/asm-2.0*
-	=dev-java/gnu-regexp-1*
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-
-# FIXME looks like it bundles stuff from dev-java/java-getopt, ie
-# gnu.getopt.*, so this should delete the bundled files, and then
-# depend on java-getopt. Should also probably report upstream. -nichoj
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/lib
-	rm -f *.jar
-	java-pkg_jar-from asm-2
-	java-pkg_jar-from gnu-regexp-1
-	java-pkg_jar-from ant-core ant.jar
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/main/*
-}
diff --git a/dev-java/jarjar/jarjar-0.9.ebuild b/dev-java/jarjar/jarjar-0.9.ebuild
index fb45f70e33af..632dd440d8dd 100644
--- a/dev-java/jarjar/jarjar-0.9.ebuild
+++ b/dev-java/jarjar/jarjar-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-0.9.ebuild,v 1.9 2007/08/17 00:30:47 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-0.9.ebuild,v 1.10 2007/12/13 16:14:15 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -39,6 +39,7 @@ src_unpack() {
 	java-pkg_jar-from java-getopt-1
 }
 
+ANT_TASKS="none"
 EANT_BUILD_TARGET="jar-nojarjar"
 
 src_test() {