See the ChangeLog for changes. =)

7 files changed, 142 insertions, 19 deletions

diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 88f04ead11d7..496e8ddc8494 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,11 +1,12 @@
-MD5 e9fe704ca0c0808c57d8c7c62deb4850 ant-1.5.3-r5.ebuild 2950
-MD5 aec61abcb39c8de5a55a916126a083d4 ant-1.5.3-r4.ebuild 2587
-MD5 cd73af9a888e25af45cbf9f11080b727 ChangeLog 7082
+MD5 9a80994bf7c188df380eb3014d2fc073 ant-1.5.3-r5.ebuild 2930
+MD5 882fd00852fd68f6f7da1b8fb7e63572 ant-1.5.3-r4.ebuild 2560
+MD5 8a466d22c12af236593747380d1b51d1 ChangeLog 7370
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 1137d77d47926d07e05840d4e085f158 ant-1.5.4.ebuild 2938
-MD5 4807f353ae3c243717ccd5bcdc8ee3cf files/1_6_backport-jdk142.patch.gz 940
+MD5 7d42025737144e2f16a3b638f6f440b9 ant-1.5.4.ebuild 2748
 MD5 8d9dbdc8011a4b6ca468537db70bd4fb files/digest-ant-1.5.4 74
-MD5 f3735fcade77d65a1c47338fe8662b43 files/build.sh-exit-fix.patch.gz 269
+MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256
 MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r4 76
 MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r5 76
 MD5 6e22e7d1b121a847e107b6498f48e0a4 files/1.5.3/ant 2207
+MD5 9cb067e9b0997856af50e7e117263596 files/1.5.3/1_6_backport-jdk142.patch.gz 916
+MD5 2830ac0751b72ce17c065a8a52571112 files/1.5.4/ant 2206
diff --git a/dev-java/ant/ant-1.5.3-r4.ebuild b/dev-java/ant/ant-1.5.3-r4.ebuild
index 86d69b6e786f..af3050a6fe66 100644
--- a/dev-java/ant/ant-1.5.3-r4.ebuild
+++ b/dev-java/ant/ant-1.5.3-r4.ebuild
@@ -1,17 +1,18 @@
 # 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.3-r4.ebuild,v 1.2 2003/09/06 22:26:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.3-r4.ebuild,v 1.3 2003/09/22 03:44:49 strider Exp $
 
 inherit java-pkg
 
 S="${WORKDIR}/apache-ant-${PV}-1"
 DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
-SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-1-src.tar.bz2"
+SRC_URI="http://archive.apache.org/dist/ant/source/apache-${PN}-${PV}-1-src.tar.bz2"
 HOMEPAGE="http://ant.apache.org"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
-DEPEND="virtual/glibc"
+DEPEND="virtual/glibc
+	>=virtual/jdk-1.3"
 RDEPEND=">=virtual/jdk-1.3"
 IUSE="doc"
 
@@ -56,6 +57,12 @@ src_compile() {
 		export DEP_APPEND="${DEP_APPEND} antlr"
 	fi
 
+	# add bcel if we have it
+	if [ -f "/usr/share/bcel/lib/bcel.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/bcel/lib/bcel.jar"
+		export DEP_APPEND="${DEP_APPEND} bcel"
+	fi
+
 	./build.sh -Ddist.dir=${D}/usr/share/ant || die
 }
 
diff --git a/dev-java/ant/ant-1.5.3-r5.ebuild b/dev-java/ant/ant-1.5.3-r5.ebuild
index 1a84dc9c97df..fd400f7050e7 100644
--- a/dev-java/ant/ant-1.5.3-r5.ebuild
+++ b/dev-java/ant/ant-1.5.3-r5.ebuild
@@ -1,17 +1,18 @@
 # 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.3-r5.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.3-r5.ebuild,v 1.4 2003/09/22 03:44:49 strider Exp $
 
 inherit java-pkg
 
 S="${WORKDIR}/apache-ant-${PV}-1"
 DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
-SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-1-src.tar.bz2"
+SRC_URI="http://archive.apache.org/dist/ant/source/apache-${PN}-${PV}-1-src.tar.bz2"
 HOMEPAGE="http://ant.apache.org"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-DEPEND="virtual/glibc"
+KEYWORDS="x86 ppc sparc alpha"
+DEPEND="virtual/glibc
+	>=virtual/jdk-1.3"
 RDEPEND=">=virtual/jdk-1.3"
 IUSE="doc"
 
@@ -69,6 +70,12 @@ src_compile() {
 		export DEP_APPEND="${DEP_APPEND} antlr"
 	fi
 
+	# add bcel if we have it
+	if [ -f "/usr/share/bcel/lib/bcel.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/bcel/lib/bcel.jar"
+		export DEP_APPEND="${DEP_APPEND} bcel"
+	fi
+
 	./build.sh -Ddist.dir=${D}/usr/share/ant || die
 }
 
diff --git a/dev-java/ant/ant-1.5.3-r3.ebuild b/dev-java/ant/ant-1.5.4.ebuild
index 25f06301e3c5..7b04a626c884 100644
--- a/dev-java/ant/ant-1.5.3-r3.ebuild
+++ b/dev-java/ant/ant-1.5.4.ebuild
@@ -1,20 +1,30 @@
 # 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.3-r3.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.4.ebuild,v 1.1 2003/09/22 03:44:49 strider Exp $
 
 inherit java-pkg
 
-S="${WORKDIR}/apache-ant-${PV}-1"
+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}-1-src.tar.bz2"
+SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-src.tar.bz2"
 HOMEPAGE="http://ant.apache.org"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-DEPEND="virtual/glibc"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+DEPEND="virtual/glibc
+	>=virtual/jdk-1.3"
 RDEPEND=">=virtual/jdk-1.3"
 IUSE="doc"
 
+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() {
 	export JAVA_HOME=${JDK_HOME}
 	if [ `arch` == "ppc" ] ; then
@@ -56,6 +66,12 @@ src_compile() {
 		export DEP_APPEND="${DEP_APPEND} antlr"
 	fi
 
+	# add bcel if we have it
+	if [ -f "/usr/share/bcel/lib/bcel.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/bcel/lib/bcel.jar"
+		export DEP_APPEND="${DEP_APPEND} bcel"
+	fi
+
 	./build.sh -Ddist.dir=${D}/usr/share/ant || die
 }
 
@@ -64,6 +80,9 @@ src_install() {
 
 	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
 
diff --git a/dev-java/ant/files/1.5.4/ant b/dev-java/ant/files/1.5.4/ant
new file mode 100644
index 000000000000..1e2966124f03
--- /dev/null
+++ b/dev-java/ant/files/1.5.4/ant
@@ -0,0 +1,89 @@
+#! /bin/sh
+
+#   Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
+#   reserved.
+#   Edited for Gentoo Linux
+#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.5.4/ant,v 1.1 2003/09/22 03:44:49 strider Exp $
+
+if [ -f $HOME/.gentoo/java-env ] ; then
+  source $HOME/.gentoo/java-env
+else
+  JAVA_HOME=`java-config --jdk-home`
+  if [ -z $JAVA_HOME ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+  CLASSPATH=`java-config --classpath`:${CLASSPATH}
+fi
+
+if [ -z $JAVA_HOME ] ; then
+  echo "Error: No JDK/JRE found!"
+  exit 1
+fi
+
+# load system-wide ant configuration
+if [ -f "/etc/ant.conf" ] ; then 
+  . /etc/ant.conf
+fi
+
+# provide default values for people who don't use RPMs
+if [ -z "$rpm_mode" ] ; then
+  rpm_mode=false;
+fi
+if [ -z "$usejikes" ] ; then
+  usejikes=false;
+fi
+
+# load user ant configuration
+if [ -f "$HOME/.antrc" ] ; then 
+  . "$HOME/.antrc"
+fi
+
+ANT_HOME=/usr/share/ant
+
+# set ANT_LIB location
+ANT_LIB="${ANT_HOME}/lib"
+
+JAVACMD="`java-config --java`"
+ 
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly."
+  echo "  We cannot execute $JAVACMD"
+  exit 1
+fi
+
+if [ -n "$CLASSPATH" ] ; then
+  LOCALCLASSPATH="$CLASSPATH"
+fi
+
+# add in the dependency .jar files
+LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant`"
+
+if [ -n "$JAVA_HOME" ] ; then
+  if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
+    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
+  fi
+
+  if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
+    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
+  fi
+
+else
+  echo "Warning: JAVA_HOME environment variable is not set (or not exported)."
+  echo "  If build fails because sun.* classes could not be found"
+  echo "  you will need to set the JAVA_HOME environment variable"
+  echo "  to the installation directory of java."
+fi
+
+# Allow Jikes support (off by default)
+if $usejikes; then
+  ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
+fi
+
+# 2002-11-02, karltk@gentoo.org:
+# The Blackdown JDK on PPC hiccups with native threads
+#
+if [ "`arch`" == "ppc" ] ; then
+	export THREADS_FLAG="green"
+fi
+
+"$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
diff --git a/dev-java/ant/files/digest-ant-1.5.3-r3 b/dev-java/ant/files/digest-ant-1.5.3-r3
deleted file mode 100644
index 76649f44e954..000000000000
--- a/dev-java/ant/files/digest-ant-1.5.3-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b360fe06ad344df9f6e0b3f3ce0f9c60 apache-ant-1.5.3-1-src.tar.bz2 4486166
diff --git a/dev-java/ant/files/digest-ant-1.5.4 b/dev-java/ant/files/digest-ant-1.5.4
new file mode 100644
index 000000000000..68c0f258dcd2
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.5.4
@@ -0,0 +1 @@
+MD5 bfac23721c24e77d0b1c383200327ff6 apache-ant-1.5.4-src.tar.bz2 4537009