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

their site.

8 files changed, 16 insertions, 131 deletions

diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 9197931b5744..26b7c7804167 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.26 2003/03/18 12:35:51 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.27 2003/03/21 21:39:06 absinthe Exp $
+
+*ant-1.5.2 (21 Mar 2003)
+
+  21 Mar 2003; Dylan Carlson <absinthe@gentoo.org> ant-1.5.2.ebuild, 
+  files/1.5.2/ant:
+  Version bump.  Unmasked for x86.
 
 *ant-1.5.1-r4 (16 Mar 2003)
 
diff --git a/dev-java/ant/ant-1.4.1-r3.ebuild b/dev-java/ant/ant-1.4.1-r3.ebuild
deleted file mode 100644
index f69108b2ca05..000000000000
--- a/dev-java/ant/ant-1.4.1-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.4.1-r3.ebuild,v 1.10 2003/02/13 10:06:18 vapier 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"
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="x86 ppc sparc"
-DEPEND="virtual/glibc
-	>=virtual/jdk-1.3"
-
-pkg_setup() {
-	if [ -z `java-config --java 2> /dev/null` ] ; then
-		eerror "You don't have a default system VM."
-		eerror "Use java-config to set one."
-		die
-	fi
-}
-
-src_compile() {
-	export JAVA_HOME=${JDK_HOME}
-	./build.sh -Ddist.dir=${D}/usr/share/ant || die
-}
-
-src_install() {
-
-	cp ${FILESDIR}/gentoo-ant-1.4.1 src/ant
-
-	exeinto /usr/bin
-	doexe src/ant
-
-	dojar build/lib/*.jar lib/*.jar || die
-	
-	dodoc LICENSE README WHATSNEW KEYS
-	dohtml -r docs/*
-}
diff --git a/dev-java/ant/ant-1.5.1-r4.ebuild b/dev-java/ant/ant-1.5.2.ebuild
index 0c5b8e31f04f..98aba0281809 100644
--- a/dev-java/ant/ant-1.5.1-r4.ebuild
+++ b/dev-java/ant/ant-1.5.2.ebuild
@@ -1,10 +1,10 @@
 # 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.1-r4.ebuild,v 1.2 2003/03/18 12:35:51 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.2.ebuild,v 1.1 2003/03/21 21:39:07 absinthe Exp $
 
-S=${WORKDIR}/jakarta-ant-${PV}
+S=${WORKDIR}/apache-ant-${PV}
 DESCRIPTION="Build system for Java"
-SRC_URI="http://www.apache.org/dist/ant/binaries/jakarta-ant-${PV}-bin.tar.bz2"
+SRC_URI="http://www.apache.org/dist/ant/binaries/apache-ant-${PV}-bin.tar.bz2"
 HOMEPAGE="http://jakarta.apache.org"
 LICENSE="Apache-1.1"
 SLOT="0"
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 "$@"