From 436c5bc21f143350d6b04784a302e846c11b1acc Mon Sep 17 00:00:00 2001
From: Chris Aniszczyk <zx@gentoo.org>
Date: Wed, 17 Mar 2004 03:31:58 +0000
Subject: Precious updates to use new launcher class, closes #44804

---
 dev-java/ant/files/1.6.1/ant           | 12 +++++++-----
 dev-java/ant/files/digest-ant-1.6.1-r1 |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 dev-java/ant/files/digest-ant-1.6.1-r1

(limited to 'dev-java/ant/files')

diff --git a/dev-java/ant/files/1.6.1/ant b/dev-java/ant/files/1.6.1/ant
index 39d574906892..1145ee266800 100644
--- a/dev-java/ant/files/1.6.1/ant
+++ b/dev-java/ant/files/1.6.1/ant
@@ -3,7 +3,7 @@
 #   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.6.1/ant,v 1.1 2004/03/11 02:35:50 zx Exp $
+#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.6.1/ant,v 1.2 2004/03/17 03:31:58 zx Exp $
 
 if [ -f $HOME/.gentoo/java-env ] ; then
   source $HOME/.gentoo/java-env
@@ -50,12 +50,13 @@ if [ ! -x "$JAVACMD" ] ; then
   exit 1
 fi
 
-if [ -n "$CLASSPATH" ] ; then
-  LOCALCLASSPATH="$CLASSPATH"
+if [ -z "$LOCALCLASSPATH" ] ; then
+    LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
+else
+	LOCALCLASSPATH="$ANT_LIB/ant-launcher.jar:${LOCALCLASSPATH}:`java-config --classpath=ant,ant-optional,log4j,xerces,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-logging,commons-net,oro,jdepend,jsch,regexp,rhino,jython,jta,jaf,javamail 2> /dev/null`"
 fi
 
 # add in the dependency .jar files
-LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant,ant-optional,log4j,xerces,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-logging,commons-net,oro,jdepend,jsch,regexp,rhino,jython,jta,jaf,javamail 2> /dev/null`"
 
 if [ -n "$JAVA_HOME" ] ; then
   if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
@@ -86,4 +87,5 @@ 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 "$@"
+"$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" org.apache.tools.ant.launch.Launcher $ANT_ARGS -lib "$CLASSPATH" "$@"
+
diff --git a/dev-java/ant/files/digest-ant-1.6.1-r1 b/dev-java/ant/files/digest-ant-1.6.1-r1
new file mode 100644
index 000000000000..60b89a8cc1ed
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.6.1-r1
@@ -0,0 +1 @@
+MD5 3e1f06aae6b691543299ccb1a5cb038f apache-ant-1.6.1-src.tar.bz2 6203438
-- 
cgit v1.2.3-65-gdbad