diff options
| -rw-r--r-- | dev-java/xerces/ChangeLog | 18 | ||||
| -rw-r--r-- | dev-java/xerces/files/digest-xerces-2.8.1 | 3 | ||||
| -rw-r--r-- | dev-java/xerces/files/xerces-2.8.1-gentoo.patch | 21 | ||||
| -rw-r--r-- | dev-java/xerces/files/xerces-2.8.1-no_dom3.patch | 20 | ||||
| -rw-r--r-- | dev-java/xerces/xerces-1.3.1-r2.ebuild | 30 | ||||
| -rw-r--r-- | dev-java/xerces/xerces-2.3.0-r3.ebuild | 27 | ||||
| -rw-r--r-- | dev-java/xerces/xerces-2.8.1.ebuild | 64 | ||||
| -rw-r--r-- | dev-java/xerces/xerces-2.9.0.ebuild | 17 | ||||
| -rw-r--r-- | dev-java/xerces/xerces-2.9.1.ebuild | 17 |
9 files changed, 55 insertions, 162 deletions
diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog index 82988608824e..a020e4b17fcc 100644 --- a/dev-java/xerces/ChangeLog +++ b/dev-java/xerces/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for dev-java/xerces -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.102 2007/11/25 14:47:26 opfer Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.103 2008/01/17 14:39:12 caster Exp $ + + 17 Jan 2008; Vlastimil Babka <caster@gentoo.org> + -files/xerces-2.8.1-gentoo.patch, -files/xerces-2.8.1-no_dom3.patch, + xerces-1.3.1-r2.ebuild, xerces-2.3.0-r3.ebuild, -xerces-2.8.1.ebuild, + xerces-2.9.0.ebuild, xerces-2.9.1.ebuild: + Remove WANT_SPLIT_ANT, fix quotes, update syntax, fix examples installation, + remove unused version. + + 17 Jan 2008; Vlastimil Babka <caster@gentoo.org> + -files/xerces-2.8.1-gentoo.patch, -files/xerces-2.8.1-no_dom3.patch, + xerces-1.3.1-r2.ebuild, xerces-2.3.0-r3.ebuild, -xerces-2.8.1.ebuild, + xerces-2.9.0.ebuild, xerces-2.9.1.ebuild: + Remove WANT_SPLIT_ANT, fix quotes, update syntax, fix examples installation, + remove unused version. 25 Nov 2007; Christian Faulhammer <opfer@gentoo.org> xerces-2.9.0.ebuild: stable x86, bug 199501 diff --git a/dev-java/xerces/files/digest-xerces-2.8.1 b/dev-java/xerces/files/digest-xerces-2.8.1 deleted file mode 100644 index ee0ddf257ed9..000000000000 --- a/dev-java/xerces/files/digest-xerces-2.8.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 737df086ccae96f77334974617ccb4e0 Xerces-J-src.2.8.1.tar.gz 1691101 -RMD160 fc643f8cfee9116a6dfddb7e9123e64ea79cc25b Xerces-J-src.2.8.1.tar.gz 1691101 -SHA256 8423b267f597f2a042ca8224770fb7ca31ae902df0f3e4b5f04df99e1b9ced33 Xerces-J-src.2.8.1.tar.gz 1691101 diff --git a/dev-java/xerces/files/xerces-2.8.1-gentoo.patch b/dev-java/xerces/files/xerces-2.8.1-gentoo.patch deleted file mode 100644 index 61445ea6fe88..000000000000 --- a/dev-java/xerces/files/xerces-2.8.1-gentoo.patch +++ /dev/null @@ -1,21 +0,0 @@ -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/files/xerces-2.8.1-no_dom3.patch b/dev-java/xerces/files/xerces-2.8.1-no_dom3.patch deleted file mode 100644 index 8f485adcdbfd..000000000000 --- a/dev-java/xerces/files/xerces-2.8.1-no_dom3.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ru xerces-2_7_1/build.xml xerces-2_7_1-patched/build.xml ---- xerces-2_7_1/build.xml 2005-07-26 16:09:07.000000000 -0400 -+++ xerces-2_7_1-patched/build.xml 2005-12-08 23:51:32.000000000 -0500 -@@ -442,16 +442,6 @@ - additionalparam='${additional.param}' - /> - <mkdir dir='${build.dir}/docs/javadocs/other'/> -- <javadoc packagenames='org.apache.html.*, -- org.apache.wml.*, -- org.apache.xml.serialize.*' -- locale='en_US' -- sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/other' -- author='true' version='true' -- windowtitle='Other Classes' doctitle='Other Classes' -- bottom='${copyright}' -- additionalparam='${additional.param}' -- /> - </target> - - <!-- =================================================================== --> diff --git a/dev-java/xerces/xerces-1.3.1-r2.ebuild b/dev-java/xerces/xerces-1.3.1-r2.ebuild index 1662a51f71be..323c6dde4a22 100644 --- a/dev-java/xerces/xerces-1.3.1-r2.ebuild +++ b/dev-java/xerces/xerces-1.3.1-r2.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-1.3.1-r2.ebuild,v 1.7 2007/10/18 12:47:38 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-1.3.1-r2.ebuild,v 1.8 2008/01/17 14:39:12 caster Exp $ + +JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 @@ -13,31 +15,25 @@ LICENSE="Apache-1.1" SLOT="1.3" KEYWORDS="amd64 ppc x86" -DEPEND=">=virtual/jdk-1.3 - source? ( app-arch/zip ) - dev-java/ant-core" +DEPEND=">=virtual/jdk-1.3" RDEPEND=">=virtual/jre-1.3 >=dev-java/xalan-2.5.2" -IUSE="doc source" +IUSE="" src_unpack() { unpack ${A} - cd ${S} + cd "${S}" - cp ${FILESDIR}/${P}-build.xml build.xml + cp "${FILESDIR}/${P}-build.xml" build.xml || die } -src_compile() { - local antflags="jar" - use doc && antflags="${antflags} docs" - eant ${antflags} || die "ant build failed" -} +EANT_DOC_TARGET="docs" src_install() { java-pkg_dojar dist/${PN}.jar - dodoc README STATUS - java-pkg_dohtml Readme.html - use doc && java-pkg_dohtml -r docs/* - use source && java-pkg_dosrc ${S}/src/org + dodoc README STATUS || die + dohtml Readme.html || die + use doc && java-pkg_dojavadoc docs + use source && java-pkg_dosrc "${S}/src/org" } diff --git a/dev-java/xerces/xerces-2.3.0-r3.ebuild b/dev-java/xerces/xerces-2.3.0-r3.ebuild index be20f1b85a5c..ee65059eedad 100644 --- a/dev-java/xerces/xerces-2.3.0-r3.ebuild +++ b/dev-java/xerces/xerces-2.3.0-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 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-r3.ebuild,v 1.5 2007/11/15 01:12:35 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.3.0-r3.ebuild,v 1.6 2008/01/17 14:39:12 caster Exp $ -WANT_SPLIT_ANT=true JAVA_PKG_IUSE="doc examples source" + inherit java-pkg-2 java-ant-2 eutils DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family" @@ -25,28 +25,25 @@ S=${WORKDIR}/xerces-${PV//./_} src_unpack() { unpack ${A} + cd "${S}" - cd ${S} - epatch ${FILESDIR}/${P}-gentoo.patch + epatch "${FILESDIR}/${P}-gentoo.patch" - mkdir ${S}/tools && cd ${S}/tools + mkdir tools && cd tools java-pkg_jar-from xml-commons xml-apis.jar } src_compile() { - ANT_TASKS="xjavac-1" eant ${antflags} jar $(use_doc javadocs) + ANT_TASKS="xjavac-1" eant jar $(use_doc javadocs) } src_install() { java-pkg_dojar build/xercesImpl.jar - dodoc TODO STATUS README ISSUES - dohtml Readme.html + dodoc TODO STATUS README ISSUES || die + dohtml Readme.html || die - use doc && java-pkg_dojavadoc build/docs/javadocs - if use examples; then - dodir /usr/share/doc/${PF}/examples - cp -a samples/* ${D}/usr/share/doc/${PF} - fi - use source && java-pkg_dosrc ${S}/src/org + use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2 + use examples && java-pkg_doexamples samples + use source && java-pkg_dosrc "${S}/src/org" } diff --git a/dev-java/xerces/xerces-2.8.1.ebuild b/dev-java/xerces/xerces-2.8.1.ebuild deleted file mode 100644 index 087ac4a7f470..000000000000 --- a/dev-java/xerces/xerces-2.8.1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.8.1.ebuild,v 1.14 2007/05/12 18:50:00 wltjr Exp $ - -# needed for the ANT_TASKS="xjavac-1" later so we don't need to use deprecated eant -lib -# (because xjavac won't install jar in /usr/share/ant-core/lib anymore) -WANT_SPLIT_ANT=true -JAVA_PKG_IUSE="doc examples source" - -inherit eutils versionator java-pkg-2 java-ant-2 - -DIST_PN="Xerces-J" -SRC_PV="$(replace_all_version_separators _ )" -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/${PN}-j/${DIST_PN}-src.${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=virtual/jre-1.4 - =dev-java/xml-commons-external-1.3* - >=dev-java/xml-commons-resolver-1.1" -DEPEND=">=virtual/jdk-1.4 - >=dev-java/xjavac-20041208-r4 - ${RDEPEND}" - -S="${WORKDIR}/${PN}-${SRC_PV}" - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}/${P}-gentoo.patch" - epatch "${FILESDIR}/${P}-no_dom3.patch" - - mkdir tools && cd tools - java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar - java-pkg_jar-from xml-commons-resolver xml-commons-resolver.jar resolver.jar -} - -src_compile() { - # known small bug - javadocs use custom taglets, which come as bundled jar in xerces-J-tools.2.8.0.tar.gz - # ommiting them causes non-fatal errors in javadocs generation - # need to either find the taglets source, use the bundled jars as it's only compile-time or remove the taglet defs from build.xml - ANT_TASKS="xjavac-1" eant jar $(use_doc javadocs) -} - -src_install() { - java-pkg_dojar build/xercesImpl.jar - - dodoc TODO STATUS README ISSUES || die - dohtml Readme.html || die - - use doc && java-pkg_dojavadoc build/docs/javadocs - if use examples; then - dodir "/usr/share/doc/${PF}/examples" - cp -r samples/* "${D}/usr/share/doc/${PF}/examples" - fi - - use source && java-pkg_dosrc "${S}/src/org" -} diff --git a/dev-java/xerces/xerces-2.9.0.ebuild b/dev-java/xerces/xerces-2.9.0.ebuild index 25a4ddfcb268..9138ce377ca7 100644 --- a/dev-java/xerces/xerces-2.9.0.ebuild +++ b/dev-java/xerces/xerces-2.9.0.ebuild @@ -1,10 +1,7 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.9.0.ebuild,v 1.5 2007/11/25 14:47:26 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.9.0.ebuild,v 1.6 2008/01/17 14:39:12 caster Exp $ -# needed for the ANT_TASKS="xjavac-1" later so we don't need to use deprecated eant -lib -# (because xjavac won't install jar in /usr/share/ant-core/lib anymore) -WANT_SPLIT_ANT=true JAVA_PKG_IUSE="doc examples source" inherit eutils versionator java-pkg-2 java-ant-2 @@ -34,10 +31,10 @@ S="${WORKDIR}/${PN}-${SRC_PV}" src_unpack() { unpack ${A} - cd "${S}" - epatch ${FILESDIR}/${P}-gentoo.patch - epatch ${FILESDIR}/${P}-no_dom3.patch + + epatch "${FILESDIR}/${P}-gentoo.patch" + epatch "${FILESDIR}/${P}-no_dom3.patch" java-ant_rewrite-classpath } @@ -45,7 +42,7 @@ src_compile() { # known small bug - javadocs use custom taglets, which come as bundled jar in xerces-J-tools.2.8.0.tar.gz # ommiting them causes non-fatal errors in javadocs generation # need to either find the taglets source, use the bundled jars as it's only compile-time or remove the taglet defs from build.xml - ANT_TASKS="xjavac-1" eant -Dgentoo.classpath=$(java-pkg_getjars xml-commons-resolver,xml-commons-external-1.3,xalan-serializer) \ + ANT_TASKS="xjavac-1" eant -Dgentoo.classpath="$(java-pkg_getjars xml-commons-resolver,xml-commons-external-1.3,xalan-serializer)" \ jar $(use_doc javadocs) } @@ -56,6 +53,6 @@ src_install() { dohtml Readme.html || die use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2 - use examples java-pkg_doexamples samples + use examples && java-pkg_doexamples samples use source && java-pkg_dosrc "${S}/src/org" } diff --git a/dev-java/xerces/xerces-2.9.1.ebuild b/dev-java/xerces/xerces-2.9.1.ebuild index bd7750f208d3..f6f6dc645204 100644 --- a/dev-java/xerces/xerces-2.9.1.ebuild +++ b/dev-java/xerces/xerces-2.9.1.ebuild @@ -1,10 +1,7 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.9.1.ebuild,v 1.1 2007/11/18 12:12:28 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.9.1.ebuild,v 1.2 2008/01/17 14:39:12 caster Exp $ -# needed for the ANT_TASKS="xjavac-1" later so we don't need to use deprecated eant -lib -# (because xjavac won't install jar in /usr/share/ant-core/lib anymore) -WANT_SPLIT_ANT=true JAVA_PKG_IUSE="doc examples source" inherit eutils versionator java-pkg-2 java-ant-2 @@ -34,10 +31,10 @@ S="${WORKDIR}/${PN}-${SRC_PV}" src_unpack() { unpack ${A} - cd "${S}" - epatch ${FILESDIR}/${P}-gentoo.patch - epatch ${FILESDIR}/${P}-no_dom3.patch + + epatch "${FILESDIR}/${P}-gentoo.patch" + epatch "${FILESDIR}/${P}-no_dom3.patch" java-ant_rewrite-classpath } @@ -45,7 +42,7 @@ src_compile() { # known small bug - javadocs use custom taglets, which come as bundled jar in xerces-J-tools.2.8.0.tar.gz # ommiting them causes non-fatal errors in javadocs generation # need to either find the taglets source, use the bundled jars as it's only compile-time or remove the taglet defs from build.xml - ANT_TASKS="xjavac-1" eant -Dgentoo.classpath=$(java-pkg_getjars xml-commons-resolver,xml-commons-external-1.3,xalan-serializer) \ + ANT_TASKS="xjavac-1" eant -Dgentoo.classpath="$(java-pkg_getjars xml-commons-resolver,xml-commons-external-1.3,xalan-serializer)" \ jar $(use_doc javadocs) } @@ -56,6 +53,6 @@ src_install() { dohtml Readme.html || die use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2 - use examples java-pkg_doexamples samples + use examples && java-pkg_doexamples samples use source && java-pkg_dosrc "${S}/src/org" } |