New version of xerces from java-migration-packages overlay

Package-Manager: portage-2.1.2_rc1-r1

6 files changed, 133 insertions, 5 deletions

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index 54b836712be1..3dce1c706dfd 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/xerces
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.66 2006/10/14 02:24:25 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.67 2006/11/04 06:54:11 wltjr Exp $
+
+*xerces-2.8.1 (04 Nov 2006)
+
+  04 Nov 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  +files/xerces-2.8.1-gentoo.patch, +files/xerces-2.8.1-no_dom3.patch,
+  +xerces-2.8.1.ebuild:
+  New version of xerces from java-migration-packages overlay
 
   14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> xerces-2.7.1-r2.ebuild:
   Stabilizing on ppc64 as part of new Java system, bug #147254.
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 817a6371413d..cd4d7d4ba6af 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -22,10 +22,19 @@ AUX xerces-2.7.1-no_dom3.patch 848 RMD160 53f5838a0c0c28d9bdf247f5e36244ca40301e
 MD5 ea695396b3b0d5efcc4fbf881449545d files/xerces-2.7.1-no_dom3.patch 848
 RMD160 53f5838a0c0c28d9bdf247f5e36244ca40301ed1 files/xerces-2.7.1-no_dom3.patch 848
 SHA256 9ce16bd4bdb033fc0b7de52c3fb5d57fed3d4d033663e5d47e2f7d9512c4966a files/xerces-2.7.1-no_dom3.patch 848
+AUX xerces-2.8.1-gentoo.patch 750 RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea SHA1 0ae6dea1303e5815afc4f0c8d85cacfbe39a5201 SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7
+MD5 bff16142ead4e66a128d6fa79233c57f files/xerces-2.8.1-gentoo.patch 750
+RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea files/xerces-2.8.1-gentoo.patch 750
+SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7 files/xerces-2.8.1-gentoo.patch 750
+AUX xerces-2.8.1-no_dom3.patch 848 RMD160 53f5838a0c0c28d9bdf247f5e36244ca40301ed1 SHA1 332d888d08b1c094d443433af4dd829497167bb6 SHA256 9ce16bd4bdb033fc0b7de52c3fb5d57fed3d4d033663e5d47e2f7d9512c4966a
+MD5 ea695396b3b0d5efcc4fbf881449545d files/xerces-2.8.1-no_dom3.patch 848
+RMD160 53f5838a0c0c28d9bdf247f5e36244ca40301ed1 files/xerces-2.8.1-no_dom3.patch 848
+SHA256 9ce16bd4bdb033fc0b7de52c3fb5d57fed3d4d033663e5d47e2f7d9512c4966a files/xerces-2.8.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.6.2.tar.gz 1612086 RMD160 e5d9a7e933403413bd8e718e1342846548f2a29e SHA1 12c3dabda1d58c0fb78d0ab5949e37a0ce515931 SHA256 7e2167b9b7faf367aedacc1c6eddacb8c54dc506edc63844b6cbc661ce0f7e52
 DIST Xerces-J-src.2.7.1.tar.gz 1688121 RMD160 6756668eeba082df1edb215a41b28c3eac7bc7ab SHA1 a89ca0ed0c121d4c79f6d5253a5f673241121900 SHA256 c0fc556874508b70e31a0a202d1c3e189a0904a6c62563837cdb8b1d9202fd48
+DIST Xerces-J-src.2.8.1.tar.gz 1691101 RMD160 fc643f8cfee9116a6dfddb7e9123e64ea79cc25b SHA1 62dde967b9fa1ec56c11b8126cb5de4c72c147bc SHA256 8423b267f597f2a042ca8224770fb7ca31ae902df0f3e4b5f04df99e1b9ced33
 DIST Xerces-J-tools.2.6.2.tar.gz 3713041
 EBUILD xerces-1.3.1-r1.ebuild 1210 RMD160 d217b12d01e1a1f17f4e58ac795fde83abd150bc SHA1 783104a92512751b60881a1eab5e450322b2d4db SHA256 c822690c68cccb366b5bd71c9fd0e344b316a0b5d9f64275d14ccec220c4cd7f
 MD5 ff17618184d0e7ea7362d317b7764f56 xerces-1.3.1-r1.ebuild 1210
@@ -59,10 +68,14 @@ EBUILD xerces-2.7.1.ebuild 1640 RMD160 6396e4a0719c92ed562f566b292c205de39f3c19
 MD5 1d7632129343e36e1e37703b544074d0 xerces-2.7.1.ebuild 1640
 RMD160 6396e4a0719c92ed562f566b292c205de39f3c19 xerces-2.7.1.ebuild 1640
 SHA256 403f4a6cef2a6e177a7a4adfa530b52f1f476f3189319d13d942620356a83b60 xerces-2.7.1.ebuild 1640
-MISC ChangeLog 10249 RMD160 d988dee5d8308dcdb6e5ac7cb2344cc5560995f3 SHA1 e6a6537c8635635819b69cf01e4bb41052ff56d2 SHA256 3880e3440cc4dd5127cf25311951edd9e4655f1c9f1a1cf22f49867759d29874
-MD5 1e20a77b41cdbadc06f88b3f8408261f ChangeLog 10249
-RMD160 d988dee5d8308dcdb6e5ac7cb2344cc5560995f3 ChangeLog 10249
-SHA256 3880e3440cc4dd5127cf25311951edd9e4655f1c9f1a1cf22f49867759d29874 ChangeLog 10249
+EBUILD xerces-2.8.1.ebuild 1930 RMD160 d8b89fd664bde3a8c7b8a5246b31ab509fef7a2d SHA1 1d6a492c23f11811abb5be37be539f1284bd0295 SHA256 a46f085e20ecb2931c81c04b1384cf7253686d673a66ba2fc2b4ed18d6ea2d3f
+MD5 57d264a133c354b5652c91b632481f0d xerces-2.8.1.ebuild 1930
+RMD160 d8b89fd664bde3a8c7b8a5246b31ab509fef7a2d xerces-2.8.1.ebuild 1930
+SHA256 a46f085e20ecb2931c81c04b1384cf7253686d673a66ba2fc2b4ed18d6ea2d3f xerces-2.8.1.ebuild 1930
+MISC ChangeLog 10491 RMD160 5cbd99528f9c65ee2fd3185016f458974d3f7d03 SHA1 f2735853285893b1b11f9419700ed20ca2884d6c SHA256 ae9fff5e226ca319505a6d0e1d2eccf4217243afd23fcb358203c0d318ed43b6
+MD5 174ff78793fb26b212b880f3f7ab5d57 ChangeLog 10491
+RMD160 5cbd99528f9c65ee2fd3185016f458974d3f7d03 ChangeLog 10491
+SHA256 ae9fff5e226ca319505a6d0e1d2eccf4217243afd23fcb358203c0d318ed43b6 ChangeLog 10491
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -91,3 +104,6 @@ SHA256 405aa354c2ad33e5069a2643eb176f6286f970bea15f4466109112c447faa377 files/di
 MD5 17e91ebc28cecbbb4ab465fe811f2295 files/digest-xerces-2.7.1-r2 259
 RMD160 6b6e7d8cf58c970f869e3bc2c08aa600f52b77ef files/digest-xerces-2.7.1-r2 259
 SHA256 405aa354c2ad33e5069a2643eb176f6286f970bea15f4466109112c447faa377 files/digest-xerces-2.7.1-r2 259
+MD5 4314ac356413293ff84decf6ae37947e files/digest-xerces-2.8.1 259
+RMD160 d3a1b41db1bc2892464bbef941e7ea458fac0cef files/digest-xerces-2.8.1 259
+SHA256 98fd7d713b06c5a3405d27b58595c40afdd17e609f7cb8b89d4d39a0646201f4 files/digest-xerces-2.8.1 259
diff --git a/dev-java/xerces/files/digest-xerces-2.8.1 b/dev-java/xerces/files/digest-xerces-2.8.1
new file mode 100644
index 000000000000..ee0ddf257ed9
--- /dev/null
+++ b/dev-java/xerces/files/digest-xerces-2.8.1
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000000..61445ea6fe88
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.8.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.8.1-no_dom3.patch b/dev-java/xerces/files/xerces-2.8.1-no_dom3.patch
new file mode 100644
index 000000000000..8f485adcdbfd
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.8.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.8.1.ebuild b/dev-java/xerces/xerces-2.8.1.ebuild
new file mode 100644
index 000000000000..d24863bb1d09
--- /dev/null
+++ b/dev-java/xerces/xerces-2.8.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 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.1 2006/11/04 06:54:11 wltjr 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-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~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-r4
+	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() {
+	# 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
+	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"
+}