Updated ant to latest available version.

7 files changed, 251 insertions, 5 deletions

diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 9ee38bbb0594..b4ab2d212855 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.42 2003/11/20 11:58:25 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.43 2003/12/25 17:46:55 strider Exp $
+
+*ant-1.6.0 (25 Dec 2003)
+
+  25 Dec 2003; Adrian Almenar <strider@gentoo.org> ant-1.6.0-r1.ebuild, ant-1.6.0.ebuild,
+  files/1.6.0/ant:
+  Updated ant to latest available version.
 
   20 Nov 2003; Adrian Almenar <strider@gentoo.org> ant-1.5.4-r1.ebuild:
   Moved to stable on all arches.
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 9e76c5066a66..17ee5e8b0778 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 cdba0dc1a042893f745a2fb4aeaa68ef ant-1.5.4-r1.ebuild 2884
-MD5 63b5b63f49808fff86cf74d4bc318dd9 ant-1.6.0-r1.ebuild 1475
-MD5 811cd6fac9dd39271e97bb24054e6780 ant-1.6.0.ebuild 2797
-MD5 99df438fc994c81d6c41b0263340af35 ChangeLog 8256
+MD5 6c3302a1339039c5996976ccde3b35d9 ant-1.6.0-r1.ebuild 1475
+MD5 339d83bd5e86d9310b45f399a62be9c0 ant-1.6.0.ebuild 2794
+MD5 174198e11b21538922ec6cb51c77b36b ChangeLog 8435
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 63b5b63f49808fff86cf74d4bc318dd9 ant-1.5.4-r2.ebuild 1475
 MD5 16fc30727700598832d64bbdda5d897a ant-1.5.4.ebuild 2761
@@ -17,4 +17,4 @@ MD5 d9cb4baf78b173e25d3343f405822de4 files/digest-ant-1.6.0-r1 158
 MD5 4233391fc580c36c78c9f2bc2057327f files/1.5.3/ant 2208
 MD5 9cb067e9b0997856af50e7e117263596 files/1.5.3/1_6_backport-jdk142.patch.gz 916
 MD5 e285a4a8da9b4f50a458433377f9b130 files/1.5.4/ant 2272
-MD5 e285a4a8da9b4f50a458433377f9b130 files/1.6.0/ant 2272
+MD5 ccb4b4b8bbaaa075699854c9fdc2822d files/1.6.0/ant 2272
diff --git a/dev-java/ant/ant-1.6.0-r1.ebuild b/dev-java/ant/ant-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..d3094c16389f
--- /dev/null
+++ b/dev-java/ant/ant-1.6.0-r1.ebuild
@@ -0,0 +1,53 @@
+# 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.6.0-r1.ebuild,v 1.1 2003/12/25 17:46:55 strider Exp $
+
+inherit apache-ant java-pkg
+
+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() {
+
+	addwrite "/proc/self/maps"
+	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/ant-1.6.0.ebuild b/dev-java/ant/ant-1.6.0.ebuild
new file mode 100644
index 000000000000..a3b936fcbd19
--- /dev/null
+++ b/dev-java/ant/ant-1.6.0.ebuild
@@ -0,0 +1,95 @@
+# 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.6.0.ebuild,v 1.1 2003/12/25 17:46:55 strider 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"
+HOMEPAGE="http://ant.apache.org"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+DEPEND="virtual/glibc
+	>=virtual/jdk-1.3"
+RDEPEND=">=virtual/jdk-1.3
+	app-shells/bash"
+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() {
+
+	addwrite "/proc/self/maps"
+	export JAVA_HOME=${JDK_HOME}
+	if [ `arch` == "ppc" ] ; then
+		# We're compiling _ON_ PPC
+		export THREADS_FLAG="green"
+	fi
+
+	# Make sure junit tasks get built if we have junit
+	if [ -f "/usr/share/junit/lib/junit.jar" ] ; then
+		export CLASSPATH="/usr/share/junit/lib/junit.jar"
+		export DEP_APPEND="junit"
+		if [ -f "/usr/share/xalan/lib/xalan.jar" ] ; then
+			export CLASSPATH="${CLASSPATH}:/usr/share/xalan/lib/xalan.jar"
+			export DEP_APPEND="${DEP_APPEND} xalan"
+		fi
+	fi
+
+	# Add Xerces in if we have it
+	if [ -f "/usr/share/xerces/lib/xercesImpl.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/xerces/lib/xercesImpl.jar:/usr/share/xerces/lib/xml-apis.jar"
+		export DEP_APPEND="${DEP_APPEND} xerces"
+	fi
+
+	# Add oro in if we have it
+	if [ -f "/usr/share/oro/lib/oro.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/oro/lib/oro.jar"
+		export DEP_APPEND="${DEP_APPEND} oro"
+	fi
+
+	# Add beanutils if we have it
+	if [ -f "/usr/share/commons-beanutils/lib/commons-beanutils.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/commons-beanutils/lib/commons-beanutils.jar"
+		export DEP_APPEND="${DEP_APPEND} commons-beanutils"
+	fi
+
+	# add antlr if we have it
+	if [ -f "/usr/share/antlr/lib/antlr.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/antlr/lib/antlr.jar"
+		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
+}
+
+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/1.6.0/ant b/dev-java/ant/files/1.6.0/ant
new file mode 100644
index 000000000000..1ae242b5fc49
--- /dev/null
+++ b/dev-java/ant/files/1.6.0/ant
@@ -0,0 +1,89 @@
+#! /bin/bash
+
+#   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.6.0/ant,v 1.1 2003/12/25 17:46:55 strider Exp $
+
+if [ -f $HOME/.gentoo/java-env ] ; then
+  source $HOME/.gentoo/java-env
+else
+  JAVA_HOME=`java-config --jdk-home`
+  CLASSPATH=`java-config --classpath`:${CLASSPATH}
+fi
+
+if [ -z $JAVA_HOME ] ; then
+  echo "Error: No JDK found!"
+  echo "Try using java-config script to set your JDK"
+  echo "Remember that you need a JDK not a JRE"
+  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."
+  echo "  Try using java-config script"
+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.6.0 b/dev-java/ant/files/digest-ant-1.6.0
new file mode 100644
index 000000000000..dd7fbab35622
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.6.0
@@ -0,0 +1 @@
+MD5 18aed5aa33951aa85c237fc4139bad6e apache-ant-1.6.0-src.tar.bz2 6217526
diff --git a/dev-java/ant/files/digest-ant-1.6.0-r1 b/dev-java/ant/files/digest-ant-1.6.0-r1
new file mode 100644
index 000000000000..f3ed3773e1f5
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.6.0-r1
@@ -0,0 +1,2 @@
+MD5 18aed5aa33951aa85c237fc4139bad6e apache-ant-1.6.0-src.tar.bz2 6217526
+MD5 4af245b10c11650eafecca0c1832f357 apache-ant-1.6.0-support-files.tar.bz2 6456811