Version bump and evil fixes ;)

5 files changed, 92 insertions, 13 deletions

diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 33883eb8720a..71cf1783aea9 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.53 2004/02/25 07:39:32 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.54 2004/03/11 02:34:01 zx Exp $
+
+*ant-1.6.1 (10 Mar 2004)
+
+  10 Mar 2004; Chris Aniszczyk <zx@gentoo.org> ant-1.5.4-r1.ebuild,
+  ant-1.6.1.ebuild:
+  Version bump + fixes. Closes #43398, #42850, #41414
 
   25 Feb 2004; Dylan Carlson <absinthe@gentoo.org> ant-1.5.4-r1.ebuild,
   ant-1.6.0-r2.ebuild, ant-1.6.0-r3.ebuild:
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 135c51d74d4a..4604479b9297 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,18 +1,20 @@
-MD5 76b8a271c997962cc50fae0106ab8029 ChangeLog 9673
-MD5 693d10c41066bd2f3b889f63ef882d3d ant-1.5.3-r5.ebuild 2941
-MD5 36df18f93d93cbfdebbbb8d3262a1aa3 ant-1.5.4-r1.ebuild 2885
-MD5 9aab7449f7c50c6bbddbba2859bd2bda ant-1.6.0-r2.ebuild 1613
+MD5 2e9b0a5d21fc23566a2c798663715690 ant-1.5.3-r5.ebuild 2940
+MD5 31f33790b2830745a08cebebc0f6d8dc ant-1.6.0-r2.ebuild 1612
+MD5 c2ccaf5fafc095ba9e1c4ac39cd6165b ant-1.5.4-r1.ebuild 2972
+MD5 a876c6f62f1d71e8b9dccd42af2b51be ant-1.6.1.ebuild 1590
+MD5 9c571ad4ad3cbbce68817f540248d714 ant-1.6.0-r3.ebuild 1593
+MD5 48efa11f04a325b8737b606cf205e77e ChangeLog 9672
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 40c79fee127fcce3dfb327521574d61d ant-1.6.0-r3.ebuild 1594
 MD5 9796e31a633d28a00242c76325bb85b4 files/20ant 26
+MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1 74
 MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256
+MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164
 MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r5 76
 MD5 8d9dbdc8011a4b6ca468537db70bd4fb files/digest-ant-1.5.4-r1 74
 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-1.6.0-r2 74
-MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164
 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-1.6.0-r3 74
+MD5 d3c75fa274bd1f48314029ca53b2c01e files/1.6.0-r2/ant 2440
+MD5 de2a686ad048c6b78da419b0aa7aa857 files/1.6.0-r3/ant 2440
+MD5 c2ce37282a033b7a00993e622c685a9e files/1.5.3/ant 2207
 MD5 9cb067e9b0997856af50e7e117263596 files/1.5.3/1_6_backport-jdk142.patch.gz 916
-MD5 4233391fc580c36c78c9f2bc2057327f files/1.5.3/ant 2208
-MD5 e285a4a8da9b4f50a458433377f9b130 files/1.5.4/ant 2272
-MD5 5841a69d6263fda47a60334730e1e0c0 files/1.6.0-r2/ant 2441
-MD5 e0201a69f756a0c3c1f982ff9e29eaa4 files/1.6.0-r3/ant 2441
+MD5 64e1d4bf5327dd353f61bc8b53c8ff5e files/1.5.4/ant 2271
diff --git a/dev-java/ant/ant-1.5.4-r1.ebuild b/dev-java/ant/ant-1.5.4-r1.ebuild
index 97f80e5b0335..d9f870f66122 100644
--- a/dev-java/ant/ant-1.5.4-r1.ebuild
+++ b/dev-java/ant/ant-1.5.4-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 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.7 2004/02/25 07:39:32 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.4-r1.ebuild,v 1.8 2004/03/11 02:34:01 zx Exp $
 
 inherit java-pkg
 
 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://archive.apache.org/dist/ant/source/apache-${PN}-${PV}-src.zip
 HOMEPAGE="http://ant.apache.org"
 LICENSE="Apache-1.1"
 SLOT="0"
@@ -31,6 +31,9 @@ src_unpack() {
 src_compile() {
 
 	addwrite "/proc/self/maps"
+
+	[ -z ${JDK_HOME} ] && einfo "JDK_HOME not set, please check with java-config" && die
+
 	export JAVA_HOME=${JDK_HOME}
 	if [ `arch` == "ppc" ] ; then
 		# We're compiling _ON_ PPC
diff --git a/dev-java/ant/ant-1.6.1.ebuild b/dev-java/ant/ant-1.6.1.ebuild
new file mode 100644
index 000000000000..10f1370a4a88
--- /dev/null
+++ b/dev-java/ant/ant-1.6.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.1.ebuild,v 1.1 2004/03/11 02:34:01 zx Exp $
+
+inherit java-pkg
+
+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"
+HOMEPAGE="http://ant.apache.org"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+DEPEND="virtual/glibc
+	>=virtual/jdk-1.4
+	>=dev-java/java-config-1.2
+	!<dev-java/ant-optional-${PV}
+	!<dev-java/${PF}
+	>=dev-java/jsch-0.1.12"
+RDEPEND=">=virtual/jdk-1.4
+	app-shells/bash
+	>=dev-java/java-config-1.2"
+PDEPEND="=dev-java/ant-optional-${PV}"
+IUSE="doc"
+
+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.gz
+}
+
+src_compile() {
+
+	[ -z ${JDK_HOME} ] && einfo "JDK_HOME not set, please check with java-config" && die
+
+	addwrite "/proc/self/maps"
+	export JAVA_HOME=${JDK_HOME}
+	if [ `arch` == "ppc" ] ; then
+		# We're compiling _ON_ PPC
+		export THREADS_FLAG="green"
+	fi
+
+	./build.sh -Ddist.dir=${D}/usr/share/ant || die
+}
+
+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
+
+	insinto /etc/env.d
+	doins ${FILESDIR}/20ant
+
+	java-pkg_dojar build/lib/ant.jar
+	java-pkg_dojar build/lib/ant-launcher.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.6.1 b/dev-java/ant/files/digest-ant-1.6.1
new file mode 100644
index 000000000000..60b89a8cc1ed
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.6.1
@@ -0,0 +1 @@
+MD5 3e1f06aae6b691543299ccb1a5cb038f apache-ant-1.6.1-src.tar.bz2 6203438