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

(Portage version: 2.1.2_rc2-r3)
 (Unsigned Manifest commit)

6 files changed, 15 insertions, 161 deletions

diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index cd4d7d4ba6af..95e303f6c1fd 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -6,14 +6,14 @@ AUX xerces-2.3.0-gentoo.patch 2684 RMD160 b74e5d28ecd76f6163728314dac2904cef0073
 MD5 4f14802b02f3ee092ebcf99c004af474 files/xerces-2.3.0-gentoo.patch 2684
 RMD160 b74e5d28ecd76f6163728314dac2904cef007372 files/xerces-2.3.0-gentoo.patch 2684
 SHA256 9aa646b5a07656af7a6d32d1549152cca4d9917c9ecc68f66c811568bcea2e28 files/xerces-2.3.0-gentoo.patch 2684
+AUX xerces-2.6.2-gentoo.patch 750 RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea SHA1 0ae6dea1303e5815afc4f0c8d85cacfbe39a5201 SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7
+MD5 bff16142ead4e66a128d6fa79233c57f files/xerces-2.6.2-gentoo.patch 750
+RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea files/xerces-2.6.2-gentoo.patch 750
+SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7 files/xerces-2.6.2-gentoo.patch 750
 AUX xerces-2.6.2-javadoc.patch 595 RMD160 6f610ac325283f68d53841cfa4b41de526e8f837 SHA1 52e40ca7eb0d811800e56c0c8dfe8cdd9700b4af SHA256 0f97fa163c7393db8a81cb72926afc1d5f97f17763fc1dd1eb52d550db20d25b
 MD5 70a862e66b1ea35b680b716d2c58a954 files/xerces-2.6.2-javadoc.patch 595
 RMD160 6f610ac325283f68d53841cfa4b41de526e8f837 files/xerces-2.6.2-javadoc.patch 595
 SHA256 0f97fa163c7393db8a81cb72926afc1d5f97f17763fc1dd1eb52d550db20d25b files/xerces-2.6.2-javadoc.patch 595
-AUX xerces-2.6.2-r2-gentoo.patch 750 RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea SHA1 0ae6dea1303e5815afc4f0c8d85cacfbe39a5201 SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7
-MD5 bff16142ead4e66a128d6fa79233c57f files/xerces-2.6.2-r2-gentoo.patch 750
-RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea files/xerces-2.6.2-r2-gentoo.patch 750
-SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7 files/xerces-2.6.2-r2-gentoo.patch 750
 AUX xerces-2.7.1-gentoo.patch 750 RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea SHA1 0ae6dea1303e5815afc4f0c8d85cacfbe39a5201 SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7
 MD5 bff16142ead4e66a128d6fa79233c57f files/xerces-2.7.1-gentoo.patch 750
 RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea files/xerces-2.7.1-gentoo.patch 750
@@ -35,7 +35,6 @@ DIST Xerces-J-src.2.3.0.tar.gz 1556920 RMD160 2340aa6f27c9f0616951d8ef0c2d96e168
 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
 RMD160 d217b12d01e1a1f17f4e58ac795fde83abd150bc xerces-1.3.1-r1.ebuild 1210
@@ -52,14 +51,10 @@ EBUILD xerces-2.3.0-r2.ebuild 1489 RMD160 38ade48249242c95a75d7b849867cff8a11a1a
 MD5 b772ec0046e1f435bf482f28c9adaa68 xerces-2.3.0-r2.ebuild 1489
 RMD160 38ade48249242c95a75d7b849867cff8a11a1aa4 xerces-2.3.0-r2.ebuild 1489
 SHA256 bc29964d6d150956d44e9b95b7315616c9331987532c13e8499e86feb56fe737 xerces-2.3.0-r2.ebuild 1489
-EBUILD xerces-2.6.2-r1.ebuild 1168 RMD160 bfa7ec84c49b6fe9c5daf91f96b7627efb86de72 SHA1 b3d4ee7de2409360fbfd1f8c1b56185d2161ec57 SHA256 b714a6f6620066607c66e7dd1b4ab17ea076b88c2f1c6924a276b622aa49ba7b
-MD5 23e5f74a9239d55b392940f7742e87a6 xerces-2.6.2-r1.ebuild 1168
-RMD160 bfa7ec84c49b6fe9c5daf91f96b7627efb86de72 xerces-2.6.2-r1.ebuild 1168
-SHA256 b714a6f6620066607c66e7dd1b4ab17ea076b88c2f1c6924a276b622aa49ba7b xerces-2.6.2-r1.ebuild 1168
-EBUILD xerces-2.6.2-r2.ebuild 1727 RMD160 aaa14847d18cd68d7e5571dcb7659e71c8728810 SHA1 3a4b5393c170b6dcf64534277d72dfa6731a133c SHA256 a78fb66491c777f479b9337298b8b6ff44735a73cb936cdb7fe9617ff7633f47
-MD5 a0c141452db4d9144497bda38f987157 xerces-2.6.2-r2.ebuild 1727
-RMD160 aaa14847d18cd68d7e5571dcb7659e71c8728810 xerces-2.6.2-r2.ebuild 1727
-SHA256 a78fb66491c777f479b9337298b8b6ff44735a73cb936cdb7fe9617ff7633f47 xerces-2.6.2-r2.ebuild 1727
+EBUILD xerces-2.6.2-r3.ebuild 1769 RMD160 f6b84d591d43d2d0535c633fd2cddd6215f648a5 SHA1 9123824a45eef720671472ee71ba7e764aa298c9 SHA256 5518ca53eb67d548fa24aa31d108d4667ca0d9012012f51e1ea413b79b12d4a0
+MD5 ebdb8369844b49964c1ffbd6fc1b55f4 xerces-2.6.2-r3.ebuild 1769
+RMD160 f6b84d591d43d2d0535c633fd2cddd6215f648a5 xerces-2.6.2-r3.ebuild 1769
+SHA256 5518ca53eb67d548fa24aa31d108d4667ca0d9012012f51e1ea413b79b12d4a0 xerces-2.6.2-r3.ebuild 1769
 EBUILD xerces-2.7.1-r2.ebuild 1636 RMD160 4c087b1c1fd7ce50f41fa7cf0ddef54a26c28876 SHA1 3ff9a9904d25c5adbf81eed3edfd70fee480b8ff SHA256 abfae25e10153df87aabed71e44f1bbac8504286700238ab3848190e5698544b
 MD5 550c0f9599cf0901c7895e5f1b8da339 xerces-2.7.1-r2.ebuild 1636
 RMD160 4c087b1c1fd7ce50f41fa7cf0ddef54a26c28876 xerces-2.7.1-r2.ebuild 1636
@@ -72,10 +67,10 @@ EBUILD xerces-2.8.1.ebuild 1930 RMD160 d8b89fd664bde3a8c7b8a5246b31ab509fef7a2d
 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 ChangeLog 10807 RMD160 f56b4f96308cb141fb8d2d4eee2e0192e69309b4 SHA1 5ba1f9b9d8a677890138484799c862e552567df6 SHA256 6de622023dd725dc925ee13d2c08c4506394d78387f32ef964d0ae87e43dfa30
+MD5 0b12af09e94079980776545efdd961b3 ChangeLog 10807
+RMD160 f56b4f96308cb141fb8d2d4eee2e0192e69309b4 ChangeLog 10807
+SHA256 6de622023dd725dc925ee13d2c08c4506394d78387f32ef964d0ae87e43dfa30 ChangeLog 10807
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -92,12 +87,9 @@ SHA256 4e472a21ded1f02fc0d0724ec9e951824278d8a5c1d8816079f76a464ff05206 files/di
 MD5 5960db59d47c31deea3c4a33c31a5941 files/digest-xerces-2.3.0-r2 259
 RMD160 3537fd09130fff8b9afb70d7bdc592888195c254 files/digest-xerces-2.3.0-r2 259
 SHA256 4e472a21ded1f02fc0d0724ec9e951824278d8a5c1d8816079f76a464ff05206 files/digest-xerces-2.3.0-r2 259
-MD5 1c513bc288800ae07156e3df8e371546 files/digest-xerces-2.6.2-r1 332
-RMD160 7bf7248e8790dc50822aeb53960da736e0915274 files/digest-xerces-2.6.2-r1 332
-SHA256 d417cda1ffe024db303acf7d82e1e52cadf6560e5cce70ba4d5928e9382648f0 files/digest-xerces-2.6.2-r1 332
-MD5 b6444943de6c0f764410ff84da0284a8 files/digest-xerces-2.6.2-r2 259
-RMD160 184f4090abaf2a0e6b4399865dfa50bbd2b96b3f files/digest-xerces-2.6.2-r2 259
-SHA256 e76769e658262c8b45d4bc91feab072ff6570843ab66516cab7ca75d62431206 files/digest-xerces-2.6.2-r2 259
+MD5 b6444943de6c0f764410ff84da0284a8 files/digest-xerces-2.6.2-r3 259
+RMD160 184f4090abaf2a0e6b4399865dfa50bbd2b96b3f files/digest-xerces-2.6.2-r3 259
+SHA256 e76769e658262c8b45d4bc91feab072ff6570843ab66516cab7ca75d62431206 files/digest-xerces-2.6.2-r3 259
 MD5 17e91ebc28cecbbb4ab465fe811f2295 files/digest-xerces-2.7.1 259
 RMD160 6b6e7d8cf58c970f869e3bc2c08aa600f52b77ef files/digest-xerces-2.7.1 259
 SHA256 405aa354c2ad33e5069a2643eb176f6286f970bea15f4466109112c447faa377 files/digest-xerces-2.7.1 259
diff --git a/dev-java/xerces/files/digest-xerces-2.6.2-r1 b/dev-java/xerces/files/digest-xerces-2.6.2-r1
deleted file mode 100644
index 37518a509910..000000000000
--- a/dev-java/xerces/files/digest-xerces-2.6.2-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-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
-MD5 55ba4b71ae95acf7d50c4bc0d796ee76 Xerces-J-tools.2.6.2.tar.gz 3713041
diff --git a/dev-java/xerces/files/digest-xerces-2.6.2-r2 b/dev-java/xerces/files/digest-xerces-2.6.2-r2
deleted file mode 100644
index 28cc542a7a3e..000000000000
--- a/dev-java/xerces/files/digest-xerces-2.6.2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-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-r2-gentoo.patch b/dev-java/xerces/files/xerces-2.6.2-r2-gentoo.patch
deleted file mode 100644
index 61445ea6fe88..000000000000
--- a/dev-java/xerces/files/xerces-2.6.2-r2-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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-r1.ebuild b/dev-java/xerces/xerces-2.6.2-r1.ebuild
deleted file mode 100644
index 7d014a9c4c9c..000000000000
--- a/dev-java/xerces/xerces-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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-r1.ebuild,v 1.18 2006/10/05 17:03:13 gustavoz Exp $
-
-inherit java-pkg eutils
-
-
-S=${WORKDIR}/xerces-${PV//./_}
-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/xerces-j/Xerces-J-src.${PV}.tar.gz
-	mirror://apache/xml/xerces-j/Xerces-J-tools.${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2"
-KEYWORDS="x86 ppc amd64 ppc64"
-
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-core-1.5.2"
-RDEPEND=">=virtual/jre-1.3"
-IUSE="doc"
-
-src_unpack() {
-	unpack ${A}
-	mv tools ${S}
-}
-
-src_compile() {
-	if use doc ; then
-		sh build.sh jars sampjar javadocs || die "Compile failed."
-	else
-		sh build.sh jars sampjar || die "Compile failed."
-	fi
-}
-
-src_install() {
-	java-pkg_dojar build/x*.jar
-	dodoc TODO STATUS README ISSUES
-	dohtml Readme.html
-
-	if use doc ; then
-		dodir /usr/share/doc/${PF}
-		cp -a samples ${D}/usr/share/doc/${PF}
-		java-pkg_dohtml -r build/docs/javadocs
-	fi
-}
diff --git a/dev-java/xerces/xerces-2.6.2-r2.ebuild b/dev-java/xerces/xerces-2.6.2-r2.ebuild
deleted file mode 100644
index 4b71fb4363a4..000000000000
--- a/dev-java/xerces/xerces-2.6.2-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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-r2.ebuild,v 1.11 2006/10/05 17:03:13 gustavoz 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="mirror://apache/xml/xerces-j/Xerces-J-src.${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="doc jikes examples source"
-
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/ant-core-1.5.2
-	>=dev-java/xml-commons-1.0_beta2
-	>=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}/xerces-${PV//./_}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PF}-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/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/*
-}