[patch] Differences from 1.12 to 1.12-r1 ebuild and build.xml

254055.patch (text/plain), 2.65 KB, created by Martin von Gagern on 2009-01-07 11:16:28 UTC

Gentoo bug: https://bugs.gentoo.org/254055
2009-01-07 Martin von Gagern <[e-mail]>

--- /usr/portage/dev-java/relaxngcc/relaxngcc-1.12.ebuild	2008-10-07 17:12:17.000000000 +0200
+++ dev-java/relaxngcc/relaxngcc-1.12-r1.ebuild	2009-01-07 11:51:21.000000000 +0100
@@ -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/relaxngcc/relaxngcc-1.12.ebuild,v 1.8 2008/03/28 18:01:38 nixnut Exp $
+# $Header: $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -29,23 +29,20 @@
 
 src_unpack() {
 
-	unpack ${A}
+	unpack ${A} || die
+	cd "${S}" || die
+	mv relaxngcc.jar relaxngcc.orig.jar || die
 
-	cd "${S}"
-	rm -v *.jar || die
-	mkdir lib
-
-	cd lib/
+	mkdir lib || die
+	cd lib || die
 	java-pkg_jarfrom relaxng-datatype
 	java-pkg_jarfrom msv
 	java-pkg_jarfrom xsdlib
 	java-pkg_jarfrom ant-core
+	cd "${S}" || die
 
-	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die "cp failed"
-	cp "${FILESDIR}/MANIFEST.MF-${PV}" "${S}/MANIFEST.MF" || die "cp failed"
-
-	cd "${S}/src/relaxngcc/"
-	rm -rf maven
+	cp "${FILESDIR}/build.xml-1.12-r1" build.xml || die "cp failed"
+	rm -rf "src/relaxngcc/maven"
 	java-pkg_filter-compiler jikes
 }
 
--- /usr/portage/dev-java/relaxngcc/files/build.xml-1.12	2007-05-01 21:19:56.000000000 +0200
+++ dev-java/relaxngcc/files/build.xml-1.12-r1	2009-01-07 11:54:04.000000000 +0100
@@ -2,15 +2,33 @@
 <project name="relaxngcc" default="jar" basedir=".">
   <target name="compile">
     <mkdir dir="build"/>
-	<javac debug="false" srcdir="src" destdir="build">
+    <javac srcdir="src" destdir="build">
       <classpath>
         <fileset dir="lib" includes="**/*.jar"/>
       </classpath>
     </javac>
   </target>
   <target name="jar" depends="compile">
-    <jar destfile="relaxngcc.jar" manifest="MANIFEST.MF">
-      <fileset dir="build" includes="**/*.class"/>
+    <jar destfile="relaxngcc.jar">
+      <manifest>
+        <attribute name="Main-Class" value="relaxngcc.RelaxNGCC"/>
+      </manifest>
+      <fileset dir="build">
+        <include name="**/*.class"/>
+      </fileset>
+      <!--
+        For a list of resources to include, see the project.xml from the
+        upstream relaxngcc.jar contained in the base directory of the zip.
+      -->
+      <fileset dir="src">
+        <include name="plugin.jelly"/>
+        <include name="relaxngcc/runtime/*.java"/>
+        <include name="**/*.properties"/>
+        <include name="**/*.xsl"/>
+      </fileset>
+      <zipfileset src="relaxngcc.orig.jar">
+        <include name="project.xml"/>
+      </zipfileset>
     </jar>
   </target>
 </project>