Some fixes needed to be applied before I unmask this beast.

4 files changed, 33 insertions, 15 deletions

diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 71cf1783aea9..8239984aae9d 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,10 @@
 # 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.54 2004/03/11 02:34:01 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.55 2004/03/11 20:37:24 zx Exp $
+
+  11 Mar 2004; Chris Aniszczyk <zx@gentoo.org> ant-1.6.0-r2.ebuild,
+  ant-1.6.1.ebuild:
+  Added some fixes. Thanks to Pavel <hlobil@sympatico.ca> for some input.
 
 *ant-1.6.1 (10 Mar 2004)
 
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index a76ac22b6281..fbd66e4d3158 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,9 +1,9 @@
 MD5 2e9b0a5d21fc23566a2c798663715690 ant-1.5.3-r5.ebuild 2940
-MD5 31f33790b2830745a08cebebc0f6d8dc ant-1.6.0-r2.ebuild 1612
+MD5 f4e64adea8ec934cf9cfe3715209396f ant-1.6.0-r2.ebuild 1599
 MD5 2acaf3fb7d61e01bcb633090b34b2979 ant-1.5.4-r1.ebuild 2977
-MD5 06e534b79b89508bd508bf74a0abfac6 ant-1.6.1.ebuild 1717
+MD5 935b983193b52a96e8ddc04439282109 ant-1.6.1.ebuild 2152
 MD5 9c571ad4ad3cbbce68817f540248d714 ant-1.6.0-r3.ebuild 1593
-MD5 8a4f8c156474cf9d76e0691859629801 ChangeLog 9835
+MD5 721ae0133cd2a1e246c123d70cd1f3ca ChangeLog 9998
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 9796e31a633d28a00242c76325bb85b4 files/20ant 26
 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1 74
diff --git a/dev-java/ant/ant-1.6.0-r2.ebuild b/dev-java/ant/ant-1.6.0-r2.ebuild
index 688e8ab04590..dc91847b134f 100644
--- a/dev-java/ant/ant-1.6.0-r2.ebuild
+++ b/dev-java/ant/ant-1.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.4 2004/02/25 07:39:32 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.0-r2.ebuild,v 1.5 2004/03/11 20:37:24 zx 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="-* ~amd64 ~x86"
+KEYWORDS="-* ~x86"
 DEPEND="virtual/glibc
 	>=virtual/jdk-1.4
 	>=dev-java/java-config-1.2"
diff --git a/dev-java/ant/ant-1.6.1.ebuild b/dev-java/ant/ant-1.6.1.ebuild
index 10f1370a4a88..334152c96c61 100644
--- a/dev-java/ant/ant-1.6.1.ebuild
+++ b/dev-java/ant/ant-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2004/03/11 02:34:01 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.1.ebuild,v 1.2 2004/03/11 20:37:24 zx Exp $
 
 inherit java-pkg
 
@@ -24,6 +24,24 @@ IUSE="doc"
 
 S="${WORKDIR}/apache-ant-${PV}"
 
+pkg_setup() {
+	if [ -n "$JAVA_HOME" ] ; then
+		export CLASSPATH=".:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar:$JAVA_HOME/jre/lib/rt.jar:."
+	else
+		einfo "Warning: JAVA_HOME environment variable is not set (or not exported)."
+		einfo "  If build fails because sun.* classes could not be found"
+		einfo "  you will need to set the JAVA_HOME environment variable"
+		einfo "  to the installation directory of java."
+		einfo "  Try using java-config script"
+		die
+	fi
+
+	if [ `arch` == "ppc" ] ; then
+		# We're compiling _ON_ PPC
+		export THREADS_FLAG="green"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -34,15 +52,11 @@ src_unpack() {
 }
 
 src_compile() {
-
-	[ -z ${JDK_HOME} ] && einfo "JDK_HOME not set, please check with java-config" && die
-
 	addwrite "/proc/self/maps"
-	export JAVA_HOME=${JDK_HOME}
-	if [ `arch` == "ppc" ] ; then
-		# We're compiling _ON_ PPC
-		export THREADS_FLAG="green"
-	fi
+
+	local myc
+	myc="${myc} -Ddist.dir=${D}/usr/share/ant"
+	myc="${myc} -Djavac.target=1.4"
 
 	./build.sh -Ddist.dir=${D}/usr/share/ant || die
 }