Patches to build ant with sun-jdk-1.4.2, removing old ebuilds

6 files changed, 0 insertions, 101 deletions

diff --git a/dev-java/ant/files/1.5.2/ant b/dev-java/ant/files/1.5.2/ant
deleted file mode 100644
index e5f87d9a7009..000000000000
--- a/dev-java/ant/files/1.5.2/ant
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-
-#   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
-else
-  JAVA_HOME=`java-config --jdk-home`
-  if [ -z $JAVA_HOME ] ; then
-    JAVA_HOME=`java-config --jre-home`
-  fi
-  CLASSPATH=`java-config --classpath`:${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-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="${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."
-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
-
-# 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/1.5.3/1_6_backport-jdk142.patch.gz b/dev-java/ant/files/1.5.3/1_6_backport-jdk142.patch.gz
new file mode 100644
index 000000000000..871dfbf492fc
--- /dev/null
+++ b/dev-java/ant/files/1.5.3/1_6_backport-jdk142.patch.gz
diff --git a/dev-java/ant/files/build.sh-exit-fix.patch.gz b/dev-java/ant/files/build.sh-exit-fix.patch.gz
new file mode 100644
index 000000000000..9beb758d7e9e
--- /dev/null
+++ b/dev-java/ant/files/build.sh-exit-fix.patch.gz
diff --git a/dev-java/ant/files/digest-ant-1.5.2 b/dev-java/ant/files/digest-ant-1.5.2
deleted file mode 100644
index f3d175634339..000000000000
--- a/dev-java/ant/files/digest-ant-1.5.2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 2db5008ae90f3b508fa45b8bea36c9b6 /files/1.5.2/ant 2373
-MD5 6e22e7d1b121a847e107b6498f48e0a4 /files/1.5.3/ant 2207
-MD5 a5cb516430eda14e16893fe939a0fa6c /ant-1.5.2.ebuild 779
-MD5 f91504b3af51358c034fb926f4ce9895 apache-ant-1.5.2-bin.tar.bz2 5556999
diff --git a/dev-java/ant/files/digest-ant-1.5.3-r1 b/dev-java/ant/files/digest-ant-1.5.3-r1
deleted file mode 100644
index 44687baa8e4e..000000000000
--- a/dev-java/ant/files/digest-ant-1.5.3-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 2db5008ae90f3b508fa45b8bea36c9b6 /files/1.5.2/ant 2373
-MD5 6e22e7d1b121a847e107b6498f48e0a4 /files/1.5.3/ant 2207
-MD5 f1d02c26d73caf9e3d41973a42aa26b5 /ant-1.5.3-r1.ebuild 810
-MD5 49ea1624c2cab948d72042dee62932ae apache-ant-1.5.3-1-bin.tar.bz2 5547282
diff --git a/dev-java/ant/files/digest-ant-1.5.3-r2 b/dev-java/ant/files/digest-ant-1.5.3-r5
index 76649f44e954..76649f44e954 100644
--- a/dev-java/ant/files/digest-ant-1.5.3-r2
+++ b/dev-java/ant/files/digest-ant-1.5.3-r5