Update xerces dep for upcoming 2.6 slotmove.

Package-Manager: portage-2.1.2_rc2-r3

3 files changed, 8 insertions, 104 deletions

diff --git a/dev-java/commons-jelly/Manifest b/dev-java/commons-jelly/Manifest
index 91ddbab3a0b3..c4011ccf6af0 100644
--- a/dev-java/commons-jelly/Manifest
+++ b/dev-java/commons-jelly/Manifest
@@ -1,37 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX commons-jelly-1.0-gentoo.patch 2224 RMD160 ab9179ac39196b1dbe6fc8f9bffdc498ad363697 SHA1 9509b52e2841561c7ee50ff2bc96884764a4d55b SHA256 0e064c87ae4a2a91f7c98c546e0f3bf9f9ff4caf877e0c2f28a6b3443e6f3533
 MD5 54a1c7c1840da66a583e5ec54ddb94c1 files/commons-jelly-1.0-gentoo.patch 2224
 RMD160 ab9179ac39196b1dbe6fc8f9bffdc498ad363697 files/commons-jelly-1.0-gentoo.patch 2224
 SHA256 0e064c87ae4a2a91f7c98c546e0f3bf9f9ff4caf877e0c2f28a6b3443e6f3533 files/commons-jelly-1.0-gentoo.patch 2224
 DIST commons-jelly-1.0-src.tar.gz 174769 RMD160 c273e80fb10327a833d192e89500a08302d68c58 SHA1 a0aedfa7ce69288277cc3c06b1d832a7a97affe5 SHA256 113d606361845d08dab69f187690bf5dcfb5e9ca8fab780135898eb6d0a8d7d1
-EBUILD commons-jelly-1.0-r1.ebuild 1898 RMD160 43ee480517abbcae4bdc1da60a065c8b8366e662 SHA1 6558aa8ebe3e2ca5c511469b6dee2320eacdc58d SHA256 3dbf881a75758003559babde9060ab582937b91be67709acd7a1ab523027d861
-MD5 b63a09b1927b5d236335860853a4446d commons-jelly-1.0-r1.ebuild 1898
-RMD160 43ee480517abbcae4bdc1da60a065c8b8366e662 commons-jelly-1.0-r1.ebuild 1898
-SHA256 3dbf881a75758003559babde9060ab582937b91be67709acd7a1ab523027d861 commons-jelly-1.0-r1.ebuild 1898
-EBUILD commons-jelly-1.0.ebuild 1912 RMD160 fb49e4b0ddfd39a1b294740aa53df8f6235375d3 SHA1 c51e2c5b16b40014ac76474d5862566e2092a5f6 SHA256 0b4f435990a4042921b0bed0c5e53bd14fe2fd19a862e0421999e2fb2887411c
-MD5 25f1e32b94f4ec1da6e6a66f55a4dc55 commons-jelly-1.0.ebuild 1912
-RMD160 fb49e4b0ddfd39a1b294740aa53df8f6235375d3 commons-jelly-1.0.ebuild 1912
-SHA256 0b4f435990a4042921b0bed0c5e53bd14fe2fd19a862e0421999e2fb2887411c commons-jelly-1.0.ebuild 1912
-MISC ChangeLog 684 RMD160 5bc507e4e478b839cca6e641979c9922c7053ffd SHA1 7c5012f0579bcd4fd4190e840ed904a050852860 SHA256 6b421ba4a2f6a2532ef9e30a91224f98f4206bc502c62c5f43817093cf0aca59
-MD5 5301aa68933584fb410d7bd079d55d13 ChangeLog 684
-RMD160 5bc507e4e478b839cca6e641979c9922c7053ffd ChangeLog 684
-SHA256 6b421ba4a2f6a2532ef9e30a91224f98f4206bc502c62c5f43817093cf0aca59 ChangeLog 684
+EBUILD commons-jelly-1.0-r1.ebuild 1898 RMD160 f692169d675ffb1be0dbb35ce5db62638c277afe SHA1 857cc351ce5b568e5f6039db9a76f6df6c681b63 SHA256 0586c7ef99e7210861e23ef0c69c9facb3926f61f89837f45c5e7fdd183e1c66
+MD5 64a0edee5788d4145655c8e0c49a63d5 commons-jelly-1.0-r1.ebuild 1898
+RMD160 f692169d675ffb1be0dbb35ce5db62638c277afe commons-jelly-1.0-r1.ebuild 1898
+SHA256 0586c7ef99e7210861e23ef0c69c9facb3926f61f89837f45c5e7fdd183e1c66 commons-jelly-1.0-r1.ebuild 1898
+MISC ChangeLog 839 RMD160 6c55b312c2bd38e6f68bd4706cde0eec7d6fc112 SHA1 acdd17e857c1042d2ce775641dd368385f1f9aea SHA256 bd5d1faeabdbc743a642dcaa232a376e3202eeea5d0ff4f7cdc7dc5eb9e8f489
+MD5 13cb44dd2d28f933b99c6a750b0f7d1b ChangeLog 839
+RMD160 6c55b312c2bd38e6f68bd4706cde0eec7d6fc112 ChangeLog 839
+SHA256 bd5d1faeabdbc743a642dcaa232a376e3202eeea5d0ff4f7cdc7dc5eb9e8f489 ChangeLog 839
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 3744be2052ab79799a9e41563ba89d34 files/digest-commons-jelly-1.0 265
-RMD160 038eb778e7c03b78590531801634d23690eaa86d files/digest-commons-jelly-1.0 265
-SHA256 f60bf1dba04b835d8f1c15d2a3ca7034489e1364e604ee8f0df384485808529c files/digest-commons-jelly-1.0 265
 MD5 3744be2052ab79799a9e41563ba89d34 files/digest-commons-jelly-1.0-r1 265
 RMD160 038eb778e7c03b78590531801634d23690eaa86d files/digest-commons-jelly-1.0-r1 265
 SHA256 f60bf1dba04b835d8f1c15d2a3ca7034489e1364e604ee8f0df384485808529c files/digest-commons-jelly-1.0-r1 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEwqzMgo/w9rxVVVERAjWWAJsFcq4oCJ8Oj7Vg0ExRhErM6NGfuACcDVWq
-TeX5SdeAPdExuph+se06WPY=
-=xBW6
------END PGP SIGNATURE-----
diff --git a/dev-java/commons-jelly/commons-jelly-1.0.ebuild b/dev-java/commons-jelly/commons-jelly-1.0.ebuild
deleted file mode 100644
index f1830c19ced8..000000000000
--- a/dev-java/commons-jelly/commons-jelly-1.0.ebuild
+++ /dev/null
@@ -1,76 +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/commons-jelly/commons-jelly-1.0.ebuild,v 1.3 2006/06/07 18:49:09 nichoj Exp $
-
-inherit java-pkg eutils
-
-MY_P="${P}-src"
-DESCRIPTION="A Java and XML based scripting and processing engine"
-HOMEPAGE="http://jakarta.apache.org/commons/jelly/"
-SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~x86"
-IUSE="doc jikes test source"
-
-RDEPEND=">=virtual/jre-1.4
-	~dev-java/servletapi-2.3
-	=dev-java/commons-cli-1*
-	dev-java/commons-lang
-	dev-java/commons-discovery
-	dev-java/forehead
-	dev-java/jakarta-jstl
-	=dev-java/commons-jexl-1.0*
-	=dev-java/commons-beanutils-1.6*
-	dev-java/commons-collections
-	=dev-java/dom4j-1*
-	=dev-java/jaxen-1.1*
-	=dev-java/xerces-2*"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	test? (
-		dev-java/junit
-		dev-java/ant-tasks
-		dev-java/commons-logging
-	)
-	${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# disables dependency fetching, and remove tests as a dependency of jar
-	epatch ${FILESDIR}/${P}-gentoo.patch
-
-	mkdir -p ${S}/lib
-	cd ${S}/lib
-	java-pkg_jar-from servletapi-2.3,commons-cli-1,commons-lang
-	java-pkg_jar-from commons-discovery,forehead,jakarta-jstl,commons-jexl-1.0
-	java-pkg_jar-from commons-beanutils-1.6,commons-collections
-	java-pkg_jar-from dom4j-1,jaxen-1.1,xerces-2
-
-	if use test; then
-		java-pkg_jar-from commons-logging
-	fi
-}
-
-src_compile() {
-	local antflags="-Dlibdir=lib jar"
-	use doc && antflags="${antflags} javadoc"
-	use test && antflags="${antflags} test"
-
-	ant ${antflags} || die "Ant failed"
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt
-
-	use doc && java-pkg_dohtml -r dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-jelly/files/digest-commons-jelly-1.0 b/dev-java/commons-jelly/files/digest-commons-jelly-1.0
deleted file mode 100644
index c5964f16afb6..000000000000
--- a/dev-java/commons-jelly/files/digest-commons-jelly-1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d8c62cf844ca7ad8b6f34366eb2233c1 commons-jelly-1.0-src.tar.gz 174769
-RMD160 c273e80fb10327a833d192e89500a08302d68c58 commons-jelly-1.0-src.tar.gz 174769
-SHA256 113d606361845d08dab69f187690bf5dcfb5e9ca8fab780135898eb6d0a8d7d1 commons-jelly-1.0-src.tar.gz 174769