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

11 files changed, 91 insertions, 204 deletions

diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index ab452d3e5320..d0a12865eaa3 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,18 +1,11 @@
-MD5 5fbebcdec8c734b6cd100476b12c3b18 ant-1.5.3-r5.ebuild 2626
-MD5 123d3e8b98bff25cd9e5d8079f7c30d0 ant-1.5.3-r2.ebuild 1181
+MD5 ca0cee3cda49e4c29dd41eeb10ed8753 ant-1.5.3-r5.ebuild 2723
 MD5 37ea49c933f6ce5796efc1f13447fd86 ant-1.5.3-r4.ebuild 2348
-MD5 0d9f992b9a1ca7ee6a3570d7d3f6e219 ant-1.5.3-r1.ebuild 790
-MD5 26f0e8c6f4c80d4c3640a095136f3548 ant-1.5.2.ebuild 763
 MD5 f33f280117cdd28e922dacd3ecf1511f ant-1.5.3-r3.ebuild 2244
-MD5 83faeb4652dc676884c9fc294e103351 ChangeLog 6649
+MD5 e653b8459dcfe05e6b4e8197df82aa29 ChangeLog 6958
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 854c1587f08c5c45367a51209fd4e75b files/digest-ant-1.5.2 251
 MD5 f3735fcade77d65a1c47338fe8662b43 files/build.sh-exit-fix.patch.gz 269
-MD5 ae347922c99e3a595e2dcdb43521d8a6 files/digest-ant-1.5.3-r1 256
-MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r2 76
 MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r3 76
 MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r4 76
 MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r5 76
-MD5 2db5008ae90f3b508fa45b8bea36c9b6 files/1.5.2/ant 2373
 MD5 6e22e7d1b121a847e107b6498f48e0a4 files/1.5.3/ant 2207
 MD5 4807f353ae3c243717ccd5bcdc8ee3cf files/1.5.3/1_6_backport-jdk142.patch.gz 940
diff --git a/dev-java/ant/ant-1.5.2.ebuild b/dev-java/ant/ant-1.5.2.ebuild
deleted file mode 100644
index 6df9a9fb1058..000000000000
--- a/dev-java/ant/ant-1.5.2.ebuild
+++ /dev/null
@@ -1,26 +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.5.2.ebuild,v 1.3 2003/04/26 05:36:58 strider Exp $
-
-S=${WORKDIR}/apache-ant-${PV}
-DESCRIPTION="Build system for Java"
-SRC_URI="mirror://apache/ant/binaries/apache-ant-${PV}-bin.tar.bz2"
-HOMEPAGE="http://ant.apache.org"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~alpha"
-DEPEND="virtual/glibc
-	>=virtual/jdk-1.3"
-RDEPEND=">=virtual/jdk-1.3"
-IUSE="doc"
-
-src_install() {
-	mkdir src
-	cp ${FILESDIR}/${PV}/ant src/ant
-	exeinto /usr/bin
-	doexe src/ant
-	dojar lib/*.jar lib/*.jar
-	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
-	use doc && dohtml welcome.html
-	use doc && dohtml -r docs/*
-}
diff --git a/dev-java/ant/ant-1.5.3-r1.ebuild b/dev-java/ant/ant-1.5.3-r1.ebuild
deleted file mode 100644
index ecf0dfb407b0..000000000000
--- a/dev-java/ant/ant-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,27 +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.5.3-r1.ebuild,v 1.3 2003/07/11 21:41:44 aliz Exp $
-
-S="${WORKDIR}/apache-ant-${PV}-1"
-DESCRIPTION="Build system for Java"
-SRC_URI="mirror://apache/ant/binaries/apache-ant-${PV}-1-bin.tar.bz2"
-HOMEPAGE="http://ant.apache.org"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-DEPEND="virtual/glibc
-	>=virtual/jdk-1.3"
-RDEPEND=">=virtual/jdk-1.3"
-IUSE="doc"
-
-src_install() {
-	cd ${S}
-	mkdir ${S}/src
-	cp ${FILESDIR}/${PV}/ant ${S}/src/ant
-	exeinto /usr/bin
-	doexe src/ant
-	dojar lib/*.jar lib/*.jar
-	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
-	use doc && dohtml welcome.html
-	use doc && dohtml -r docs/*
-}
diff --git a/dev-java/ant/ant-1.5.3-r2.ebuild b/dev-java/ant/ant-1.5.3-r2.ebuild
deleted file mode 100644
index 49cb50d0a09d..000000000000
--- a/dev-java/ant/ant-1.5.3-r2.ebuild
+++ /dev/null
@@ -1,41 +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.5.3-r2.ebuild,v 1.3 2003/07/11 21:41:45 aliz Exp $
-
-S="${WORKDIR}/apache-ant-${PV}-1"
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
-SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-1-src.tar.bz2"
-HOMEPAGE="http://ant.apache.org"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-DEPEND="virtual/glibc
-	>=virtual/jdk-1.3"
-RDEPEND=">=virtual/jdk-1.3"
-IUSE="doc"
-
-src_compile() {
-	export JAVA_HOME=${JDK_HOME}
-	if [ `arch` == "ppc" ] ; then
-		# We're compiling _ON_ PPC
-		export THREADS_FLAG="green"
-	fi
-	if [ -f /usr/share/junit/lib/junit.jar ] ; then
-		# make sure junit tasks get built if we have junit
-		export CLASSPATH=/usr/share/junit/lib/junit.jar
-	fi
-	./build.sh -Ddist.dir=${D}/usr/share/ant || die
-}
-
-src_install() {
-	cp ${FILESDIR}/${PV}/ant ${S}/src/ant
-
-	exeinto /usr/bin
-	doexe src/ant
-
-	dojar build/lib/*.jar build/lib/*.jar
-
-	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
-	use doc && dohtml welcome.html
-	use doc && dohtml -r docs/*
-}
diff --git a/dev-java/ant/ant-1.5.3-r5.ebuild b/dev-java/ant/ant-1.5.3-r5.ebuild
new file mode 100644
index 000000000000..2f6fbe0b644b
--- /dev/null
+++ b/dev-java/ant/ant-1.5.3-r5.ebuild
@@ -0,0 +1,89 @@
+# 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.3-r5.ebuild,v 1.1 2003/08/08 23:55:25 strider Exp $
+
+inherit java-pkg
+
+S="${WORKDIR}/apache-ant-${PV}-1"
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-1-src.tar.bz2"
+HOMEPAGE="http://ant.apache.org"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+DEPEND="virtual/glibc"
+RDEPEND=">=virtual/jdk-1.3"
+IUSE="doc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Patch build.sh to die with non-zero exit code in case of errors.
+	# This patch may be useful for all ant versions.
+	epatch ${FILESDIR}/build.sh-exit-fix.patch.gz
+	
+	# Incorporate changes from upcoming ant-1.6 into 1.5.3 to 
+	# enable building ant with java >=sun-jdk-1.4.2
+	epatch ${FILESDIR}/${PV}/1_6_backport-jdk142.patch.gz
+}
+
+src_compile() {
+	export JAVA_HOME=${JDK_HOME}
+	if [ `arch` == "ppc" ] ; then
+		# We're compiling _ON_ PPC
+		export THREADS_FLAG="green"
+	fi
+
+	# Make sure junit tasks get built if we have junit
+	if [ -f "/usr/share/junit/lib/junit.jar" ] ; then
+		export CLASSPATH="/usr/share/junit/lib/junit.jar"
+		export DEP_APPEND="junit"
+		if [ -f "/usr/share/xalan/lib/xalan.jar" ] ; then
+			export CLASSPATH="${CLASSPATH}:/usr/share/xalan/lib/xalan.jar"
+			export DEP_APPEND="${DEP_APPEND} xalan"
+		fi
+	fi
+	
+	# Add Xerces in if we have it
+	if [ -f "/usr/share/xerces/lib/xercesImpl.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/xerces/lib/xercesImpl.jar:/usr/share/xerces/lib/xml-apis.jar"
+		export DEP_APPEND="${DEP_APPEND} xerces"
+	fi
+
+	# Add oro in if we have it
+	if [ -f "/usr/share/oro/lib/oro.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/oro/lib/oro.jar"
+		export DEP_APPEND="${DEP_APPEND} oro"
+	fi
+	
+	# Add beanutils if we have it
+	if [ -f "/usr/share/commons-beanutils/lib/commons-beanutils.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/commons-beanutils/lib/commons-beanutils.jar"
+		export DEP_APPEND="${DEP_APPEND} commons-beanutils"
+	fi
+
+	# add antlr if we have it
+	if [ -f "/usr/share/antlr/lib/antlr.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/antlr/lib/antlr.jar"
+		export DEP_APPEND="${DEP_APPEND} antlr"
+	fi
+	
+	./build.sh -Ddist.dir=${D}/usr/share/ant || die
+}
+
+src_install() {
+	cp ${FILESDIR}/${PV}/ant ${S}/src/ant
+	
+	exeinto /usr/bin
+	doexe src/ant
+	for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do
+		dobin ${S}/src/script/${each}
+	done
+
+	java-pkg_dojar build/lib/*.jar
+	
+	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
+	use doc && dohtml welcome.html
+	use doc && dohtml -r docs/*
+}
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