new version

5 files changed, 143 insertions, 18 deletions

diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 2fe33d0e02d6..4f23c45ba68e 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,39 +1,47 @@
 # 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.10 2002/10/18 20:19:05 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.11 2002/10/25 23:47:41 blizzy Exp $
+
+*ant-1.5.1 (25 Oct 2002)
+
+  25 Oct 2002; Maik Schreiber <blizzy@gentoo.org> ant-1.5.1.ebuild,
+  files/1.5.1/ant: New version.
+
+  25 Oct 2002; Maik Schreiber <blizzy@gentoo.org> ant-1.5.ebuild: Changed
+  KEYWORDS to "x86 ~ppc".
 
 *ant-1.5 (26 Jul 2002)
 
-  18 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/1.5/ant :
+  18 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/1.5/ant:
   Fixed nasty oversight in script.
 
-  14 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/1.5/ant :
+  14 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/1.5/ant:
   Fixed bugs with script as reported in #7732. Marked for testing. 
 
-  26 Jul 2002; William McArthur <sandymac@gentoo.org> ant-1.5.ebuild files/1.5/ant files/digest-ant-1.5 :
-  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
+  26 Jul 2002; William McArthur <sandymac@gentoo.org> ant-1.5.ebuild,
+  files/1.5/ant: 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)
 
-  26 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r3.ebuild :
+  26 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r3.ebuild:
   Added test in pkg_setup() to ensure that a proper system VM is installed. 
   This is a special-case, we should not bother about adding similar tests to
   all other java packages.
 
-  24 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r3.ebuild :
+  24 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r3.ebuild:
   Added extra install-time test to verify that all files install properly. 
   Some users manage to install a faulty ant, for some reason.
 
-  13 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> ant-1.4.1-r3.ebuild :
+  13 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> ant-1.4.1-r3.ebuild:
   added ppc keyword
 
-  01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r3.ebuild :
-  Added SLOT, KEYWORDS and LICENSE. Ebuild originally submitted by
-  Achim Gottinger <achim@gentoo.org>.
+  01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r3.ebuild:
+  Added SLOT, KEYWORDS and LICENSE. Ebuild originally submitted by Achim
+  Gottinger <achim@gentoo.org>.
 
-  03 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r3.ebuild files/digest-ant-1.4.1-r3:
+  03 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r3.ebuild:
   Now handles the case of multiple occurrences of JAVA_HOME in the Java
   environment setting, thanks to Florian L. Klein <kleinf@gmx.de>.
 
@@ -41,13 +49,13 @@
 
 *ant-1.4.1-r2 (10 Apr 2002)
 
-  10 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r2.ebuild files/digest-ant-1.4.1-r2:
+  10 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r2.ebuild:
   The JAVA_HOME env var is now picked from $HOME/.gentoo/java-env if it exists,
   /etc/env.d/20java if not. An error is emitted if both files are missing.
 
   Removed ant-1.4.1-r1.ebuild files/digest-ant-1.4.1-r1
 
-*ant-1.4.1-r1 (1 Feb 2002)
+*ant-1.4.1-r1 (01 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  01 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog:
   Added initial ChangeLog.
diff --git a/dev-java/ant/ant-1.5.1.ebuild b/dev-java/ant/ant-1.5.1.ebuild
new file mode 100644
index 000000000000..9318e168e90a
--- /dev/null
+++ b/dev-java/ant/ant-1.5.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2002 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.1.ebuild,v 1.1 2002/10/25 23:47:41 blizzy 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 ~ppc"
+DEPEND="virtual/glibc
+	>=virtual/jdk-1.3"
+
+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/ant-1.5.ebuild b/dev-java/ant/ant-1.5.ebuild
index 4912bba09e51..028fc8d650be 100644
--- a/dev-java/ant/ant-1.5.ebuild
+++ b/dev-java/ant/ant-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.ebuild,v 1.2 2002/10/04 05:10:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.ebuild,v 1.3 2002/10/25 23:47:41 blizzy Exp $
 
 S=${WORKDIR}/jakarta-ant-${PV}
 DESCRIPTION="Build system for Java"
@@ -8,7 +8,7 @@ SRC_URI="http://jakarta.apache.org/builds/jakarta-ant/release/v${PV}/src/jakarta
 HOMEPAGE="http://jakarta.apache.org"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 DEPEND="virtual/glibc
 	>=virtual/jdk-1.3
 	dev-java/java-config"
diff --git a/dev-java/ant/files/1.5.1/ant b/dev-java/ant/files/1.5.1/ant
new file mode 100644
index 000000000000..fd9989747fcc
--- /dev/null
+++ b/dev-java/ant/files/1.5.1/ant
@@ -0,0 +1,85 @@
+#! /bin/sh
+
+#   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
+#   reserved.
+#   Edited for Gentoo Linux
+
+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`
+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
+
+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_HOME}/bin/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="${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.1 b/dev-java/ant/files/digest-ant-1.5.1
new file mode 100644
index 000000000000..1a73f3d83e87
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.5.1
@@ -0,0 +1 @@
+MD5 a9d1d1cb1c042ef2fffc21f31d96d4a9 jakarta-ant-1.5.1-src.tar.gz 4977991