summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-java/xerces/ChangeLog11
-rw-r--r--dev-java/xerces/files/digest-xerces-2.7.1-r23
-rw-r--r--dev-java/xerces/files/digest-xerces-2.9.03
-rw-r--r--dev-java/xerces/files/xerces-2.9.0-gentoo.patch (renamed from dev-java/xerces/files/xerces-2.7.1-gentoo.patch)0
-rw-r--r--dev-java/xerces/files/xerces-2.9.0-no_dom3.patch (renamed from dev-java/xerces/files/xerces-2.7.1-no_dom3.patch)0
-rw-r--r--dev-java/xerces/xerces-2.7.1-r2.ebuild58
-rw-r--r--dev-java/xerces/xerces-2.9.0.ebuild61
7 files changed, 74 insertions, 62 deletions
diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index 380cbdb5f100..97a2c2c16f5e 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,15 @@
# 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.87 2007/05/12 18:50:00 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.88 2007/05/26 19:14:27 caster Exp $
+
+*xerces-2.9.0 (26 May 2007)
+
+ 26 May 2007; Vlastimil Babka <caster@gentoo.org>
+ -files/xerces-2.7.1-gentoo.patch, -files/xerces-2.7.1-no_dom3.patch,
+ +files/xerces-2.9.0-gentoo.patch, +files/xerces-2.9.0-no_dom3.patch,
+ -xerces-2.7.1-r2.ebuild, +xerces-2.9.0.ebuild:
+ Version bump, now using serializer.jar from xalan, bug #156258; Remove
+ unused 2.7.1.
12 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
xerces-2.8.1.ebuild:
diff --git a/dev-java/xerces/files/digest-xerces-2.7.1-r2 b/dev-java/xerces/files/digest-xerces-2.7.1-r2
deleted file mode 100644
index ea327fc24a0d..000000000000
--- a/dev-java/xerces/files/digest-xerces-2.7.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 487701cad13bcf87cec21ed2d782ca45 Xerces-J-src.2.7.1.tar.gz 1688121
-RMD160 6756668eeba082df1edb215a41b28c3eac7bc7ab Xerces-J-src.2.7.1.tar.gz 1688121
-SHA256 c0fc556874508b70e31a0a202d1c3e189a0904a6c62563837cdb8b1d9202fd48 Xerces-J-src.2.7.1.tar.gz 1688121
diff --git a/dev-java/xerces/files/digest-xerces-2.9.0 b/dev-java/xerces/files/digest-xerces-2.9.0
new file mode 100644
index 000000000000..1b4666223a28
--- /dev/null
+++ b/dev-java/xerces/files/digest-xerces-2.9.0
@@ -0,0 +1,3 @@
+MD5 bd43e57ec7105acc9f13072e0208d445 Xerces-J-src.2.9.0.tar.gz 1700145
+RMD160 e27577b35d04ea0f51277f306e9395d261c7b66d Xerces-J-src.2.9.0.tar.gz 1700145
+SHA256 76147a7d5f33d7d945964a732923f387628d4e744693c7e6beb9d22e7cc2375d Xerces-J-src.2.9.0.tar.gz 1700145
diff --git a/dev-java/xerces/files/xerces-2.7.1-gentoo.patch b/dev-java/xerces/files/xerces-2.9.0-gentoo.patch
index 61445ea6fe88..61445ea6fe88 100644
--- a/dev-java/xerces/files/xerces-2.7.1-gentoo.patch
+++ b/dev-java/xerces/files/xerces-2.9.0-gentoo.patch
diff --git a/dev-java/xerces/files/xerces-2.7.1-no_dom3.patch b/dev-java/xerces/files/xerces-2.9.0-no_dom3.patch
index 8f485adcdbfd..8f485adcdbfd 100644
--- a/dev-java/xerces/files/xerces-2.7.1-no_dom3.patch
+++ b/dev-java/xerces/files/xerces-2.9.0-no_dom3.patch
diff --git a/dev-java/xerces/xerces-2.7.1-r2.ebuild b/dev-java/xerces/xerces-2.7.1-r2.ebuild
deleted file mode 100644
index 48f8d470f832..000000000000
--- a/dev-java/xerces/xerces-2.7.1-r2.ebuild
+++ /dev/null
@@ -1,58 +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.7.1-r2.ebuild,v 1.5 2007/01/09 13:24:38 beandog Exp $
-
-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-1.1"
-SLOT="2"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
-IUSE="doc examples source"
-
-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/ant-core-1.6.5-r14
- >=dev-java/xjavac-20041208
- source? ( app-arch/zip )
- ${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() {
- eant -lib "$(java-pkg_getjars --build-only xjavac-1)" jar $(use_doc javadocs)
-}
-
-src_install() {
- java-pkg_dojar build/xercesImpl.jar
-
- dodoc TODO STATUS README ISSUES
- java-pkg_dohtml Readme.html
-
- use doc && java-pkg_dohtml -r 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
new file mode 100644
index 000000000000..26a5dc9a07d4
--- /dev/null
+++ b/dev-java/xerces/xerces-2.9.0.ebuild
@@ -0,0 +1,61 @@
+# 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.9.0.ebuild,v 1.1 2007/05/26 19:14:27 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
+
+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=""
+
+# ships with external-1.3.04, need slot dep with lower limit
+COMMON_DEP="=dev-java/xml-commons-external-1.3*
+ >=dev-java/xml-commons-resolver-1.2
+ dev-java/xalan-serializer"
+RDEPEND=">=virtual/jre-1.4
+ ${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+ >=dev-java/xjavac-20041208-r4
+ ${COMMON_DEP}"
+
+S="${WORKDIR}/${PN}-${SRC_PV}"
+
+src_unpack() {
+ unpack ${A}
+
+ cd "${S}"
+ epatch ${FILESDIR}/${P}-gentoo.patch
+ epatch ${FILESDIR}/${P}-no_dom3.patch
+ java-ant_rewrite-classpath
+}
+
+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) \
+ jar $(use_doc javadocs)
+}
+
+src_install() {
+ java-pkg_dojar build/xercesImpl.jar
+
+ dodoc README NOTICE || die
+ dohtml Readme.html || die
+
+ use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2
+ use examples java-pkg_doexamples samples
+ use source && java-pkg_dosrc "${S}/src/org"
+}