Fix building with ecj, bug #191378.

(Portage version: 2.2_rc43/cvs/Linux x86_64)

4 files changed, 24 insertions, 45 deletions

diff --git a/dev-java/jarjar/ChangeLog b/dev-java/jarjar/ChangeLog
index 85ba400dfcac..16669581eab9 100644
--- a/dev-java/jarjar/ChangeLog
+++ b/dev-java/jarjar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jarjar
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.26 2008/09/10 18:17:52 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.27 2009/10/06 18:55:44 caster Exp $
+
+  06 Oct 2009; Vlastimil Babka <caster@gentoo.org>
+  +files/0.9-bootclasspath.patch, jarjar-0.9.ebuild,
+  -files/asm-2.0_alpha-buildfile.patch:
+  Fix building with ecj, bug #191378.
 
   10 Sep 2008; Brent Baude <ranger@gentoo.org> jarjar-0.9.ebuild:
   Marking jarjar-0.9 ppc64 stable for dep to bug 235747
diff --git a/dev-java/jarjar/files/0.9-bootclasspath.patch b/dev-java/jarjar/files/0.9-bootclasspath.patch
new file mode 100644
index 000000000000..6a46d1afbd5a
--- /dev/null
+++ b/dev-java/jarjar/files/0.9-bootclasspath.patch
@@ -0,0 +1,11 @@
+--- build.xml	2008-09-13 13:55:40.000000000 +0200
++++ build.xml	2009-10-06 20:51:53.000000000 +0200
+@@ -48,7 +48,7 @@
+             </copy>
+             <javac srcdir="src/@{module}" destdir="build/@{module}"
+               source="${compile.source}"
+-              target="${compile.target}" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}"
++              target="${compile.target}" extdirs="${compile.extdirs}"
+               debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}">
+                  <classpath refid="@{refid}"/>
+                  <compilerarg value="-Xlint"/>
diff --git a/dev-java/jarjar/files/asm-2.0_alpha-buildfile.patch b/dev-java/jarjar/files/asm-2.0_alpha-buildfile.patch
deleted file mode 100644
index 299586695201..000000000000
--- a/dev-java/jarjar/files/asm-2.0_alpha-buildfile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- build.xml.orig	2005-01-05 21:37:11.710210536 +0100
-+++ build.xml	2005-01-05 21:44:50.430474456 +0100
-@@ -20,7 +20,7 @@
-     <property name="compile.extdirs" value=""/>
- 
-     <property name="version" value="0.4"/>
--    <property name="jarfile" value="${dist}/jarjar-${version}.jar"/>
-+    <property name="jarfile" value="${dist}/jarjar.jar"/>
- 
-     <property name="test.jar" value="${build}/rejar.jar"/>
- 
-@@ -88,18 +88,13 @@
- 
-     <target name="jar" depends="compile" description="Create Jar">
-         <mkdir dir="${dist}"/>
--        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="path.run"/>
--        <jarjar jarfile="${jarfile}">
-+        <jar jarfile="${jarfile}">
-             <fileset dir="${build}/main"/>
--            <zipfileset src="${lib}/asm.jar"/>
--            <zipfileset src="${lib}/gnu-regexp.jar"/>
--            <rule pattern="org.objectweb.asm.**" result="com.tonicsystems.jarjar.asm.@1"/>
--            <rule pattern="gnu.**" result="com.tonicsystems.jarjar.@0"/>
-             <manifest>
-                 <attribute name="Main-Class" value="com.tonicsystems.jarjar.Main"/>
-                 <attribute name="Implementation-Version" value="${version}"/>
-             </manifest>
--        </jarjar>
-+        </jar>
-     </target>
- 
-     <target name="test-rejar" depends="jar">
-@@ -129,7 +124,7 @@
-           Use="true"
-         />
-     </target>
--
-+    
-     <target name="dist" depends="clean,test,javadoc">
-         <!-- TODO -->
-     </target>
diff --git a/dev-java/jarjar/jarjar-0.9.ebuild b/dev-java/jarjar/jarjar-0.9.ebuild
index ac2f3103eb3d..c6419c782872 100644
--- a/dev-java/jarjar/jarjar-0.9.ebuild
+++ b/dev-java/jarjar/jarjar-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.13 2008/09/10 18:17:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-0.9.ebuild,v 1.14 2009/10/06 18:55:44 caster Exp $
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -30,7 +30,11 @@ src_unpack() {
 	cd "${S}"
 	rm -v src/main/com/tonicsystems/jarjar/JarJarMojo.java || die
 	rm -vr src/main/gnu || die
+
 	epatch "${FILESDIR}/0.9-system-jars.patch"
+	# bug #191378
+	epatch "${FILESDIR}/0.9-bootclasspath.patch"
+
 	cd "${S}/lib"
 	rm -v *.jar || die
 	java-pkg_jar-from asm-2