--- /usr/portage/dev-java/ant-core/files/1.6.5-ant	2006-07-23 01:35:33.000000000 +0200
+++ files/1.6.5-ant	2006-08-03 01:54:08.000000000 +0200
@@ -82,7 +82,13 @@
 ANT_HOME=/usr/share/ant-core
 
 # set ANT_LIB location
-ANT_LIB="${ANT_HOME}/lib"
+# add in the dependency .jar files
+if [[ -d /usr/share/ant-tasks/lib && "${JAVA_PKG_FORCE_NOANTTASKS}" != "yes" ]] ; then
+    LIBCLASSPATH="-lib `java-config --classpath=log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,sun-jaf-bin,sun-javamail-bin 2> /dev/null`"
+    ANT_LIB="${ANT_HOME}/lib"
+else
+    ANT_LIB="${ANT_HOME}/lib-core"
+fi
 
 if [ -z "$JAVACMD" ] ; then
   if [ -n "$JAVA_HOME"  ] ; then
@@ -107,8 +113,7 @@
   LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
 fi
 
-# add in the dependency .jar files
-LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,sun-jaf-bin,sun-javamail-bin 2> /dev/null`"
+    
 
 if [ -n "$JAVA_HOME" ] ; then
   if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
@@ -163,7 +168,7 @@
 fi
 
 
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
+ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $LIBCLASSPATH $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
 
 if $ant_exec_debug ; then
     echo $ant_exec_command