Version bump; unmasked for x86. Apache has obsoleted older versions from

their site.

5 files changed, 6 insertions, 88 deletions

diff --git a/dev-java/ant/files/1.5.1/ant b/dev-java/ant/files/1.5.2/ant
index 4f644189f746..e5f87d9a7009 100644
--- a/dev-java/ant/files/1.5.1/ant
+++ b/dev-java/ant/files/1.5.2/ant
@@ -1,8 +1,9 @@
 #! /bin/sh
 
-#   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
+#   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.2/ant,v 1.1 2003/03/21 21:39:07 absinthe Exp $
 
 if [ -f $HOME/.gentoo/java-env ] ; then
   source $HOME/.gentoo/java-env
@@ -30,13 +31,13 @@ fi
 
 # load user ant configuration
 if [ -f "$HOME/.antrc" ] ; then 
-  . $HOME/.antrc
+  . "$HOME/.antrc"
 fi
 
 ANT_HOME=/usr/share/ant
 
 # set ANT_LIB location
-ANT_LIB=${ANT_HOME}/lib
+ANT_LIB="${ANT_HOME}/lib"
 
 JAVACMD="`java-config --java`"
  
@@ -63,7 +64,7 @@ if [ -n "$JAVA_HOME" ] ; then
   fi
 
 else
-  echo "Warning: JAVA_HOME environment variable is not set."
+  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."
diff --git a/dev-java/ant/files/digest-ant-1.4.1-r3 b/dev-java/ant/files/digest-ant-1.4.1-r3
deleted file mode 100644
index 020707ceee14..000000000000
--- a/dev-java/ant/files/digest-ant-1.4.1-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4707ab065b39ddf812c724fd74e7831d jakarta-ant-1.4.1-src.tar.gz 1328414
diff --git a/dev-java/ant/files/digest-ant-1.5.1-r4 b/dev-java/ant/files/digest-ant-1.5.1-r4
deleted file mode 100644
index 816bf2b23720..000000000000
--- a/dev-java/ant/files/digest-ant-1.5.1-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a5a8a6273d897a60c4e66c11cbb5c442 jakarta-ant-1.5.1-bin.tar.bz2 5368062
diff --git a/dev-java/ant/files/digest-ant-1.5.2 b/dev-java/ant/files/digest-ant-1.5.2
new file mode 100644
index 000000000000..fea365dfc610
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.5.2
@@ -0,0 +1 @@
+MD5 f91504b3af51358c034fb926f4ce9895 apache-ant-1.5.2-bin.tar.bz2 5556999
diff --git a/dev-java/ant/files/gentoo-ant-1.4.1 b/dev-java/ant/files/gentoo-ant-1.4.1
deleted file mode 100644
index a547e91f6ba9..000000000000
--- a/dev-java/ant/files/gentoo-ant-1.4.1
+++ /dev/null
@@ -1,82 +0,0 @@
-#! /bin/sh
-
-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=`grep "^JAVA_HOME" $envfile | sed "s/JAVA_HOME=//"`
-
-if [ -f $HOME/.antrc ] ; then 
-  . $HOME/.antrc
-fi
-
-ANT_HOME=/usr/share/ant
-
-if [ -z "$JAVACMD" ] ; then 
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-      JAVACMD=$JAVA_HOME/bin/java
-    fi
-  else
-    JAVACMD=java
-  fi
-fi
- 
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit
-fi
-
-if [ -n "$CLASSPATH" ] ; then
-  LOCALCLASSPATH=$CLASSPATH
-fi
-
-# add in the dependency .jar files
-DIRLIBS=${ANT_HOME}/lib/*.jar
-for i in ${DIRLIBS}
-do
-    # if the directory is empty, then it will return the input string
-    # this is stupid, so case for it
-    if [ "$i" != "${DIRLIBS}" ] ; then
-      if [ -z "$LOCALCLASSPATH" ] ; then
-        LOCALCLASSPATH=$i
-      else
-        LOCALCLASSPATH="$i":$LOCALCLASSPATH
-      fi
-    fi
-done
-
-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 [ -n "$ANT_OPTS" ] ; then
-    ANT_OPTS="$ANT_OPTS -Djikes.class.path=$JIKESPATH"
-  else
-    ANT_OPTS=-Djikes.class.path=$JIKESPATH
-  fi
-fi
-
-$JAVACMD -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main "$@"