Revbump for slotmove to 2.6. Also fixes bugs #82561 and #131141 for this slot.

Package-Manager: portage-2.1.2_rc2-r3

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index 3dce1c706dfd273d55261c40a5ca3c0a520d8a8d..4939ec03bab49bf6f3443ab4876550d3d709291d 100644 (file)
--- 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.67 2006/11/04 06:54:11 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.68 2006/11/30 22:26:58 caster Exp $
+
+*xerces-2.6.2-r3 (30 Nov 2006)
+
+  30 Nov 2006; Vlastimil Babka <caster@gentoo.org>
+  +files/xerces-2.6.2-gentoo.patch, -files/xerces-2.6.2-r2-gentoo.patch,
+  -xerces-2.6.2-r1.ebuild, -xerces-2.6.2-r2.ebuild, +xerces-2.6.2-r3.ebuild:
+  Revbump for slotmove to 2.6. Also fixes bugs #82561 and #131141 for this slot.
 
 *xerces-2.8.1 (04 Nov 2006)
 

diff --git a/dev-java/xerces/files/digest-xerces-2.6.2-r3 b/dev-java/xerces/files/digest-xerces-2.6.2-r3
new file mode 100644 (file)
index 0000000..28cc542
--- /dev/null
+++ b/dev-java/xerces/files/digest-xerces-2.6.2-r3
@@ -0,0 +1,3 @@
+MD5 cfd536b8d72f8ebe3465ae35f5e3775d Xerces-J-src.2.6.2.tar.gz 1612086
+RMD160 e5d9a7e933403413bd8e718e1342846548f2a29e Xerces-J-src.2.6.2.tar.gz 1612086
+SHA256 7e2167b9b7faf367aedacc1c6eddacb8c54dc506edc63844b6cbc661ce0f7e52 Xerces-J-src.2.6.2.tar.gz 1612086

diff --git a/dev-java/xerces/files/xerces-2.6.2-gentoo.patch b/dev-java/xerces/files/xerces-2.6.2-gentoo.patch
new file mode 100644 (file)
index 0000000..61445ea
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.6.2-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/xerces-2.6.2-r3.ebuild b/dev-java/xerces/xerces-2.6.2-r3.ebuild
new file mode 100644 (file)
index 0000000..c8a4b97
--- /dev/null
+++ b/dev-java/xerces/xerces-2.6.2-r3.ebuild
@@ -0,0 +1,65 @@
+# 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.6.2-r3.ebuild,v 1.1 2006/11/30 22:26:58 caster Exp $
+
+inherit java-pkg eutils
+
+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="http://archive.apache.org/dist/xml/xerces-j/Xerces-J-src.${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.6"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="doc jikes examples source"
+
+CDEPEND=">=dev-java/xml-commons-1.0_beta2
+       >=dev-java/xml-commons-resolver-1.1
+       >=dev-java/xjavac-20041208"
+RDEPEND=">=virtual/jre-1.4
+       ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.4
+       >=dev-java/ant-core-1.5.2
+       jikes? ( >=dev-java/jikes-1.21 )
+       source? ( app-arch/zip )
+       ${CDEPEND}"
+
+S=${WORKDIR}/xerces-${PV//./_}
+
+src_unpack() {
+       unpack ${A}
+
+       cd ${S}
+       epatch ${FILESDIR}/${P}-gentoo.patch
+       epatch ${FILESDIR}/${P}-javadoc.patch
+
+       mkdir tools && cd tools
+       rm -f *.jar
+       java-pkg_jar-from xml-commons 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/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/*
+}