From 1611fee25f3e160cdd3445c0a2c27784d69116aa Mon Sep 17 00:00:00 2001 From: Jan Brinkmann Date: Sat, 15 Jan 2005 15:58:08 +0000 Subject: [PATCH] removed packed jar issue of xerces-2.3.0. fixes bug #63287. --- dev-java/xerces/ChangeLog | 9 ++- dev-java/xerces/Manifest | 7 ++- dev-java/xerces/files/digest-xerces-2.3.0-r1 | 1 + .../xerces/files/xerces-2.3.0-gentoo.patch | 61 +++++++++++++++++++ dev-java/xerces/xerces-2.3.0-r1.ebuild | 56 +++++++++++++++++ dev-java/xerces/xerces-2.3.0.ebuild | 2 +- 6 files changed, 132 insertions(+), 4 deletions(-) create mode 100644 dev-java/xerces/files/digest-xerces-2.3.0-r1 create mode 100644 dev-java/xerces/files/xerces-2.3.0-gentoo.patch create mode 100644 dev-java/xerces/xerces-2.3.0-r1.ebuild diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog index 0c7a44739308..0644fb1e9dbd 100644 --- a/dev-java/xerces/ChangeLog +++ b/dev-java/xerces/ChangeLog @@ -1,6 +1,13 @@ # 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.38 2005/01/15 14:03:02 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.39 2005/01/15 15:58:08 luckyduck Exp $ + +*xerces-2.3.0-r1 (15 Jan 2005) + + 15 Jan 2005; Jan Brinkmann + +files/xerces-2.3.0-gentoo.patch, +xerces-2.3.0-r1.ebuild, + xerces-2.3.0.ebuild: + removed packed jar issue of xerces-2.3.0. fixes bug #63287. *xerces-2.6.2-r2 (15 Jan 2005) diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest index 67a96cca2d36..b420497307b1 100644 --- a/dev-java/xerces/Manifest +++ b/dev-java/xerces/Manifest @@ -1,14 +1,17 @@ -MD5 a22ac07568d97d4ba79cbf8e071c8738 xerces-2.3.0.ebuild 1140 +MD5 0de86c0b931a1eacf510ba9690d84a4a 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 2f6cd4b1bed1a96a1fb40c0978f14214 xerces-2.3.0-r1.ebuild 1509 MD5 fbfe34351874880123f590756d14adb4 xerces-1.3.1.ebuild 1080 MD5 518c378f907b7e864f5c1305ba7df9e2 xerces-2.6.2-r1.ebuild 1943 -MD5 727f23b5b8b2efe27d7ad5d9ce4d0635 ChangeLog 6015 +MD5 4aa45e757442fa4c95b62b9444c07a65 ChangeLog 6246 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 75b2cfa2eff39aa21e17c8b2ed40b6b6 files/xerces-2.6.2-r2-gentoo.patch 1342 +MD5 37e61d014a2f8f79909f6d0775c1959b files/digest-xerces-2.3.0-r1 71 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 4f14802b02f3ee092ebcf99c004af474 files/xerces-2.3.0-gentoo.patch 2684 MD5 b0ae8698b0ae0ee1e309b38ba1f81141 files/digest-xerces-1.3.1-r1 70 MD5 ca42d91bb10182d3e1717d14894481c8 files/digest-xerces-1.3.1 143 MD5 0ed5652de5f404a3fefb774b2b1a8538 files/digest-xerces-2.3.0 144 diff --git a/dev-java/xerces/files/digest-xerces-2.3.0-r1 b/dev-java/xerces/files/digest-xerces-2.3.0-r1 new file mode 100644 index 000000000000..b8d145fe505c --- /dev/null +++ b/dev-java/xerces/files/digest-xerces-2.3.0-r1 @@ -0,0 +1 @@ +MD5 fd7e2b41e6f7a4571215a48d2abe9041 Xerces-J-src.2.3.0.tar.gz 1556920 diff --git a/dev-java/xerces/files/xerces-2.3.0-gentoo.patch b/dev-java/xerces/files/xerces-2.3.0-gentoo.patch new file mode 100644 index 000000000000..08f95ed7a6fa --- /dev/null +++ b/dev-java/xerces/files/xerces-2.3.0-gentoo.patch @@ -0,0 +1,61 @@ +diff -urpN xerces-2_3_0.orig/build.sh xerces-2_3_0/build.sh +--- xerces-2_3_0.orig/build.sh 2005-01-15 15:14:51.682424232 +0100 ++++ xerces-2_3_0/build.sh 2005-01-15 16:22:11.299309120 +0100 +@@ -19,7 +19,7 @@ uname | grep WIN && CLPATHSEP=\; + + # Keep this classpath to the minimum required to run ant + # Application dependent classpaths are specified in build.xml +-LOCALCLASSPATH="$JAVA_HOME/lib/tools.jar${CLPATHSEP}${JAVA_HOME}/lib/classes.zip${CLPATHSEP}./tools/ant.jar${CLPATHSEP}./tools/xercesImpl.jar${CLPATHSEP}./tools/xml-apis.jar${CLPATHSEP}./tools/bin/xjavac.jar" ++LOCALCLASSPATH="$JAVA_HOME/lib/tools.jar${CLPATHSEP}${JAVA_HOME}/lib/classes.zip${CLPATHSEP}./tools/ant.jar${CLPATHSEP}./tools/ant-launcher.jar${CLPATHSEP}./tools/xercesImpl.jar${CLPATHSEP}./tools/xml-apis.jar${CLPATHSEP}./tools/bin/xjavac.jar" + ANT_HOME=./tools + + echo Building with classpath \"$LOCALCLASSPATH\" +diff -urpN xerces-2_3_0.orig/build.xml xerces-2_3_0/build.xml +--- xerces-2_3_0.orig/build.xml 2005-01-15 15:14:51.682424232 +0100 ++++ xerces-2_3_0/build.xml 2005-01-15 16:38:48.751673312 +0100 +@@ -173,7 +173,6 @@ Copyright: + + +- + + + + +- +- ++ ++ + + +@@ -221,16 +220,7 @@ Copyright: + debug="${debug}" + deprecation="${deprecation}" + optimize="${optimize}" +- includeAntRuntime="false" +- includeJavaRuntime="false" +- excludes="org/xml/sax/** +- javax/xml/parsers/** +- org/w3c/dom/* +- org/w3c/dom/events/** +- org/w3c/dom/html/** +- org/w3c/dom/ranges/** +- org/w3c/dom/traversal/**" +- /> ++ classpath="tools/xml-apis.jar" /> + + + diff --git a/dev-java/xerces/xerces-2.3.0-r1.ebuild b/dev-java/xerces/xerces-2.3.0-r1.ebuild new file mode 100644 index 000000000000..27a0fd60b80a --- /dev/null +++ b/dev-java/xerces/xerces-2.3.0-r1.ebuild @@ -0,0 +1,56 @@ +# 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.3.0-r1.ebuild,v 1.5 2005/01/15 15:58:08 luckyduck Exp $ + +inherit java-pkg eutils + +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="http://xml.apache.org/dist/xerces-j/Xerces-J-src.${PV}.tar.gz" + +LICENSE="Apache-1.1" +SLOT="2.3" +KEYWORDS="~x86 ~amd64" + +DEPEND=">=virtual/jdk-1.3" +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" +IUSE="doc jikes" + +src_unpack() { + unpack ${A} + + cd ${S} + epatch ${FILESDIR}/${P}-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 xalan + java-pkg_jar-from xml-commons xml-apis.jar + + mkdir ${S}/tools/bin && cd ${S}/tools/bin + java-pkg_jar-from xjavac-1 +} + +src_compile() { + local antflags="jars" + use doc && antflags="${antflags} javadocs" + use jikes && antflags="${antflags} -Dbuild.compiler=jikes" + sh build.sh ${antflags} || die "ant build failed" +} + +src_install () { + java-pkg_dojar build/x*.jar + dodoc TODO STATUS README LICENSE ISSUES + dohtml Readme.html + + if use doc; then + dodir /usr/share/doc/${PF} + cp -a samples ${D}/usr/share/doc/${PF} + java-pkg_dohtml -r build/docs/javadocs + fi +} diff --git a/dev-java/xerces/xerces-2.3.0.ebuild b/dev-java/xerces/xerces-2.3.0.ebuild index becdfa11eb32..f90ded8ca97c 100644 --- a/dev-java/xerces/xerces-2.3.0.ebuild +++ b/dev-java/xerces/xerces-2.3.0.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.3.0.ebuild,v 1.13 2005/01/15 13:20:08 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.3.0.ebuild,v 1.14 2005/01/15 15:58:08 luckyduck Exp $ inherit java-pkg -- 2.26.2