removed packed jar issue of xerces-2.6.2. see bug #63287.

6 files changed, 125 insertions, 4 deletions

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index 8c736b60eab8..0c7a44739308 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-java/xerces
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.37 2005/01/15 13:20:08 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.38 2005/01/15 14:03:02 luckyduck Exp $
+
+*xerces-2.6.2-r2 (15 Jan 2005)
+
+  15 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/xerces-2.6.2-r2-gentoo.patch, xerces-2.6.2-r1.ebuild,
+  +xerces-2.6.2-r2.ebuild:
+  removed packed jar issue of xerces-2.6.2. see bug #63287.
+
+*xerces-2.6.2-r2 15 Jan 2005
+
+  15 Jan 2005;  <> 
+  # INSERT ENTRY HERE
 
 *xerces-1.3.1-r1 (15 Jan 2005)
 
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 475910db10e4..67a96cca2d36 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,10 +1,13 @@
 MD5 a22ac07568d97d4ba79cbf8e071c8738 xerces-2.3.0.ebuild 1140
 MD5 129d068079b0b72e2fec9c1d4cf1dfbb xerces-1.3.1-r1.ebuild 1177
+MD5 acb4ee8290b56f35bb4f1c271f9deb4a xerces-2.6.2-r2.ebuild 1798
 MD5 fbfe34351874880123f590756d14adb4 xerces-1.3.1.ebuild 1080
-MD5 21a56105286cf5abc446351a11206439 xerces-2.6.2-r1.ebuild 1943
-MD5 46b8b46f1ad83ea47135253fcae087ab ChangeLog 5707
+MD5 518c378f907b7e864f5c1305ba7df9e2 xerces-2.6.2-r1.ebuild 1943
+MD5 727f23b5b8b2efe27d7ad5d9ce4d0635 ChangeLog 6015
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 75b2cfa2eff39aa21e17c8b2ed40b6b6 files/xerces-2.6.2-r2-gentoo.patch 1342
 MD5 202c6353e68e489ff4ca668a0999534d files/digest-xerces-2.6.2-r1 144
+MD5 b0ce49e162a5ad60941af4594c938eda files/digest-xerces-2.6.2-r2 71
 MD5 a00b411ba35267075fda1f96c4867caf files/xerces-1.3.1-build.xml 1680
 MD5 b0ae8698b0ae0ee1e309b38ba1f81141 files/digest-xerces-1.3.1-r1 70
 MD5 ca42d91bb10182d3e1717d14894481c8 files/digest-xerces-1.3.1 143
diff --git a/dev-java/xerces/files/digest-xerces-2.6.2-r2 b/dev-java/xerces/files/digest-xerces-2.6.2-r2
new file mode 100644
index 000000000000..ed348689322a
--- /dev/null
+++ b/dev-java/xerces/files/digest-xerces-2.6.2-r2
@@ -0,0 +1 @@
+MD5 cfd536b8d72f8ebe3465ae35f5e3775d Xerces-J-src.2.6.2.tar.gz 1612086
diff --git a/dev-java/xerces/files/xerces-2.6.2-r2-gentoo.patch b/dev-java/xerces/files/xerces-2.6.2-r2-gentoo.patch
new file mode 100644
index 000000000000..87c29811597d
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.6.2-r2-gentoo.patch
@@ -0,0 +1,34 @@
+diff -urpN xerces-2_6_2.old/build.sh xerces-2_6_2/build.sh
+--- xerces-2_6_2.old/build.sh	2004-02-20 19:58:14.000000000 +0100
++++ xerces-2_6_2/build.sh	2005-01-15 14:41:31.437507680 +0100
+@@ -28,8 +28,8 @@ LIBDIR=./tools
+ ANT_HOME="$LIBDIR"
+ LOCALCLASSPATH="$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip"
+ LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/ant.jar"
++LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/ant-launcher.jar"
+ LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/xml-apis.jar"
+-LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/xercesImpl.jar"
+ LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/bin/xjavac.jar"
+ 
+ 
+diff -urpN xerces-2_6_2.old/build.xml xerces-2_6_2/build.xml
+--- xerces-2_6_2.old/build.xml	2004-02-20 19:58:14.000000000 +0100
++++ xerces-2_6_2/build.xml	2005-01-15 14:41:08.603978904 +0100
+@@ -190,7 +190,7 @@ Copyright:
+         </fileset>
+     </copy>
+ 
+-    <!-- now deal with API's:  -->
++    <!-- now deal with API's:  
+     <unzip src="${src.apis.zip}" dest="${build.src}">
+         <patternset
+             includes="org/xml/sax/** 
+@@ -202,7 +202,7 @@ Copyright:
+                 org/w3c/dom/traversal/**"
+         />
+     </unzip>
+-    
++    -->
+     <!-- substitute tokens as needed -->
+     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
+              token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
diff --git a/dev-java/xerces/xerces-2.6.2-r1.ebuild b/dev-java/xerces/xerces-2.6.2-r1.ebuild
index 596fe6a0b49b..ce39c97e20b1 100644
--- a/dev-java/xerces/xerces-2.6.2-r1.ebuild
+++ b/dev-java/xerces/xerces-2.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r1.ebuild,v 1.13 2005/01/15 13:20:08 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r1.ebuild,v 1.14 2005/01/15 14:03:02 luckyduck Exp $
 
 inherit java-pkg eutils
 
diff --git a/dev-java/xerces/xerces-2.6.2-r2.ebuild b/dev-java/xerces/xerces-2.6.2-r2.ebuild
new file mode 100644
index 000000000000..d7c7b8aba252
--- /dev/null
+++ b/dev-java/xerces/xerces-2.6.2-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r2.ebuild,v 1.1 2005/01/15 14:03:02 luckyduck Exp $
+
+inherit java-pkg eutils
+
+IUSE="doc jikes examples"
+
+S=${WORKDIR}/xerces-${PV//./_}
+DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
+HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
+SRC_URI="mirror://apache/xml/xerces-j/Xerces-J-src.${PV}.tar.gz"
+LICENSE="Apache-1.1"
+SLOT="2"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND=">=virtual/jdk-1.3
+	jikes? ( >=dev-java/jikes-1.21 )"
+RDEPEND=">=virtual/jre-1.3
+	>=dev-java/ant-core-1.5.2
+	>=dev-java/xalan-2.5.2
+	>=dev-java/xml-commons-1.0_beta2
+	>=dev-java/xml-commons-resolver-1.1
+	>=dev-java/xjavac-20041208"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PF}-gentoo.patch
+
+	mkdir ${S}/tools
+	cd ${S}/tools
+	java-pkg_jar-from ant-core ant.jar
+	java-pkg_jar-from ant-core ant-launcher.jar
+	java-pkg_jar-from junit
+	java-pkg_jar-from xalan
+	java-pkg_jar-from xml-commons xml-apis.jar
+	java-pkg_jar-from xml-commons-resolver xml-commons-resolver.jar resolver.jar
+
+
+	mkdir ${S}/tools/bin
+	cd ${S}/tools/bin
+	java-pkg_jar-from xjavac-1
+}
+
+src_compile() {
+	local antflags="jars sampjar"
+	if use doc ; then
+		antflags="${antflags} javadocs"
+	fi
+	if use jikes; then
+		antflags="${antflags} -Dbuild.compiler=jikes"
+	fi
+	sh build.sh ${antflags} || die "Compile failed."
+}
+
+src_install() {
+	java-pkg_dojar build/x*.jar
+
+	dodoc TODO STATUS README ISSUES LICENSE
+	java-pkg_dohtml Readme.html
+
+	if use doc ; then
+		java-pkg_dohtml -r build/docs/javadocs
+	fi
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -r samples/* ${D}/usr/share/doc/${PF}/examples
+	fi
+}