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)

4 files changed, 85 insertions, 3 deletions

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 5a7c39a280a9..12e8699c3bc9 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,18 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.46 2006/09/02 22:56:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.47 2006/09/13 09:28:31 caster Exp $
 
 # Ant-core blocks lower/older versions of ant-tasks, 
 # since it will not run when there is a version mismatch betwean the 2 packages
 # Please unemerge ant-tasks when updating ant-core.
 
+*ant-core-1.6.5-r14 (13 Sep 2006)
+
+  13 Sep 2006; Vlastimil Babka <caster@gentoo.org> files/1.6.5-ant,
+  -ant-core-1.6.5-r13.ebuild, +ant-core-1.6.5-r14.ebuild:
+  Added xml-commons-external-1.3 into CLASSPATH in ant's startup script to fix
+  bug #82561. Also fixes javadoc path wrt bug #112106.
+
   02 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
   ant-core-1.6.5-r2.ebuild, ant-core-1.6.5-r13.ebuild:
   Fix ~x86-fbsd keywording.
diff --git a/dev-java/ant-core/ant-core-1.6.5-r14.ebuild b/dev-java/ant-core/ant-core-1.6.5-r14.ebuild
new file mode 100644
index 000000000000..595158d0e993
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.6.5-r14.ebuild
@@ -0,0 +1,72 @@
+# 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-r14.ebuild,v 1.1 2006/09/13 09:28:31 caster 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
+
+	if use doc; then
+		dohtml welcome.html
+		java-pkg_dohtml -r docs/*
+		java-pkg_dohtml -r dist/docs/*
+	fi
+}
diff --git a/dev-java/ant-core/files/1.6.5-ant b/dev-java/ant-core/files/1.6.5-ant
index e2084df5c310..ca75068f1949 100644
--- a/dev-java/ant-core/files/1.6.5-ant
+++ b/dev-java/ant-core/files/1.6.5-ant
@@ -15,7 +15,7 @@
 #   limitations under the License.
 
 #   Edited for Gentoo Linux
-#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.5-ant,v 1.7 2006/07/22 23:12:04 flameeyes Exp $
+#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.5-ant,v 1.8 2006/09/13 09:28:31 caster Exp $
 
 # Extract launch and ant arguments, (see details below).
 ant_exec_args=
@@ -108,7 +108,7 @@ else
 fi
 
 # add in the dependency .jar files
-LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,sun-jaf-bin,sun-javamail-bin 2> /dev/null`"
+LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=log4j,xml-commons-external-1.3,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,sun-jaf-bin,sun-javamail-bin 2> /dev/null`"
 
 if [ -n "$JAVA_HOME" ] ; then
   if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
diff --git a/dev-java/ant-core/files/digest-ant-core-1.6.5-r14 b/dev-java/ant-core/files/digest-ant-core-1.6.5-r14
new file mode 100644
index 000000000000..6bc546eb9b5c
--- /dev/null
+++ b/dev-java/ant-core/files/digest-ant-core-1.6.5-r14
@@ -0,0 +1,3 @@
+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