added a patch to make compiling against the jdk15 possible, fixes #81008

Package-Manager: portage-2.0.51-r15

4 files changed, 53 insertions, 5 deletions

diff --git a/dev-java/xml-commons/ChangeLog b/dev-java/xml-commons/ChangeLog
index f1d34d41a84e..d00b6677e9af 100644
--- a/dev-java/xml-commons/ChangeLog
+++ b/dev-java/xml-commons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xml-commons
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/ChangeLog,v 1.3 2005/01/15 19:03:16 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/ChangeLog,v 1.4 2005/02/06 19:49:39 luckyduck Exp $
+
+  06 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/1.0_beta2-jdk15.patch, xml-commons-1.0_beta2.ebuild:
+  added a patch to make compiling against the jdk15 possible, fixes #81008
 
   15 Jan 2005; Saleem Abdulrasool <compnerd@gentoo.org> xml-commons-1.0_beta2.ebuild
   Resolves the error with javadoc; closes bug #78104
diff --git a/dev-java/xml-commons/Manifest b/dev-java/xml-commons/Manifest
index 4136acfaa150..480d61d9f808 100644
--- a/dev-java/xml-commons/Manifest
+++ b/dev-java/xml-commons/Manifest
@@ -1,4 +1,5 @@
-MD5 fc2457a683691151d1af6715d471a814 ChangeLog 699
+MD5 a2b573d40e7cc0f0077e08bf193f9453 xml-commons-1.0_beta2.ebuild 1226
+MD5 99508b8e32b0c1fd2b6547a45e17f26e ChangeLog 890
 MD5 6c508e5bd6d1f3926eef63565d0f2cef metadata.xml 577
-MD5 2f4e609612d8af727f3a39b8da43c36d xml-commons-1.0_beta2.ebuild 1139
+MD5 55bd514ef86d8fcec1e605bb9eddea1f files/1.0_beta2-jdk15.patch 1784
 MD5 ff3ac9f3ff42eef7ede2b379c9b25340 files/digest-xml-commons-1.0_beta2 71
diff --git a/dev-java/xml-commons/files/1.0_beta2-jdk15.patch b/dev-java/xml-commons/files/1.0_beta2-jdk15.patch
new file mode 100644
index 000000000000..6080e14e7232
--- /dev/null
+++ b/dev-java/xml-commons/files/1.0_beta2-jdk15.patch
@@ -0,0 +1,36 @@
+diff -uprN xml-commons-1.0.b2/java/external/build.xml java/external/build.xml
+--- xml-commons-1.0.b2/java/external/build.xml	2002-02-06 16:52:59.000000000 +0100
++++ java/external/build.xml	2005-02-06 20:42:52.645987384 +0100
+@@ -65,7 +65,7 @@
+ 

+   <target name="compile" depends="prepare"

+     description="Compile all classes">

+-   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" />

++   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" source="1.4" target="1.4" />

+   </target>

+ 

+   <target name="jar" depends="compile"

+diff -uprN xml-commons-1.0.b2/java/resolver.xml java/resolver.xml
+--- xml-commons-1.0.b2/java/resolver.xml	2002-02-06 16:52:46.000000000 +0100
++++ java/resolver.xml	2005-02-06 20:45:57.003960712 +0100
+@@ -63,7 +63,7 @@ Build file for org.apache.xml.resolver. 
+ 

+   <target name="compile" depends="init"

+     description="Compile all classes">

+-   <javac srcdir="${src.dir}" destdir="${build.classes.dir}">

++   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" source="1.4" target="1.4">

+      <include name="${resolver.subdir}/*.java"/>

+      <include name="${resolver.subdir}/helpers/*.java"/>

+      <include name="${resolver.subdir}/readers/*.java"/>

+diff -uprN xml-commons-1.0.b2/java/which.xml java/which.xml
+--- xml-commons-1.0.b2/java/which.xml	2002-02-06 16:52:28.000000000 +0100
++++ java/which.xml	2005-02-06 20:45:38.379792016 +0100
+@@ -64,7 +64,7 @@ Build file for org.apache.env.Which serv
+   <target name="compile" depends="init"

+     description="Compile all classes">

+    <javac srcdir="${src.dir}" destdir="${build.classes.dir}" 

+-       includes="${env.subdir}/*.java" />

++       includes="${env.subdir}/*.java" source="1.4" target="1.4" />

+   </target>

+ 

+   <target name="jar" depends="compile"

diff --git a/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild b/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild
index 604a2200ed32..251916e5f1ec 100644
--- a/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild
+++ b/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild,v 1.4 2005/01/15 19:03:16 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild,v 1.5 2005/02/06 19:49:39 luckyduck Exp $
 
-inherit java-pkg
+inherit eutils java-pkg
 
 DESCRIPTION="Jakarta project for for XML bindings for java"
 HOMEPAGE="http://xml.apache.org/commons/"
@@ -19,6 +19,13 @@ RDEPEND=">=virtual/jre-1.4"
 
 S=${WORKDIR}/xml-commons-1.0.b2
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-jdk15.patch
+}
+
 src_compile() {
 	local antflags="jar"