Update xerces dep for upcoming 2.6 slotmove.

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

3 files changed, 12 insertions, 107 deletions

diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index da7097c4653a..d2237b318dbe 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dom4j-1.6.1-java5.patch 44163 RMD160 e0bf3dcc8409b8786301fc8d4850dec7384d59ba SHA1 670abc8ae563ff23705cd79d38383bdae51ca703 SHA256 d1f1fc6f3d91efc45c9cd6ea5d31d00ff2da840d9915238d83a5c651965435cc
 MD5 9cd18838b3294484e6d9ac81a9726995 files/dom4j-1.6.1-java5.patch 44163
 RMD160 e0bf3dcc8409b8786301fc8d4850dec7384d59ba files/dom4j-1.6.1-java5.patch 44163
@@ -16,22 +13,18 @@ EBUILD dom4j-1.5.ebuild 974 RMD160 146f70d8293ccc54965da59b587c024a14981153 SHA1
 MD5 3c9e4ccedbb9d62b79cce3801fa9be77 dom4j-1.5.ebuild 974
 RMD160 146f70d8293ccc54965da59b587c024a14981153 dom4j-1.5.ebuild 974
 SHA256 51038944a3f135927999d1990d6634253592f20d3914ffaf1667f8cb13a5896e dom4j-1.5.ebuild 974
-EBUILD dom4j-1.6.1-r1.ebuild 2124 RMD160 f49a61ad8d0035243df147309440cb7fd7818781 SHA1 939d53d2ea313009f91d3ff1929374ff8e19d25a SHA256 b241e362f4ebd9aa45b1e5c32e32e28d8ffaf970d6548695479595465db75023
-MD5 5236bc1841057eaf1109969b403fe5fe dom4j-1.6.1-r1.ebuild 2124
-RMD160 f49a61ad8d0035243df147309440cb7fd7818781 dom4j-1.6.1-r1.ebuild 2124
-SHA256 b241e362f4ebd9aa45b1e5c32e32e28d8ffaf970d6548695479595465db75023 dom4j-1.6.1-r1.ebuild 2124
-EBUILD dom4j-1.6.1-r2.ebuild 2187 RMD160 0a78c0de6320e5cd6df2816c472caf66f1d6973f SHA1 faea38832077756c8672753af8ff7735dbf25a9c SHA256 d764297123e537baf55341085f0764dd5da84a3b563cbbe1615febdfa8375321
-MD5 5b9feae10bc358cf41a97051b6a33b0f dom4j-1.6.1-r2.ebuild 2187
-RMD160 0a78c0de6320e5cd6df2816c472caf66f1d6973f dom4j-1.6.1-r2.ebuild 2187
-SHA256 d764297123e537baf55341085f0764dd5da84a3b563cbbe1615febdfa8375321 dom4j-1.6.1-r2.ebuild 2187
-EBUILD dom4j-1.6.1.ebuild 2138 RMD160 dd0e038028b880ea9b0378fbc54a970f97feb3d5 SHA1 22733f81ad4d684a910d907f6e1d7d79b63bc96f SHA256 51bf9b921381b39eab721c498dbc42ac9fd34239f613c36fa90fede4a282b420
-MD5 47f5336b2f0501e46253c5df51ce6eef dom4j-1.6.1.ebuild 2138
-RMD160 dd0e038028b880ea9b0378fbc54a970f97feb3d5 dom4j-1.6.1.ebuild 2138
-SHA256 51bf9b921381b39eab721c498dbc42ac9fd34239f613c36fa90fede4a282b420 dom4j-1.6.1.ebuild 2138
-MISC ChangeLog 3635 RMD160 a356c53394787e5bfc50ea605402ff193004be44 SHA1 37f9a016d445d3f1125384702b1b03702308db8f SHA256 1e690bcaa3dc0303433e68eec5056ab73545bc89ba771ccf26d65a1275a8977d
-MD5 48ce11fe39208aa3a4dfb65e391f2246 ChangeLog 3635
-RMD160 a356c53394787e5bfc50ea605402ff193004be44 ChangeLog 3635
-SHA256 1e690bcaa3dc0303433e68eec5056ab73545bc89ba771ccf26d65a1275a8977d ChangeLog 3635
+EBUILD dom4j-1.6.1-r2.ebuild 2189 RMD160 22b50d570743ad5dea92a41ffa43781789b23263 SHA1 b0c5aa2114e3d870303c73b4d4a6e8b7417ff375 SHA256 2bd5ee4a4a25c21312a2755c21e901a7555723bb4c878f2fe8f28977ef5b7855
+MD5 add8a080e7b2278265445dcf0094fb2f dom4j-1.6.1-r2.ebuild 2189
+RMD160 22b50d570743ad5dea92a41ffa43781789b23263 dom4j-1.6.1-r2.ebuild 2189
+SHA256 2bd5ee4a4a25c21312a2755c21e901a7555723bb4c878f2fe8f28977ef5b7855 dom4j-1.6.1-r2.ebuild 2189
+EBUILD dom4j-1.6.1.ebuild 2140 RMD160 107595bf567c58b5d26b90261e844f5d019507f7 SHA1 f71b4f7a78b8258198fc41f2797f538802845f21 SHA256 44a2159d1fabe6f58a2d40a1b1f8766420492e8d78d42a593f80d583bf8a8b11
+MD5 7af863d6a3bcbe96dcb74c872201a456 dom4j-1.6.1.ebuild 2140
+RMD160 107595bf567c58b5d26b90261e844f5d019507f7 dom4j-1.6.1.ebuild 2140
+SHA256 44a2159d1fabe6f58a2d40a1b1f8766420492e8d78d42a593f80d583bf8a8b11 dom4j-1.6.1.ebuild 2140
+MISC ChangeLog 3801 RMD160 d7a99b0b2edd11a6f2df5e25d4cd9e8e1d2d9bcf SHA1 50badf9ce9deb1188b6bd58cc247a1a13bd89c66 SHA256 92aa755bfdd441fb5d2719a13aa45802a0034dc940e0d4dcf02d93bbe1a59a67
+MD5 7482cb800577ff387a8fbc66a4f79ab5 ChangeLog 3801
+RMD160 d7a99b0b2edd11a6f2df5e25d4cd9e8e1d2d9bcf ChangeLog 3801
+SHA256 92aa755bfdd441fb5d2719a13aa45802a0034dc940e0d4dcf02d93bbe1a59a67 ChangeLog 3801
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -45,16 +38,6 @@ SHA256 6dd5cf79a85b70a0125d03177738b8fb8e5e98fb58d1100565131280e0d5dd57 files/di
 MD5 291103053d94d006784aef1a70e0646c files/digest-dom4j-1.6.1 238
 RMD160 7a662cd4dad9c553d19f19d8df9ba19e44d4a3d2 files/digest-dom4j-1.6.1 238
 SHA256 daabc0a357c3f9f0cde1148c4a509c4fc7abdac6254085dd272a5c89c2671b77 files/digest-dom4j-1.6.1 238
-MD5 291103053d94d006784aef1a70e0646c files/digest-dom4j-1.6.1-r1 238
-RMD160 7a662cd4dad9c553d19f19d8df9ba19e44d4a3d2 files/digest-dom4j-1.6.1-r1 238
-SHA256 daabc0a357c3f9f0cde1148c4a509c4fc7abdac6254085dd272a5c89c2671b77 files/digest-dom4j-1.6.1-r1 238
 MD5 291103053d94d006784aef1a70e0646c files/digest-dom4j-1.6.1-r2 238
 RMD160 7a662cd4dad9c553d19f19d8df9ba19e44d4a3d2 files/digest-dom4j-1.6.1-r2 238
 SHA256 daabc0a357c3f9f0cde1148c4a509c4fc7abdac6254085dd272a5c89c2671b77 files/digest-dom4j-1.6.1-r2 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFJSbHKRy60XGEcJIRAh9NAJ9DZtvypVtnM4Zdn+ak/g6BNrRUkACgpfzs
-3GXV3kFQEJgWaDx2ZrVnHig=
-=ki7t
------END PGP SIGNATURE-----
diff --git a/dev-java/dom4j/dom4j-1.6.1-r1.ebuild b/dev-java/dom4j/dom4j-1.6.1-r1.ebuild
deleted file mode 100644
index 267bee45e895..000000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,75 +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/dom4j/dom4j-1.6.1-r1.ebuild,v 1.1 2006/07/27 20:23:43 nelchael Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Easy to use, open source library for working with XML, XPath and XSLT on the Java platform using the Java Collections Framework and with full support for DOM, SAX and JAXP."
-HOMEPAGE="http://dom4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz"
-LICENSE="Apache-1.1"
-SLOT="1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source"
-RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.3* )
-	dev-java/jaxme
-	dev-java/jsr173
-	dev-java/msv
-	dev-java/xpp2
-	dev-java/xpp3
-	dev-java/relaxng-datatype
-	=dev-java/xerces-2*
-	dev-java/xsdlib"
-DEPEND="|| (  =virtual/jdk-1.4* =virtual/jdk-1.3* )
-	dev-java/ant-core
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/lib
-	#circular deps with jaxen
-	rm -f $(echo *.jar | sed 's/jaxen[^ ]\+//')
-	java-pkg_jar-from jaxme
-	java-pkg_jar-from jsr173
-	java-pkg_jar-from msv
-	java-pkg_jar-from xpp2
-	java-pkg_jar-from xpp3
-	java-pkg_jar-from relaxng-datatype
-	java-pkg_jar-from xsdlib
-
-	cd ${S}/lib/endorsed
-	rm -f *.jar
-	java-pkg_jar-from xerces-2 || die
-
-	rm -r ${S}/lib/test
-	# we don't really to fix any of these if we're not doing testing
-#	# TODO: replace jsr173_1.0_ri.jar
-#	java-pkg_jar-from ${JUNITPERF} || die
-
-	# We don't need the stuff in tools
-	rm -r ${S}/lib/tools
-#	cd ${S}/lib/tools
-#	# apparently we don't really need clover's jar
-#	rm clover*
-#	java-pkg_jar-from ${ISORELAX} || die
-#	# TODO: replace jaxme-0.3.jar
-#	# TODO: replace jaxme-js-0.3.jar
-#	# TODO: replace jaxme-xs-0.3.jar
-#	java-pkg_jar-from ${TIDY} || die
-#	java-pkg_jar-from ${XALAN} || die
-#	java-pkg_jar-from ${XERCES_IMPL} || die
-}
-
-src_compile() {
-	local antflags="clean package"
-	use doc && antflags="${antflags} -Dbuild.javadocs=build/doc/api javadoc"
-
-	eant ${antflags} || die "Compilation failed"
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-	use doc && java-pkg_dohtml -r build/doc/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/dom4j/files/digest-dom4j-1.6.1-r1 b/dev-java/dom4j/files/digest-dom4j-1.6.1-r1
deleted file mode 100644
index d8185ba880ea..000000000000
--- a/dev-java/dom4j/files/digest-dom4j-1.6.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1e7ef6d20939315714de4a8502f27b2d dom4j-1.6.1.tar.gz 9687211
-RMD160 d990d712a6b58c799366c526b32eb6c84a81e29c dom4j-1.6.1.tar.gz 9687211
-SHA256 01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f dom4j-1.6.1.tar.gz 9687211