Revision bump to fix bug #82561 and #131141 for everyone. Dependencies and ebuild style cleanup.

(Portage version: 2.1.2_pre1)
 (Unsigned Manifest commit)

4 files changed, 11 insertions, 100 deletions

diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 425c5889c807..99eae4ede5d3 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -22,10 +22,6 @@ 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.7.1-r1-gentoo.patch 750 RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea SHA1 0ae6dea1303e5815afc4f0c8d85cacfbe39a5201 SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7
-MD5 bff16142ead4e66a128d6fa79233c57f files/xerces-2.7.1-r1-gentoo.patch 750
-RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea files/xerces-2.7.1-r1-gentoo.patch 750
-SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7 files/xerces-2.7.1-r1-gentoo.patch 750
 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
@@ -55,18 +51,18 @@ EBUILD xerces-2.6.2-r2.ebuild 1730 RMD160 10dba1428800f1eba7f70f1db0511fa208df0b
 MD5 16be7f5c1e1b9c35446fcab49aecdc9f xerces-2.6.2-r2.ebuild 1730
 RMD160 10dba1428800f1eba7f70f1db0511fa208df0bce xerces-2.6.2-r2.ebuild 1730
 SHA256 5134a97095ee7e26455038a39d8b8068acb13561f02c0b47c0aea545fdbb3044 xerces-2.6.2-r2.ebuild 1730
-EBUILD xerces-2.7.1-r1.ebuild 1593 RMD160 469ed0ec6fb2e636c79e23e758e0da73d66d5f71 SHA1 b9bd3576b08f307a9ab5c753c76a8d7af08b843e SHA256 f126e526aac4661e14b4ff5be753a48d9eadf3ef33c51098837cf8cf7400a61a
-MD5 2946f58998f851d415474ec492c6e28f xerces-2.7.1-r1.ebuild 1593
-RMD160 469ed0ec6fb2e636c79e23e758e0da73d66d5f71 xerces-2.7.1-r1.ebuild 1593
-SHA256 f126e526aac4661e14b4ff5be753a48d9eadf3ef33c51098837cf8cf7400a61a xerces-2.7.1-r1.ebuild 1593
+EBUILD xerces-2.7.1-r2.ebuild 1637 RMD160 57720d5ad2c047504e353060da4ecdfa1eeb1070 SHA1 9ae82fa409de0c712de71e8821568c49122e20ea SHA256 118b5963777eef88e5698a9e0bec95b9c99c48c302f73ca2dc44773760a8e1af
+MD5 62fe716b71d902770f2b575fe5e32763 xerces-2.7.1-r2.ebuild 1637
+RMD160 57720d5ad2c047504e353060da4ecdfa1eeb1070 xerces-2.7.1-r2.ebuild 1637
+SHA256 118b5963777eef88e5698a9e0bec95b9c99c48c302f73ca2dc44773760a8e1af xerces-2.7.1-r2.ebuild 1637
 EBUILD xerces-2.7.1.ebuild 1740 RMD160 71c3656c22a34c115da3be9fa7daaacf971562f7 SHA1 b63322a795279cc8e95121ba1befe67223850991 SHA256 4bee7d744176a749c469f06551002b7cde889bf9480f37f8752511a5b519ad98
 MD5 478242301eb1d0fa8421f8545e2b7b96 xerces-2.7.1.ebuild 1740
 RMD160 71c3656c22a34c115da3be9fa7daaacf971562f7 xerces-2.7.1.ebuild 1740
 SHA256 4bee7d744176a749c469f06551002b7cde889bf9480f37f8752511a5b519ad98 xerces-2.7.1.ebuild 1740
-MISC ChangeLog 9478 RMD160 bc57be9dfc89ba7ab7d961249a844fbd011a67a8 SHA1 991e559e84e1838e51002e8a9734a9dad56238a9 SHA256 0721ff066c7930ea1d23185fe060aba7d246fae274e3fb2889de40222c028304
-MD5 5b3b4d3d4f891784c0b6e9f42fcb6496 ChangeLog 9478
-RMD160 bc57be9dfc89ba7ab7d961249a844fbd011a67a8 ChangeLog 9478
-SHA256 0721ff066c7930ea1d23185fe060aba7d246fae274e3fb2889de40222c028304 ChangeLog 9478
+MISC ChangeLog 9754 RMD160 9854bcf3817c3768e3ac975aeda9c9df73a9cfbb SHA1 84f8b1197c181538f14ebda6da688641fe7c5cb3 SHA256 494ff5ce0c2a3d5e08eb9c554afd4834b2200532921ec054dece84c1a9a34cfd
+MD5 20c0738912acc9525e15dc7cc73ae19a ChangeLog 9754
+RMD160 9854bcf3817c3768e3ac975aeda9c9df73a9cfbb ChangeLog 9754
+SHA256 494ff5ce0c2a3d5e08eb9c554afd4834b2200532921ec054dece84c1a9a34cfd ChangeLog 9754
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -92,6 +88,6 @@ SHA256 e76769e658262c8b45d4bc91feab072ff6570843ab66516cab7ca75d62431206 files/di
 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
-MD5 17e91ebc28cecbbb4ab465fe811f2295 files/digest-xerces-2.7.1-r1 259
-RMD160 6b6e7d8cf58c970f869e3bc2c08aa600f52b77ef files/digest-xerces-2.7.1-r1 259
-SHA256 405aa354c2ad33e5069a2643eb176f6286f970bea15f4466109112c447faa377 files/digest-xerces-2.7.1-r1 259
+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
diff --git a/dev-java/xerces/files/digest-xerces-2.7.1-r1 b/dev-java/xerces/files/digest-xerces-2.7.1-r1
deleted file mode 100644
index ea327fc24a0d..000000000000
--- a/dev-java/xerces/files/digest-xerces-2.7.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 487701cad13bcf87cec21ed2d782ca45 Xerces-J-src.2.7.1.tar.gz 1688121
-RMD160 6756668eeba082df1edb215a41b28c3eac7bc7ab Xerces-J-src.2.7.1.tar.gz 1688121
-SHA256 c0fc556874508b70e31a0a202d1c3e189a0904a6c62563837cdb8b1d9202fd48 Xerces-J-src.2.7.1.tar.gz 1688121
diff --git a/dev-java/xerces/files/xerces-2.7.1-r1-gentoo.patch b/dev-java/xerces/files/xerces-2.7.1-r1-gentoo.patch
deleted file mode 100644
index 61445ea6fe88..000000000000
--- a/dev-java/xerces/files/xerces-2.7.1-r1-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.7.1-r1.ebuild b/dev-java/xerces/xerces-2.7.1-r1.ebuild
deleted file mode 100644
index 23390046536d..000000000000
--- a/dev-java/xerces/xerces-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,61 +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.7.1-r1.ebuild,v 1.3 2006/09/13 06:38:15 nichoj Exp $
-
-inherit java-pkg-2 java-ant-2 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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc 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
-	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() {
-	eant jar $(use_doc javadocs)
-}
-
-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/*
-}