Unmasked; fix to close #19885.

4 files changed, 86 insertions, 3 deletions

diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 0cd24b6a580c..c90a674072c1 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,12 @@
 # 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.33 2003/04/26 11:34:38 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.34 2003/05/26 11:05:17 absinthe Exp $
+
+*ant-1.5.3-r4 (26 May 2003)
+
+  26 May 2003; Dylan Carlson <absinthe@gentoo.org> ant-1.5.3-r4.ebuild:
+  Time to unmask 1.5.3. -r4 includes a fix to include the supporting scripts to
+  close bug #19885.
 
 *ant-1.5.3-r3 (26 Apr 2003)
 
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 3be0eac85797..c9911cb9422e 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,9 +1,9 @@
 MD5 b1901db6cf78ceaa957e73bc9c54aeb6 ant-1.5.3-r2.ebuild 1185
-MD5 1730f4678dc5435e64c812aeaf419335 ant-1.5.3-r4.ebuild 2348
+MD5 37ea49c933f6ce5796efc1f13447fd86 ant-1.5.3-r4.ebuild 2348
 MD5 dea07a6a7bdeed8d09fe17b1abb80612 ant-1.5.3-r1.ebuild 794
 MD5 26f0e8c6f4c80d4c3640a095136f3548 ant-1.5.2.ebuild 763
 MD5 00133a66722da9962c066d944875b071 ant-1.5.3-r3.ebuild 2249
-MD5 9ad10b95c02a0412ed697a68a287e366 ChangeLog 6649
+MD5 83faeb4652dc676884c9fc294e103351 ChangeLog 6649
 MD5 854c1587f08c5c45367a51209fd4e75b files/digest-ant-1.5.2 251
 MD5 ae347922c99e3a595e2dcdb43521d8a6 files/digest-ant-1.5.3-r1 256
 MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r2 76
diff --git a/dev-java/ant/ant-1.5.3-r4.ebuild b/dev-java/ant/ant-1.5.3-r4.ebuild
new file mode 100644
index 000000000000..f4a35e71bf42
--- /dev/null
+++ b/dev-java/ant/ant-1.5.3-r4.ebuild
@@ -0,0 +1,76 @@
+# 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.1 2003/05/26 11:05:17 absinthe Exp $
+
+inherit java-pkg
+
+S="${WORKDIR}/apache-ant-${PV}-1"
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-1-src.tar.bz2"
+HOMEPAGE="http://ant.apache.org"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha"
+DEPEND="virtual/glibc"
+RDEPEND=">=virtual/jdk-1.3"
+IUSE="doc"
+
+src_compile() {
+	export JAVA_HOME=${JDK_HOME}
+	if [ `arch` == "ppc" ] ; then
+		# We're compiling _ON_ PPC
+		export THREADS_FLAG="green"
+	fi
+
+	# Make sure junit tasks get built if we have junit
+	if [ -f "/usr/share/junit/lib/junit.jar" ] ; then
+		export CLASSPATH="/usr/share/junit/lib/junit.jar"
+		export DEP_APPEND="junit"
+		if [ -f "/usr/share/xalan/lib/xalan.jar" ] ; then
+			export CLASSPATH="${CLASSPATH}:/usr/share/xalan/lib/xalan.jar"
+			export DEP_APPEND="${DEP_APPEND} xalan"
+		fi
+	fi
+	
+	# Add Xerces in if we have it
+	if [ -f "/usr/share/xerces/lib/xercesImpl.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/xerces/lib/xercesImpl.jar:/usr/share/xerces/lib/xml-apis.jar"
+		export DEP_APPEND="${DEP_APPEND} xerces"
+	fi
+
+	# Add oro in if we have it
+	if [ -f "/usr/share/oro/lib/oro.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/oro/lib/oro.jar"
+		export DEP_APPEND="${DEP_APPEND} oro"
+	fi
+	
+	# Add beanutils if we have it
+	if [ -f "/usr/share/commons-beanutils/lib/commons-beanutils.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/commons-beanutils/lib/commons-beanutils.jar"
+		export DEP_APPEND="${DEP_APPEND} commons-beanutils"
+	fi
+
+	# add antlr if we have it
+	if [ -f "/usr/share/antlr/lib/antlr.jar" ] ; then
+		export CLASSPATH="${CLASSPATH}:/usr/share/antlr/lib/antlr.jar"
+		export DEP_APPEND="${DEP_APPEND} antlr"
+	fi
+	
+	./build.sh -Ddist.dir=${D}/usr/share/ant || die
+}
+
+src_install() {
+	cp ${FILESDIR}/${PV}/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
+
+	java-pkg_dojar build/lib/*.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.5.3-r4 b/dev-java/ant/files/digest-ant-1.5.3-r4
new file mode 100644
index 000000000000..76649f44e954
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.5.3-r4
@@ -0,0 +1 @@
+MD5 b360fe06ad344df9f6e0b3f3ce0f9c60 apache-ant-1.5.3-1-src.tar.bz2 4486166