summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2008-02-02 11:53:04 +0000
committerVlastimil Babka <caster@gentoo.org>2008-02-02 11:53:04 +0000
commitd6ab5fd364cb90ca30390fc1d31f728a7917d913 (patch)
tree8782ed5127c3f9156cfdb46891c44fe709316176 /dev-java/xmlc/files
parentFix blocker, bug #207259 (diff)
downloadgentoo-2-d6ab5fd364cb90ca30390fc1d31f728a7917d913.tar.gz
gentoo-2-d6ab5fd364cb90ca30390fc1d31f728a7917d913.tar.bz2
gentoo-2-d6ab5fd364cb90ca30390fc1d31f728a7917d913.zip
Version bump and migration to gen-2 eclasses, bug #168655. Dropped ppc due to nekohtml dep.
(Portage version: 2.1.4.1)
Diffstat (limited to 'dev-java/xmlc/files')
-rw-r--r--dev-java/xmlc/files/xmlc-2.3-build.xml.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/dev-java/xmlc/files/xmlc-2.3-build.xml.patch b/dev-java/xmlc/files/xmlc-2.3-build.xml.patch
new file mode 100644
index 000000000000..125fd3862a58
--- /dev/null
+++ b/dev-java/xmlc/files/xmlc-2.3-build.xml.patch
@@ -0,0 +1,51 @@
+diff -Naur xmlc-src-2.3.orig/xmlc/modules/taskdef/build-default.properties xmlc-src-2.3/xmlc/modules/taskdef/build-default.properties
+--- xmlc-src-2.3.orig/xmlc/modules/taskdef/build-default.properties 2007-04-22 00:40:58.000000000 +0200
++++ xmlc-src-2.3/xmlc/modules/taskdef/build-default.properties 2008-02-02 10:41:25.000000000 +0100
+@@ -37,7 +37,7 @@
+ # Comma seperated list of libraries (or more exactly, include patterns) this
+ # module depends on for building.
+ # They are searched relative to ${lib.dir}
+-module.depends=xmlc.jar
++module.depends=xmlc.jar,ant.jar
+
+ # Javadoc settings
+ javadoc.packages=org.enhydra.*
+diff -Naur xmlc-src-2.3.orig/xmlc/modules/xmlc/build.xml xmlc-src-2.3/xmlc/modules/xmlc/build.xml
+--- xmlc-src-2.3.orig/xmlc/modules/xmlc/build.xml 2007-04-23 00:08:08.000000000 +0200
++++ xmlc-src-2.3/xmlc/modules/xmlc/build.xml 2008-02-02 10:32:19.000000000 +0100
+@@ -148,15 +148,12 @@
+ description="Build the module .jar file">
+ <tstamp/>
+ <delete file="${module.jar}"/>
+- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar.jar"/>
+- <jarjar jarfile="${module.jar}"><!-- index="true"-->
++ <jar destfile="${module.jar}"><!-- index="true"-->
+ <fileset file="${dist.root}/../LICENSE-xmlc"/>
+ <fileset dir="${build.classes}" />
+ <fileset dir="${src.dir}"
+ includes="${module.lib.extra.includes}"
+ excludes="${module.lib.extra.excludes}" />
+- <zipfileset src="${build.lib.dir}/asm.jar"/>
+- <rule pattern="org.objectweb.asm.**" result="org.enhydra.xml.xmlc.deferredparsing.asm.@1"/>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Built-On" value="${TODAY}"/>
+@@ -172,17 +169,12 @@
+ <attribute name="Implementation-Vendor-Id" value="org.objectweb"/>
+ <attribute name="Implementation-URL" value="http://www.enhydra.org/tech/xmlc/"/>
+ </section>
+- <section name="org/enhydra/xml/xmlc/deferredparsing/asm/">
+- <attribute name="Implementation-Title" value="ASM"/>
+- <attribute name="Implementation-Version" value="3.0"/>
+- <attribute name="Implementation-Vendor" value="France Telecom R&amp;D"/>
+- </section>
+ </manifest>
+ <!--indexjars>
+ <fileset dir="${dist.root}/lib" includes="*.jar"/>
+ <fileset dir="${dist.root}/build-lib" includes="*.jar"/>
+ </indexjars-->
+- </jarjar>
++ </jar>
+ </target>
+
+ <target name="lib-tests" depends="init,compile-tests" unless="lib-test.skip"