Updated a comment on -r1, New method to build ant from sources

4 files changed, 58 insertions, 4 deletions

diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 2968ec913a07..abbeb3defd44 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,8 +1,8 @@
 MD5 98241290f78b31e493e61b4cc5a9c58e ant-1.5.3-r5.ebuild 2947
-MD5 b9e44335d49eb565d5db9dd144491a6b ant-1.5.4-r1.ebuild 2859
-MD5 75d62a9506866a3db37e5d43d9c02fd7 ChangeLog 7862
+MD5 68d7dac80b08ac66c9e17b5e5af7089a ant-1.5.4-r1.ebuild 2859
+MD5 02eec7751caf88d18b1347992841e568 ChangeLog 7995
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 dacbdb095781cd4998f2458b28a1e0c4 ant-1.5.4-r2.ebuild 1437
+MD5 971e9d4f24a16c372d1d56f69b1b077b ant-1.5.4-r2.ebuild 1437
 MD5 16fc30727700598832d64bbdda5d897a ant-1.5.4.ebuild 2761
 MD5 8d9dbdc8011a4b6ca468537db70bd4fb files/digest-ant-1.5.4 74
 MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256
diff --git a/dev-java/ant/ant-1.5.4-r1.ebuild b/dev-java/ant/ant-1.5.4-r1.ebuild
index b6aa741a6fb8..e97a551cdf6a 100644
--- a/dev-java/ant/ant-1.5.4-r1.ebuild
+++ b/dev-java/ant/ant-1.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.4-r1.ebuild,v 1.2 2003/10/18 15:03:11 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.4-r1.ebuild,v 1.3 2003/10/18 22:27:09 strider Exp $
 
 inherit java-pkg
 
@@ -24,6 +24,7 @@ src_unpack() {
 	# 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.gz
+	# This patch will be used until ant 1.6 is released
 	epatch ${FILESDIR}/rpmbuild.patch.gz
 }
 
diff --git a/dev-java/ant/ant-1.5.4-r2.ebuild b/dev-java/ant/ant-1.5.4-r2.ebuild
new file mode 100644
index 000000000000..42c8fdca6039
--- /dev/null
+++ b/dev-java/ant/ant-1.5.4-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.4-r2.ebuild,v 1.1 2003/10/18 22:27:09 strider Exp $
+
+inherit apache-ant
+
+IUSE="doc junit regexp oro bsf bsh antlr jdepend js bcel jython"
+SUPPORT_JARS="apache-ant-${PV}-support-files.tar.bz2"
+
+S="${WORKDIR}/apache-ant-${PV}"
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-src.tar.bz2 http://dev.gentoo.org/~strider/${SUPPORT_JARS}"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+DEPEND="virtual/glibc
+	>=virtual/jdk-1.3"
+RDEPEND=">=virtual/jdk-1.3
+	app-shells/bash"
+PDEPEND=""
+
+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.gz
+	# This patch will be used until ant 1.6 is released
+	epatch ${FILESDIR}/rpmbuild.patch.gz
+}
+
+src_compile() {
+	apache-ant_classpath
+	apache-ant_compile
+}
+
+src_install() {
+	cp ${FILESDIR}/${PV}/ant ${S}/src/ant
+
+	exeinto /usr/bin
+	doexe src/ant
+	for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do
+		dobin ${S}/src/script/${each}
+	done
+
+	java-pkg_dojar build/lib/*.jar
+
+	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
+	use doc && dohtml welcome.html
+	use doc && dohtml -r docs/*
+}
diff --git a/dev-java/ant/files/digest-ant-1.5.4-r2 b/dev-java/ant/files/digest-ant-1.5.4-r2
new file mode 100644
index 000000000000..b0cc09bdc8d9
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.5.4-r2
@@ -0,0 +1,2 @@
+MD5 bfac23721c24e77d0b1c383200327ff6 apache-ant-1.5.4-src.tar.bz2 4537009
+MD5 4af245b10c11650eafecca0c1832f357 apache-ant-1.5.4-support-files.tar.bz2 6456811