Fixes a few problems, probably won't unmask until after 1.4.

4 files changed, 123 insertions, 1 deletions

diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 54b8b375dd9f..0209d91cc3f3 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/ant
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.7 2002/08/26 17:27:19 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.8 2002/09/08 15:26:27 karltk Exp $
+
+*ant-1.5 (26 Jul 2002)
+
+  26 Jul 2002; William McArthur <sandymac@gentoo.org> ant-1.5.ebuild files/gent$
+
+  Upgraded to Ant 1.5, rewrote the Gentoo specific ant script to take
+  avantage of java-config. It also looked like the Gentoo ant-1.4.1
+  script was based an older version of ant.
 
 *ant-1.4.1-r3 (03 May 2002)
 
diff --git a/dev-java/ant/ant-1.5.ebuild b/dev-java/ant/ant-1.5.ebuild
new file mode 100644
index 000000000000..7d5fa94de441
--- /dev/null
+++ b/dev-java/ant/ant-1.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.ebuild,v 1.1 2002/09/08 15:26:27 karltk Exp $
+
+S=${WORKDIR}/jakarta-ant-${PV}
+DESCRIPTION="Build system for Java"
+SRC_URI="http://jakarta.apache.org/builds/jakarta-ant/release/v${PV}/src/jakarta-ant-${PV}-src.tar.gz"
+HOMEPAGE="http://jakarta.apache.org"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="x86"
+DEPEND="virtual/glibc
+	>=virtual/jdk-1.3
+	dev-java/java-config"
+
+src_compile() {
+	export JAVA_HOME=${JDK_HOME}
+	./build.sh -Ddist.dir=${D}/usr/share/ant || die
+}
+
+src_install() {
+
+	cp ${FILESDIR}/${PV}/ant src/ant
+
+	exeinto /usr/bin
+	doexe src/ant
+
+	dojar build/lib/*.jar lib/*.jar
+	
+	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
+	dohtml welcome.html
+	dohtml -r docs/*
+}
diff --git a/dev-java/ant/files/1.5/ant b/dev-java/ant/files/1.5/ant
new file mode 100644
index 000000000000..74d1fcf8b557
--- /dev/null
+++ b/dev-java/ant/files/1.5/ant
@@ -0,0 +1,80 @@
+#! /bin/sh
+
+#   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
+#   reserved.
+#   Edited for Gentoo Linux
+
+if [ -f $HOME/.gentoo/java-env ] ; then
+  envfile=$HOME/.gentoo/java-env
+elif [ -f /etc/env.d/20java ] ; then
+  envfile=/etc/env.d/20java
+else
+  echo "!!! /etc/env.d/20java not found, please configure your system VM with java-config"
+fi
+
+JAVA_HOME=`java-config --jdk-home`
+
+# load system-wide ant configuration
+if [ -f "/etc/ant.conf" ] ; then 
+  . /etc/ant.conf
+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: We cannot execute $JAVACMD "
+  echo "Error: Possibly java-config is not configured, please configure your system VM with java-config"
+  exit 1
+fi
+
+if [ -n "$CLASSPATH" ] ; then
+  LOCALCLASSPATH="$CLASSPATH"
+fi
+
+# add in the dependency .jar files
+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."
+  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
+
+# supply JIKESPATH to Ant as jikes.class.path
+if [ -n "$JIKESPATH" ] ; then
+  if $cygwin ; then
+    JIKESPATH=`cygpath --path --windows "$JIKESPATH"`
+  fi
+  ANT_OPTS="$ANT_OPTS -Djikes.class.path=$JIKESPATH"
+fi
+
+# Allow Jikes support (off by default)
+if $usejikes; then
+  ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
+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 b/dev-java/ant/files/digest-ant-1.5
new file mode 100644
index 000000000000..3e241b14c05c
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.5
@@ -0,0 +1 @@
+MD5 b47dca12d779bc46db83230a1ecb1294 jakarta-ant-1.5-src.tar.gz 2568202