fix classpath in wrapper script, bug 64410

5 files changed, 17 insertions, 11 deletions

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 57c70b086e8b..858f59adbf33 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.3 2004/09/17 00:08:24 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.4 2004/09/17 16:02:33 axxo Exp $
+
+*ant-core-1.5.4-r1 (17 Sep 2004)
+
+  17 Sep 2004; Thomas Matthijs <axxo@gentoo.org> files/1.5.4-ant,
+  +ant-core-1.5.4-r1.ebuild, -ant-core-1.5.4.ebuild:
+  fix classpath in wrapper script, bug 64410
 
   17 Sep 2004; Thomas Matthijs <axxo@gentoo.org> files/1.6.2-ant:
   respect JAVA_HOME, bug 61665
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 4b2e55172bfa..39ba5b317235 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 40aa3e15b499670f159be6f3c96753d3 ant-core-1.5.4.ebuild 3037
 MD5 037813c558155f6d4db1cd8a1179456b ant-core-1.6.2.ebuild 1774
-MD5 916976adc68ae9a416128752177c175a ChangeLog 14022
+MD5 495c7e66ac434cfb5365ce9d00a4be45 ChangeLog 14221
+MD5 e52af96e1f5a0cdc880563db4f205ce5 ant-core-1.5.4-r1.ebuild 3040
 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
-MD5 b876b365c3d68c3dc528148056af16f9 files/1.5.4-ant 2278
+MD5 d7186edf4c71dc0531330f90e2c08fe9 files/1.5.4-ant 2283
 MD5 5c9edba8c5a6444d657c7243946012bf files/1.6.2-ant 5009
 MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256
 MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164
-MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-core-1.5.4 70
+MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-core-1.5.4-r1 70
 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2 74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBSiuK/rLF9B432nYRAmPHAJ41on3ybuy9DRtCRkGa7w7YXvRhIgCgzKKL
-ikXGyCDhu0gV8jqoE4tq8Q8=
-=Oec1
+iD8DBQFBSwqr/rLF9B432nYRAggBAJ47XhjhIhlQCugovJWSkSpbn45mOwCfVgsy
+eg1T9WICV1T9WGqhDq3h76E=
+=wxRn
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-core/ant-core-1.5.4.ebuild b/dev-java/ant-core/ant-core-1.5.4-r1.ebuild
index 4d1f0d060db7..dd07cb752e63 100644
--- a/dev-java/ant-core/ant-core-1.5.4.ebuild
+++ b/dev-java/ant-core/ant-core-1.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.5.4.ebuild,v 1.1 2004/09/10 19:45:18 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.5.4-r1.ebuild,v 1.1 2004/09/17 16:02:33 axxo Exp $
 
 inherit java-pkg eutils
 
diff --git a/dev-java/ant-core/files/1.5.4-ant b/dev-java/ant-core/files/1.5.4-ant
index af8bf4f6a15d..c940b86dc36c 100644
--- a/dev-java/ant-core/files/1.5.4-ant
+++ b/dev-java/ant-core/files/1.5.4-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-core/files/1.5.4-ant,v 1.1 2004/09/10 19:45:18 axxo Exp $
+#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.5.4-ant,v 1.2 2004/09/17 16:02:33 axxo Exp $
 
 if [ -f $HOME/.gentoo/java-env ] ; then
   source $HOME/.gentoo/java-env
@@ -55,7 +55,7 @@ if [ -n "$CLASSPATH" ] ; then
 fi
 
 # add in the dependency .jar files
-LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant`"
+LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant-core`"
 
 if [ -n "$JAVA_HOME" ] ; then
   if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
diff --git a/dev-java/ant-core/files/digest-ant-core-1.5.4 b/dev-java/ant-core/files/digest-ant-core-1.5.4-r1
index 80802420362a..80802420362a 100644
--- a/dev-java/ant-core/files/digest-ant-core-1.5.4
+++ b/dev-java/ant-core/files/digest-ant-core-1.5.4-r1