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

(Portage version: 2.1.4_rc9)

4 files changed, 8 insertions, 50 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/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() {