Ant 1.5.4 moved to stable, testing ant-1.5.4-r1

7 files changed, 29 insertions, 14 deletions

diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 597a3ff6ab33..951667bf9aeb 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,14 @@
 # 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.37 2003/09/22 03:44:49 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.38 2003/10/18 14:53:59 strider Exp $
+
+*ant-1.5.4-r1 (13 Oct 2003)
+
+  13 Oct 2003; Adrian Almenar <strider@gentoo.org> ant-1.5.4-r1.ebuild:
+  Thanks to Gunnlaugur Thor Briem <gthb@hi.is>.
+  Fix http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14650
+  (RPM package builds using rpm task failed with newer rpm versions
+  such as the current stable one in portage)
 
 *ant-1.5.4 (21 Sep 2003)
 
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index a03e56305977..3f1c764f8084 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,14 +1,11 @@
 MD5 9a80994bf7c188df380eb3014d2fc073 ant-1.5.3-r5.ebuild 2930
-MD5 5e82c06e98540b321787e018d29a6d18 ant-1.5.4-r1.ebuild 2786
-MD5 882fd00852fd68f6f7da1b8fb7e63572 ant-1.5.3-r4.ebuild 2560
-MD5 8fcb3ee741e6a24509c4784844dae921 ant-1.5.4-r1.ebuild.tar 20480
-MD5 240d8abe162ba66dea08aeb0d23fdb4b ChangeLog 7695
+MD5 599e670190d0e2426604c775202fb5da ant-1.5.4-r1.ebuild 2789
+MD5 9d0dbb8f615c5c282ef8b179b0e44842 ChangeLog 7695
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 7d42025737144e2f16a3b638f6f440b9 ant-1.5.4.ebuild 2748
+MD5 851e93fadaf5b4c9ec04e34096ddd49d ant-1.5.4.ebuild 2744
 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-r4 76
 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
diff --git a/dev-java/ant/ant-1.5.3-r4.ebuild b/dev-java/ant/ant-1.5.4-r1.ebuild
index af3050a6fe66..fa850af1078e 100644
--- a/dev-java/ant/ant-1.5.3-r4.ebuild
+++ b/dev-java/ant/ant-1.5.4-r1.ebuild
@@ -1,21 +1,31 @@
 # 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-r4.ebuild,v 1.3 2003/09/22 03:44:49 strider Exp $
+# $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 $
 
 inherit java-pkg
 
-S="${WORKDIR}/apache-ant-${PV}-1"
+S="${WORKDIR}/apache-ant-${PV}"
 DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
-SRC_URI="http://archive.apache.org/dist/ant/source/apache-${PN}-${PV}-1-src.tar.bz2"
+SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-src.tar.bz2"
 HOMEPAGE="http://ant.apache.org"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 DEPEND="virtual/glibc
 	>=virtual/jdk-1.3"
 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
+	epatch ${FILESDIR}/rpmbuild.patch.gz
+}
+
 src_compile() {
 	export JAVA_HOME=${JDK_HOME}
 	if [ `arch` == "ppc" ] ; then
diff --git a/dev-java/ant/ant-1.5.4.ebuild b/dev-java/ant/ant-1.5.4.ebuild
index 7b04a626c884..a84870f64fa6 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.1 2003/09/22 03:44:49 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.4.ebuild,v 1.2 2003/10/18 14:53:59 strider Exp $
 
 inherit java-pkg
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-src.tar.bz2"
 HOMEPAGE="http://ant.apache.org"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha"
 DEPEND="virtual/glibc
 	>=virtual/jdk-1.3"
 RDEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/ant/files/digest-ant-1.5.3-r4 b/dev-java/ant/files/digest-ant-1.5.3-r4
deleted file mode 100644
index 76649f44e954..000000000000
--- a/dev-java/ant/files/digest-ant-1.5.3-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b360fe06ad344df9f6e0b3f3ce0f9c60 apache-ant-1.5.3-1-src.tar.bz2 4486166
diff --git a/dev-java/ant/files/digest-ant-1.5.4-r1 b/dev-java/ant/files/digest-ant-1.5.4-r1
new file mode 100644
index 000000000000..68c0f258dcd2
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.5.4-r1
@@ -0,0 +1 @@
+MD5 bfac23721c24e77d0b1c383200327ff6 apache-ant-1.5.4-src.tar.bz2 4537009
diff --git a/dev-java/ant/files/rpmbuild.patch.gz b/dev-java/ant/files/rpmbuild.patch.gz
new file mode 100644
index 000000000000..0a86f9559513
--- /dev/null
+++ b/dev-java/ant/files/rpmbuild.patch.gz