Version bump.

(Portage version: 2.1.3.19)

5 files changed, 113 insertions, 1 deletions

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index 982b7cdeb35c..db9e6a6742b9 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,13 @@
 # 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.97 2007/11/15 01:13:51 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.98 2007/11/18 12:12:28 caster Exp $
+
+*xerces-2.9.1 (18 Nov 2007)
+
+  18 Nov 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/xerces-2.9.1-gentoo.patch, +files/xerces-2.9.1-no_dom3.patch,
+  +xerces-2.9.1.ebuild:
+  Version bump.
 
   15 Nov 2007; Petteri Räty <betelgeuse@gentoo.org>
   -xerces-2.3.0-r1.ebuild:
diff --git a/dev-java/xerces/files/digest-xerces-2.9.1 b/dev-java/xerces/files/digest-xerces-2.9.1
new file mode 100644
index 000000000000..6961beb87ac7
--- /dev/null
+++ b/dev-java/xerces/files/digest-xerces-2.9.1
@@ -0,0 +1,3 @@
+MD5 e340cba4a2abf4f0f833488380821153 Xerces-J-src.2.9.1.tar.gz 1711507
+RMD160 20bc600ce07fdcf82483e1992dada5ba40c80ff8 Xerces-J-src.2.9.1.tar.gz 1711507
+SHA256 13af0062a72a4a0d541ca5336391eafa4d580258cacf4a5e062ea584ca950592 Xerces-J-src.2.9.1.tar.gz 1711507
diff --git a/dev-java/xerces/files/xerces-2.9.1-gentoo.patch b/dev-java/xerces/files/xerces-2.9.1-gentoo.patch
new file mode 100644
index 000000000000..61445ea6fe88
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.9.1-gentoo.patch
@@ -0,0 +1,21 @@
+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.9.1-no_dom3.patch b/dev-java/xerces/files/xerces-2.9.1-no_dom3.patch
new file mode 100644
index 000000000000..8f485adcdbfd
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.9.1-no_dom3.patch
@@ -0,0 +1,20 @@
+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-2.9.1.ebuild b/dev-java/xerces/xerces-2.9.1.ebuild
new file mode 100644
index 000000000000..bd7750f208d3
--- /dev/null
+++ b/dev-java/xerces/xerces-2.9.1.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.1.ebuild,v 1.1 2007/11/18 12:12:28 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/${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"
+}