Added xml-commons-external-1.3 into CLASSPATH in ant's startup script to fix bug #82561. Also fixes javadoc path wrt bug #112106.

(Portage version: 2.1.1)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 97 deletions

diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index a7ea9dcdd1e7..e5c0586caf51 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.6.2-ant 5058 RMD160 fb75e9bf3c4a095297be865e0cd87620feab8643 SHA1 fb423fa1d5c4776950bd4b640b58fc7fc1f73ecf SHA256 ea8b41190c6a5b89b7a111a9fc901ad6fa294d3696cfcb9ba58a0f969a305071
 MD5 816ea8a6a51471da4c8df2f59434fc9d files/1.6.2-ant 5058
 RMD160 fb75e9bf3c4a095297be865e0cd87620feab8643 files/1.6.2-ant 5058
@@ -9,10 +6,10 @@ AUX 1.6.2-scp.patch 877 RMD160 ec85134b9c10d603e893ebae068197761efc1b4b SHA1 777
 MD5 8c69a473b88559829069ac80730f2f1b files/1.6.2-scp.patch 877
 RMD160 ec85134b9c10d603e893ebae068197761efc1b4b files/1.6.2-scp.patch 877
 SHA256 a11a69f16a3d3e469ed9bdb87282c1e11fef103b19bf108e82ec98434d70950a files/1.6.2-scp.patch 877
-AUX 1.6.5-ant 5185 RMD160 0f6e68cb5159624db13ca0edf0545deca2bdb152 SHA1 877427c89d2d2f1263d3b1a1ae40f20d749ab1a7 SHA256 87d34bd582a76a8d0d2e3171e41d593f72288f349e396ebc2447236e5d6c8e63
-MD5 d2d1356c605e511a1d24cfd3e1478dd8 files/1.6.5-ant 5185
-RMD160 0f6e68cb5159624db13ca0edf0545deca2bdb152 files/1.6.5-ant 5185
-SHA256 87d34bd582a76a8d0d2e3171e41d593f72288f349e396ebc2447236e5d6c8e63 files/1.6.5-ant 5185
+AUX 1.6.5-ant 5207 RMD160 95b043c0f0cab82b8a3b18625214b42945b7c69c SHA1 ad745a52964270c1713a0ae9cc1a5c5f91e61e05 SHA256 47f223399a08e199e219a4da2e42c43d37138f5ef1024b6f238ab6c8de007be5
+MD5 123ab261c3aebaf247db2551a0a890b0 files/1.6.5-ant 5207
+RMD160 95b043c0f0cab82b8a3b18625214b42945b7c69c files/1.6.5-ant 5207
+SHA256 47f223399a08e199e219a4da2e42c43d37138f5ef1024b6f238ab6c8de007be5 files/1.6.5-ant 5207
 AUX build.sh-exit-fix.patch 345 RMD160 4c4cfdfb1b13b9cc55f279a5765afda6da9f6f4d SHA1 3bc6dfe6c9cfe7a55023e95dbfab169493f3555c SHA256 bafac89599d2d5bbb8f17060e39922a01891826251925e39be2df38170d88e2b
 MD5 ea37e3a5b2edbe1b1fca02ba48c4ea47 files/build.sh-exit-fix.patch 345
 RMD160 4c4cfdfb1b13b9cc55f279a5765afda6da9f6f4d files/build.sh-exit-fix.patch 345
@@ -27,18 +24,18 @@ EBUILD ant-core-1.6.2-r5.ebuild 2073 RMD160 f634b70f53e25e1bdba96f31cdb1f27c457f
 MD5 dfba7c36e7a153beaf22f7d4644de63a ant-core-1.6.2-r5.ebuild 2073
 RMD160 f634b70f53e25e1bdba96f31cdb1f27c457f3d49 ant-core-1.6.2-r5.ebuild 2073
 SHA256 e3b8a363c503557e3b0349b967ef4f678dc65e559428c7b11668c68fb27739d8 ant-core-1.6.2-r5.ebuild 2073
-EBUILD ant-core-1.6.5-r13.ebuild 1857 RMD160 c3e1289ff95259660ab5248c6737c0b0730fb398 SHA1 627ba9bb42895897f2d9cdbe5719d316e194df1f SHA256 ebf6d8d00497cefc1901821c5b421daf44e043f5ffef0fef4eb07cef62948f55
-MD5 888900668f67dcd424238e69b3df4e35 ant-core-1.6.5-r13.ebuild 1857
-RMD160 c3e1289ff95259660ab5248c6737c0b0730fb398 ant-core-1.6.5-r13.ebuild 1857
-SHA256 ebf6d8d00497cefc1901821c5b421daf44e043f5ffef0fef4eb07cef62948f55 ant-core-1.6.5-r13.ebuild 1857
+EBUILD ant-core-1.6.5-r14.ebuild 1836 RMD160 97d0252fb94b0f4ec0f864e386a1b67801ee8c81 SHA1 f11d4bf1d593b83142fda4f982117771fecbf075 SHA256 8eb2568adaab6658011cbcc0d7d423c3ba7f9e021bde2272b7f14a238fb8a93f
+MD5 e46f2f87d28c4cbf60884b42474b1afe ant-core-1.6.5-r14.ebuild 1836
+RMD160 97d0252fb94b0f4ec0f864e386a1b67801ee8c81 ant-core-1.6.5-r14.ebuild 1836
+SHA256 8eb2568adaab6658011cbcc0d7d423c3ba7f9e021bde2272b7f14a238fb8a93f ant-core-1.6.5-r14.ebuild 1836
 EBUILD ant-core-1.6.5-r2.ebuild 1987 RMD160 157a69a2dcb2bec7ac04fbc8ae85dc25a58ed6bf SHA1 d014158049cef492acd0c639858162581443ec3f SHA256 bc2e6caf7a21e2d78139166427ef68253712a3e64d0f47c6a6c149bcec3937e8
 MD5 aaf6dc9ea5b59b8ffa3b7b3dd1f4add4 ant-core-1.6.5-r2.ebuild 1987
 RMD160 157a69a2dcb2bec7ac04fbc8ae85dc25a58ed6bf ant-core-1.6.5-r2.ebuild 1987
 SHA256 bc2e6caf7a21e2d78139166427ef68253712a3e64d0f47c6a6c149bcec3937e8 ant-core-1.6.5-r2.ebuild 1987
-MISC ChangeLog 20703 RMD160 1935d1afd347adade1bee24e717173a92a3e22c5 SHA1 d882d0f9dbf636f35963776138c05b146925202f SHA256 60551a774a46bec8eb5f76b6fce017f86a5f3a2f52b286997fbc75b53e2bf914
-MD5 54c12548d4552efb02a29f5e9c149add ChangeLog 20703
-RMD160 1935d1afd347adade1bee24e717173a92a3e22c5 ChangeLog 20703
-SHA256 60551a774a46bec8eb5f76b6fce017f86a5f3a2f52b286997fbc75b53e2bf914 ChangeLog 20703
+MISC ChangeLog 20996 RMD160 65839649fe02b43ebeef6ba8e3ecf32098b35c6b SHA1 f986dd63baaa241f383e0ec15b5a84c98142c086 SHA256 cd490f71ff02638dd7d8c10b9e729b12bc02bc472dc8f681fb91e3aed7556164
+MD5 531f5d17e53c961f1cb63bd48f579927 ChangeLog 20996
+RMD160 65839649fe02b43ebeef6ba8e3ecf32098b35c6b ChangeLog 20996
+SHA256 cd490f71ff02638dd7d8c10b9e729b12bc02bc472dc8f681fb91e3aed7556164 ChangeLog 20996
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -46,16 +43,9 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 21d95e3502c7e14cb7893059f3d7f775 files/digest-ant-core-1.6.2-r5 268
 RMD160 aed86ecdae1d5e5a6bb57d5ae7a4730002535f7f files/digest-ant-core-1.6.2-r5 268
 SHA256 6bb84dbe413ac8ae2d5fdec3bbd48c1a25de21086b080cc616e3e55544636254 files/digest-ant-core-1.6.2-r5 268
-MD5 31de0486a830c545c91a089241b3bb9a files/digest-ant-core-1.6.5-r13 268
-RMD160 3a54cfc35c821291722b58076e3524c513ee1dc2 files/digest-ant-core-1.6.5-r13 268
-SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/digest-ant-core-1.6.5-r13 268
+MD5 31de0486a830c545c91a089241b3bb9a files/digest-ant-core-1.6.5-r14 268
+RMD160 3a54cfc35c821291722b58076e3524c513ee1dc2 files/digest-ant-core-1.6.5-r14 268
+SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/digest-ant-core-1.6.5-r14 268
 MD5 31de0486a830c545c91a089241b3bb9a files/digest-ant-core-1.6.5-r2 268
 RMD160 3a54cfc35c821291722b58076e3524c513ee1dc2 files/digest-ant-core-1.6.5-r2 268
 SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/digest-ant-core-1.6.5-r2 268
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFE+gwQAiZjviIA2XgRArcgAJ9UXthypfpjegtkOQThFy3gmJlPRgCfbRmD
-Ek0WF3RZq//QuOGcGRpTMOI=
-=iHKe
------END PGP SIGNATURE-----
diff --git a/dev-java/ant-core/ant-core-1.6.5-r13.ebuild b/dev-java/ant-core/ant-core-1.6.5-r13.ebuild
deleted file mode 100644
index 8adb5fe62f51..000000000000
--- a/dev-java/ant-core/ant-core-1.6.5-r13.ebuild
+++ /dev/null
@@ -1,69 +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/ant-core/ant-core-1.6.5-r13.ebuild,v 1.5 2006/09/02 22:56:09 flameeyes Exp $
-
-inherit java-pkg-2 eutils toolchain-funcs java-ant-2
-
-MY_PN=${PN/-core}
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
-HOMEPAGE="http://ant.apache.org/"
-SRC_URI="mirror://apache/ant/source/apache-${MY_PN}-${PV}-src.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc source"
-
-DEPEND="${RDEPEND}
-	source? ( app-arch/zip )
-	>=virtual/jdk-1.4"
-RDEPEND=">=virtual/jdk-1.4
-	>=dev-java/java-config-1.2"
-
-S="${WORKDIR}/apache-ant-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Patch build.sh to die with non-zero exit code in case of errors.
-	# This patch may be useful for all ant versions.
-	epatch ${FILESDIR}/build.sh-exit-fix.patch
-}
-
-src_compile() {
-	if [[ $(tc-arch) == "ppc" ]] ; then
-		# We're compiling _ON_ PPC
-		export THREADS_FLAG="green"
-	fi
-
-	./build.sh -Ddist.dir=${D}/usr/share/${PN} || die "failed to build"
-
-	if use doc; then
-		./build.sh dist_javadocs || die "failed to build docs"
-	fi
-}
-
-src_install() {
-	newbin ${FILESDIR}/${PV}-ant ant || die "failed to install wrapper"
-
-	dodir /usr/share/${PN}/bin
-	for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do
-		dobin ${S}/src/script/${each}
-		dosym /usr/bin/${each} /usr/share/${PN}/bin/${each}
-	done
-
-	dodir /etc/env.d
-	echo "ANT_HOME=\"/usr/share/${PN}\"" > ${D}/etc/env.d/20ant
-
-	java-pkg_dojar build/lib/ant.jar
-	java-pkg_dojar build/lib/ant-launcher.jar
-
-	use source && java-pkg_dosrc src/main/*
-
-	dodoc README WHATSNEW KEYS
-	use doc && dohtml welcome.html
-	use doc && java-pkg_dohtml -r docs/*
-	use doc && java-pkg_dohtml -r dist/docs/manual/api/*
-}
diff --git a/dev-java/ant-core/files/digest-ant-core-1.6.5-r13 b/dev-java/ant-core/files/digest-ant-core-1.6.5-r13
deleted file mode 100644
index 6bc546eb9b5c..000000000000
--- a/dev-java/ant-core/files/digest-ant-core-1.6.5-r13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 80a7ad191c40b7d8c82533524b282b6b apache-ant-1.6.5-src.tar.bz2 6283500
-RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 apache-ant-1.6.5-src.tar.bz2 6283500
-SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59 apache-ant-1.6.5-src.tar.bz2 6283500