Version bump (bug #113628).

(Portage version: 2.0.53_rc7)

6 files changed, 120 insertions, 2 deletions

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index 31305a1517a8..a4e08fd55d53 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/xerces
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.53 2005/11/13 21:00:37 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.54 2005/12/09 05:09:55 nichoj Exp $
+
+*xerces-2.7.1 (09 Dec 2005)
+
+  09 Dec 2005; Joshua Nichols <nichoj@gentoo.org>
+  +files/xerces-2.7.1-gentoo.patch, +files/xerces-2.7.1-no_dom3.patch,
+  +xerces-2.7.1.ebuild:
+  Version bump (bug #113628).
 
   13 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
   xerces-2.6.2-r2.ebuild:
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 09a918246957..f5983946a5e8 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,14 +1,18 @@
-MD5 1cc703cb52a3499c2fb995c43aea4439 ChangeLog 8284
+MD5 dabd32dea37c838c15371670f9d21a83 ChangeLog 8489
 MD5 b0ae8698b0ae0ee1e309b38ba1f81141 files/digest-xerces-1.3.1-r1 70
 MD5 37e61d014a2f8f79909f6d0775c1959b files/digest-xerces-2.3.0-r1 71
 MD5 202c6353e68e489ff4ca668a0999534d files/digest-xerces-2.6.2-r1 144
 MD5 b0ce49e162a5ad60941af4594c938eda files/digest-xerces-2.6.2-r2 71
+MD5 a5de2c63342fae8e8e9562d8bafc8c9b files/digest-xerces-2.7.1 71
 MD5 a00b411ba35267075fda1f96c4867caf files/xerces-1.3.1-build.xml 1680
 MD5 4f14802b02f3ee092ebcf99c004af474 files/xerces-2.3.0-gentoo.patch 2684
 MD5 70a862e66b1ea35b680b716d2c58a954 files/xerces-2.6.2-javadoc.patch 595
 MD5 bff16142ead4e66a128d6fa79233c57f files/xerces-2.6.2-r2-gentoo.patch 750
+MD5 bff16142ead4e66a128d6fa79233c57f files/xerces-2.7.1-gentoo.patch 750
+MD5 ea695396b3b0d5efcc4fbf881449545d files/xerces-2.7.1-no_dom3.patch 848
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 bf4ee3d8bac7994f0aa7acf29df24f60 xerces-1.3.1-r1.ebuild 1212
 MD5 e745e26e264a1d6366f6f83954cc5d3d xerces-2.3.0-r1.ebuild 1569
 MD5 387a64ba565c505ff5ba44484695833d xerces-2.6.2-r1.ebuild 1170
 MD5 27621a0f7f3ddd7195cd477000b09f7c xerces-2.6.2-r2.ebuild 1730
+MD5 a437647523f48c79804cb3ff010c528d xerces-2.7.1.ebuild 1749
diff --git a/dev-java/xerces/files/digest-xerces-2.7.1 b/dev-java/xerces/files/digest-xerces-2.7.1
new file mode 100644
index 000000000000..1dff3e23087a
--- /dev/null
+++ b/dev-java/xerces/files/digest-xerces-2.7.1
@@ -0,0 +1 @@
+MD5 487701cad13bcf87cec21ed2d782ca45 Xerces-J-src.2.7.1.tar.gz 1688121
diff --git a/dev-java/xerces/files/xerces-2.7.1-gentoo.patch b/dev-java/xerces/files/xerces-2.7.1-gentoo.patch
new file mode 100644
index 000000000000..61445ea6fe88
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.7.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.7.1-no_dom3.patch b/dev-java/xerces/files/xerces-2.7.1-no_dom3.patch
new file mode 100644
index 000000000000..8f485adcdbfd
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.7.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.7.1.ebuild b/dev-java/xerces/xerces-2.7.1.ebuild
new file mode 100644
index 000000000000..4e44153eb693
--- /dev/null
+++ b/dev-java/xerces/xerces-2.7.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/12/09 05:09:55 nichoj Exp $
+
+inherit java-pkg eutils
+
+MY_PN="Xerces-J"
+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/${MY_PN}-src.${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc jikes examples source"
+
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/ant-core-1.5.2
+	=dev-java/xml-commons-external-1.3*
+	>=dev-java/xml-commons-resolver-1.1
+	>=dev-java/xjavac-20041208"
+DEPEND=">=virtual/jdk-1.4
+	jikes? ( >=dev-java/jikes-1.21 )
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${PV//./_}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PF}-gentoo.patch
+	epatch ${FILESDIR}/${P}-no_dom3.patch
+
+	mkdir tools && cd tools
+	rm -f *.jar
+	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
+
+	mkdir ${S}/tools/bin
+	cd ${S}/tools/bin
+	java-pkg_jar-from xjavac-1
+}
+
+src_compile() {
+	local antflags="jars sampjar"
+	use doc && antflags="${antflags} javadocs"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "Compile failed."
+}
+
+src_install() {
+	java-pkg_dojar build/x*.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/*
+}