Removed some USE flags for this package since people dont use them, and create a lot of bug reports about it.

6 files changed, 76 insertions, 7 deletions

diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 1eb1c2183710..2f25abe357c3 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.47 2004/01/20 04:24:24 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.48 2004/02/10 06:15:09 strider Exp $
+
+*ant-1.6.0-r3 (10 Feb 2004)
+
+  10 Feb 2004; Adrian Almenar <strider@gentoo.org> ant-1.6.0-r3.ebuild:
+  Removed some USE flags for this package since people dont use them, and create a lot of bug reports about it.
 
   20 Jan 2004; Adrian Almenar <strider@gentoo.org> ant-1.6.0-r2.ebuild:
   Added ~x86 keyword.
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 912ede1e3cd9..bb79f3b586e0 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,6 +1,7 @@
 MD5 98241290f78b31e493e61b4cc5a9c58e ant-1.5.3-r5.ebuild 2947
 MD5 02f5cb2ace81c4d81cf18717fe245cf8 ant-1.6.0-r2.ebuild 1611
 MD5 cdba0dc1a042893f745a2fb4aeaa68ef ant-1.5.4-r1.ebuild 2884
+MD5 47d6cefe0b8afb2ca59f768c578f6258 ant-1.6.0-r3.ebuild 1577
 MD5 f9c9eed672b73de95fc6b19d5356bf5a ChangeLog 8882
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 9796e31a633d28a00242c76325bb85b4 files/20ant 26
@@ -9,6 +10,7 @@ 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 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-1.6.0-r2 74
+MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-1.6.0-r3 74
 MD5 5841a69d6263fda47a60334730e1e0c0 files/1.6.0-r2/ant 2441
 MD5 4233391fc580c36c78c9f2bc2057327f files/1.5.3/ant 2208
 MD5 9cb067e9b0997856af50e7e117263596 files/1.5.3/1_6_backport-jdk142.patch.gz 916
diff --git a/dev-java/ant/ant-1.5.3-r5.ebuild b/dev-java/ant/ant-1.5.3-r5.ebuild
index aa1054adb5ae..8126784afb60 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.
+# Copyright 1999-2004 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.5 2003/10/18 15:03:11 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.3-r5.ebuild,v 1.6 2004/02/10 06:15:09 strider Exp $
 
 inherit java-pkg
 
@@ -10,7 +10,7 @@ SRC_URI="http://archive.apache.org/dist/ant/source/apache-${PN}-${PV}-1-src.tar.
 HOMEPAGE="http://ant.apache.org"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 ppc sparc"
 DEPEND="virtual/glibc
 	>=virtual/jdk-1.3"
 RDEPEND=">=virtual/jdk-1.3
diff --git a/dev-java/ant/ant-1.5.4-r1.ebuild b/dev-java/ant/ant-1.5.4-r1.ebuild
index 975bbbc388c9..b5289c919c8f 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.
+# Copyright 1999-2004 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.5 2003/11/20 11:58:25 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.4-r1.ebuild,v 1.6 2004/02/10 06:15:09 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"
 DEPEND="virtual/glibc
 	>=virtual/jdk-1.3"
 RDEPEND=">=virtual/jdk-1.3
diff --git a/dev-java/ant/ant-1.6.0-r3.ebuild b/dev-java/ant/ant-1.6.0-r3.ebuild
new file mode 100644
index 000000000000..f574615738f3
--- /dev/null
+++ b/dev-java/ant/ant-1.6.0-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.0-r3.ebuild,v 1.1 2004/02/10 06:15:09 strider Exp $
+
+inherit java-pkg
+
+S="${WORKDIR}/apache-ant-${PV}"
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-src.tar.bz2"
+HOMEPAGE="http://ant.apache.org"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+DEPEND="virtual/glibc
+	>=virtual/jdk-1.4
+	>=dev-java/java-config-1.2"
+RDEPEND=">=virtual/jdk-1.4
+	app-shells/bash
+	>=dev-java/java-config-1.2"
+PDEPEND="=dev-java/ant-optional-1.6.0-r3"
+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
+}
+
+src_compile() {
+
+	addwrite "/proc/self/maps"
+	export JAVA_HOME=${JDK_HOME}
+	if [ `arch` == "ppc" ] ; then
+		# We're compiling _ON_ PPC
+		export THREADS_FLAG="green"
+	fi
+
+	./build.sh -Ddist.dir=${D}/usr/share/ant || die
+}
+
+src_install() {
+	cp ${FILESDIR}/${PV}-${PR}/ant ${S}/src/ant
+	exeinto /usr/bin
+	doexe src/ant
+	for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do
+		dobin ${S}/src/script/${each}
+	done
+
+	insinto /etc/env.d
+	doins ${FILESDIR}/20ant
+
+	java-pkg_dojar build/lib/ant.jar
+	java-pkg_dojar build/lib/ant-launcher.jar
+
+	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
+	use doc && dohtml welcome.html
+	use doc && dohtml -r docs/*
+}
diff --git a/dev-java/ant/files/digest-ant-1.6.0-r3 b/dev-java/ant/files/digest-ant-1.6.0-r3
new file mode 100644
index 000000000000..dd7fbab35622
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.6.0-r3
@@ -0,0 +1 @@
+MD5 18aed5aa33951aa85c237fc4139bad6e apache-ant-1.6.0-src.tar.bz2 6217526