Version bump.

Package-Manager: portage-2.1.3.19

6 files changed, 133 insertions, 15 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/Manifest b/dev-java/xerces/Manifest
index 4a9bf2a9eb54..31f6c8c63f50 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xerces-1.3.1-build.xml 1680 RMD160 6249a86790607a2ad86f30f5d2ab56135d64b5df SHA1 ece88a158dce9c0d3ae5402c6eb3cb85dc0e20c0 SHA256 1b4fbf0fc170e94edd8cae86df89f5945192e0733a833c954b9681c9eada5f2d
 MD5 a00b411ba35267075fda1f96c4867caf files/xerces-1.3.1-build.xml 1680
 RMD160 6249a86790607a2ad86f30f5d2ab56135d64b5df files/xerces-1.3.1-build.xml 1680
@@ -25,10 +22,19 @@ AUX xerces-2.9.0-no_dom3.patch 848 RMD160 53f5838a0c0c28d9bdf247f5e36244ca40301e
 MD5 ea695396b3b0d5efcc4fbf881449545d files/xerces-2.9.0-no_dom3.patch 848
 RMD160 53f5838a0c0c28d9bdf247f5e36244ca40301ed1 files/xerces-2.9.0-no_dom3.patch 848
 SHA256 9ce16bd4bdb033fc0b7de52c3fb5d57fed3d4d033663e5d47e2f7d9512c4966a files/xerces-2.9.0-no_dom3.patch 848
+AUX xerces-2.9.1-gentoo.patch 750 RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea SHA1 0ae6dea1303e5815afc4f0c8d85cacfbe39a5201 SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7
+MD5 bff16142ead4e66a128d6fa79233c57f files/xerces-2.9.1-gentoo.patch 750
+RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea files/xerces-2.9.1-gentoo.patch 750
+SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7 files/xerces-2.9.1-gentoo.patch 750
+AUX xerces-2.9.1-no_dom3.patch 848 RMD160 53f5838a0c0c28d9bdf247f5e36244ca40301ed1 SHA1 332d888d08b1c094d443433af4dd829497167bb6 SHA256 9ce16bd4bdb033fc0b7de52c3fb5d57fed3d4d033663e5d47e2f7d9512c4966a
+MD5 ea695396b3b0d5efcc4fbf881449545d files/xerces-2.9.1-no_dom3.patch 848
+RMD160 53f5838a0c0c28d9bdf247f5e36244ca40301ed1 files/xerces-2.9.1-no_dom3.patch 848
+SHA256 9ce16bd4bdb033fc0b7de52c3fb5d57fed3d4d033663e5d47e2f7d9512c4966a files/xerces-2.9.1-no_dom3.patch 848
 DIST Xerces-J-src.1.3.1.tar.gz 900263 RMD160 31512c5331f00599ae117c4f5e61767844e556fc SHA1 3a856e2b5ca45cf1fff32aaace6749030bb1e6b0 SHA256 d59f57ef4ec540f75b4b79aeef20e85ccb4f2c3b516dc995f1fc88f526f5f1e1
 DIST Xerces-J-src.2.3.0.tar.gz 1556920 RMD160 2340aa6f27c9f0616951d8ef0c2d96e168a359b7 SHA1 31bee93598ce12ae2f47a89062a18aa8cd919666 SHA256 a3b9a6939c0959ea29fe2df13dbb9dcdf679ae1125d2f8488bd4bd6fff6737fe
 DIST Xerces-J-src.2.8.1.tar.gz 1691101 RMD160 fc643f8cfee9116a6dfddb7e9123e64ea79cc25b SHA1 62dde967b9fa1ec56c11b8126cb5de4c72c147bc SHA256 8423b267f597f2a042ca8224770fb7ca31ae902df0f3e4b5f04df99e1b9ced33
 DIST Xerces-J-src.2.9.0.tar.gz 1700145 RMD160 e27577b35d04ea0f51277f306e9395d261c7b66d SHA1 0dddc1a59dfb75cc2264258df25cf6c23ae57f97 SHA256 76147a7d5f33d7d945964a732923f387628d4e744693c7e6beb9d22e7cc2375d
+DIST Xerces-J-src.2.9.1.tar.gz 1711507 RMD160 20bc600ce07fdcf82483e1992dada5ba40c80ff8 SHA1 78786a120c10b3d7079384cecbd2860260e47445 SHA256 13af0062a72a4a0d541ca5336391eafa4d580258cacf4a5e062ea584ca950592
 EBUILD xerces-1.3.1-r2.ebuild 1132 RMD160 7015930f3b7b746798bf0981c3b8fd151a142be3 SHA1 3d84147fa91f6ee9d0e883a6a0e4a2ae9733dd47 SHA256 1f1f617c246bad6de8a9d5d36becd551710319a040d69059e1ef651d219d48ae
 MD5 324359324746ae56c4251a4c6ebd32c0 xerces-1.3.1-r2.ebuild 1132
 RMD160 7015930f3b7b746798bf0981c3b8fd151a142be3 xerces-1.3.1-r2.ebuild 1132
@@ -45,10 +51,14 @@ EBUILD xerces-2.9.0.ebuild 2080 RMD160 efe12f3a0207343794def76dc27254d6dbc2647c
 MD5 37a0d2089af080393fe3898b8d96e9ab xerces-2.9.0.ebuild 2080
 RMD160 efe12f3a0207343794def76dc27254d6dbc2647c xerces-2.9.0.ebuild 2080
 SHA256 b37cf3afd3b87c2006ce353992f78f1ade4f98c10433bc680192c00ad2250ea4 xerces-2.9.0.ebuild 2080
-MISC ChangeLog 14926 RMD160 5dd3d6bf072569249ec9ad1db934a2d13cf0ebdb SHA1 bc4074fb8a83a3018461cc4b60db4d6ec0d4fafb SHA256 5f951cabc0d643783a042c411ad7c05d7648bcce169dec958ac9c348d8478fcd
-MD5 ade6fa50606357dce5b5b7eb1527857b ChangeLog 14926
-RMD160 5dd3d6bf072569249ec9ad1db934a2d13cf0ebdb ChangeLog 14926
-SHA256 5f951cabc0d643783a042c411ad7c05d7648bcce169dec958ac9c348d8478fcd ChangeLog 14926
+EBUILD xerces-2.9.1.ebuild 2076 RMD160 da7e00796d9109daf52dbf7ac2c62c8288bedb8c SHA1 3b88258ffd5611f7824015c0a3259c24fc52c13c SHA256 ddccbf05e6a56034724f9501ace962cab25ce61bf9af871872bcfdcb660dd7e4
+MD5 4e29ab80f041b7d5d37bdbafd4c46d7a xerces-2.9.1.ebuild 2076
+RMD160 da7e00796d9109daf52dbf7ac2c62c8288bedb8c xerces-2.9.1.ebuild 2076
+SHA256 ddccbf05e6a56034724f9501ace962cab25ce61bf9af871872bcfdcb660dd7e4 xerces-2.9.1.ebuild 2076
+MISC ChangeLog 15114 RMD160 98c8e80854e8e7ed54ddfe783cad48bac0a1f2db SHA1 5d93b938a1567b8f482b3610db9c3f4ce827d55f SHA256 451618c3cbf989f776ad5214df3af6626c74cc211964ac692f07f4f9d6ee37f0
+MD5 e1212734cff049dba2558a620b62e8ee ChangeLog 15114
+RMD160 98c8e80854e8e7ed54ddfe783cad48bac0a1f2db ChangeLog 15114
+SHA256 451618c3cbf989f776ad5214df3af6626c74cc211964ac692f07f4f9d6ee37f0 ChangeLog 15114
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -65,10 +75,6 @@ SHA256 98fd7d713b06c5a3405d27b58595c40afdd17e609f7cb8b89d4d39a0646201f4 files/di
 MD5 7a9e2d0982eebb21987198983643cc6b files/digest-xerces-2.9.0 259
 RMD160 bb5aba108e550f1e0589ed5a1d3d1c67b2cc0c21 files/digest-xerces-2.9.0 259
 SHA256 aa1fd6c8a9f5c199ad36ec347fc10294ef0590f78167958968ee07bafdf304a8 files/digest-xerces-2.9.0 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHO51GcxLzpIGCsLQRAtB8AJ9LRhoGlmphuDRKyLO1W7fF9M1FCgCfbJlz
-ZOiFqsa6mxwBYr7sjMSs7Po=
-=CIhd
------END PGP SIGNATURE-----
+MD5 fc6a7066592f9580a74f67928f90426a files/digest-xerces-2.9.1 259
+RMD160 7d028566fb39db424e83f216074346648ca2e1e0 files/digest-xerces-2.9.1 259
+SHA256 848fddb2613e66d5a65db55347ca716c1d64a27b45fcbdeb3d4daf931d3c9395 files/digest-xerces-2.9.1 259
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"
+}