summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2009-10-06 18:55:44 +0000
committerVlastimil Babka <caster@gentoo.org>2009-10-06 18:55:44 +0000
commit5b328e483f7f71bb61551a86be702c4f906b21d6 (patch)
treedec8169c65b6b671c9af365711cb4285dc454746 /dev-java/jarjar/files
parentVersion bump KDE 4.3.2 (diff)
downloadgentoo-2-5b328e483f7f71bb61551a86be702c4f906b21d6.tar.gz
gentoo-2-5b328e483f7f71bb61551a86be702c4f906b21d6.tar.bz2
gentoo-2-5b328e483f7f71bb61551a86be702c4f906b21d6.zip
Fix building with ecj, bug #191378.
(Portage version: 2.2_rc43/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/jarjar/files')
-rw-r--r--dev-java/jarjar/files/0.9-bootclasspath.patch11
-rw-r--r--dev-java/jarjar/files/asm-2.0_alpha-buildfile.patch41
2 files changed, 11 insertions, 41 deletions
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>