Fixes bug #31006

7 files changed, 24 insertions, 17 deletions

diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 951667bf9aeb..7c5ceb78dae2 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.38 2003/10/18 14:53:59 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.39 2003/10/18 15:03:11 strider Exp $
+
+  18 Oct 2003; Adrian Almenar <strider@gentoo.org> ant-1.5.3-r5.ebuild,
+  ant-1.5.4-r1.ebuild, ant-1.5.4.ebuild, files/1.5.3/ant, files/1.5.4/ant:
+  Fixes bug #31006
 
 *ant-1.5.4-r1 (13 Oct 2003)
 
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 3f1c764f8084..9929f97c7d5d 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,13 +1,13 @@
-MD5 9a80994bf7c188df380eb3014d2fc073 ant-1.5.3-r5.ebuild 2930
-MD5 599e670190d0e2426604c775202fb5da ant-1.5.4-r1.ebuild 2789
-MD5 9d0dbb8f615c5c282ef8b179b0e44842 ChangeLog 7695
+MD5 98241290f78b31e493e61b4cc5a9c58e ant-1.5.3-r5.ebuild 2947
+MD5 2fdc315045ca8ad73261ad11cedc6303 ant-1.5.4-r1.ebuild 2806
+MD5 75d62a9506866a3db37e5d43d9c02fd7 ChangeLog 7862
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 851e93fadaf5b4c9ec04e34096ddd49d ant-1.5.4.ebuild 2744
+MD5 16fc30727700598832d64bbdda5d897a ant-1.5.4.ebuild 2761
 MD5 8d9dbdc8011a4b6ca468537db70bd4fb files/digest-ant-1.5.4 74
 MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256
 MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164
 MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r5 76
 MD5 8d9dbdc8011a4b6ca468537db70bd4fb files/digest-ant-1.5.4-r1 74
-MD5 6e22e7d1b121a847e107b6498f48e0a4 files/1.5.3/ant 2207
+MD5 4233391fc580c36c78c9f2bc2057327f files/1.5.3/ant 2208
 MD5 9cb067e9b0997856af50e7e117263596 files/1.5.3/1_6_backport-jdk142.patch.gz 916
-MD5 42d14e6ea90cdb790e61fb8a044aa091 files/1.5.4/ant 2270
+MD5 e285a4a8da9b4f50a458433377f9b130 files/1.5.4/ant 2272
diff --git a/dev-java/ant/ant-1.5.3-r5.ebuild b/dev-java/ant/ant-1.5.3-r5.ebuild
index fd400f7050e7..aa1054adb5ae 100644
--- a/dev-java/ant/ant-1.5.3-r5.ebuild
+++ b/dev-java/ant/ant-1.5.3-r5.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2003/09/22 03:44:49 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.3-r5.ebuild,v 1.5 2003/10/18 15:03:11 strider Exp $
 
 inherit java-pkg
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
 DEPEND="virtual/glibc
 	>=virtual/jdk-1.3"
-RDEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jdk-1.3
+	app-shells/bash"
 IUSE="doc"
 
 src_unpack() {
diff --git a/dev-java/ant/ant-1.5.4-r1.ebuild b/dev-java/ant/ant-1.5.4-r1.ebuild
index fa850af1078e..b6aa741a6fb8 100644
--- a/dev-java/ant/ant-1.5.4-r1.ebuild
+++ b/dev-java/ant/ant-1.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4-r1.ebuild,v 1.1 2003/10/18 14:53:59 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.4-r1.ebuild,v 1.2 2003/10/18 15:03:11 strider Exp $
 
 inherit java-pkg
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 DEPEND="virtual/glibc
 	>=virtual/jdk-1.3"
-RDEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jdk-1.3
+	app-shells/bash"
 IUSE="doc"
 
 src_unpack() {
diff --git a/dev-java/ant/ant-1.5.4.ebuild b/dev-java/ant/ant-1.5.4.ebuild
index a84870f64fa6..6873dabc6e9b 100644
--- a/dev-java/ant/ant-1.5.4.ebuild
+++ b/dev-java/ant/ant-1.5.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.2 2003/10/18 14:53:59 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.4.ebuild,v 1.3 2003/10/18 15:03:11 strider Exp $
 
 inherit java-pkg
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
 DEPEND="virtual/glibc
 	>=virtual/jdk-1.3"
-RDEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jdk-1.3
+	app-shells/bash"
 IUSE="doc"
 
 src_unpack() {
diff --git a/dev-java/ant/files/1.5.3/ant b/dev-java/ant/files/1.5.3/ant
index ba30f64dfc6f..8d9ce6bc6ff6 100644
--- a/dev-java/ant/files/1.5.3/ant
+++ b/dev-java/ant/files/1.5.3/ant
@@ -1,9 +1,9 @@
-#! /bin/sh
+#! /bin/bash
 
 #   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.3/ant,v 1.1 2003/04/15 21:10:04 absinthe Exp $
+#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.5.3/ant,v 1.2 2003/10/18 15:03:11 strider Exp $
 
 if [ -f $HOME/.gentoo/java-env ] ; then
   source $HOME/.gentoo/java-env
diff --git a/dev-java/ant/files/1.5.4/ant b/dev-java/ant/files/1.5.4/ant
index 5031617026f2..719d08e4aff5 100644
--- a/dev-java/ant/files/1.5.4/ant
+++ b/dev-java/ant/files/1.5.4/ant
@@ -1,9 +1,9 @@
-#! /bin/sh
+#! /bin/bash
 
 #   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.4/ant,v 1.2 2003/09/22 04:01:22 strider Exp $
+#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.5.4/ant,v 1.3 2003/10/18 15:03:11 strider Exp $
 
 if [ -f $HOME/.gentoo/java-env ] ; then
   source $HOME/.gentoo/java-env