version bump

9 files changed, 267 insertions, 10 deletions

diff --git a/dev-java/ant-optional/ChangeLog b/dev-java/ant-optional/ChangeLog
index f9ee99bdf5fb..1512bc983cd4 100644
--- a/dev-java/ant-optional/ChangeLog
+++ b/dev-java/ant-optional/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-optional
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.18 2004/06/24 22:16:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.19 2004/07/17 09:57:51 axxo Exp $
+
+*ant-optional-1.6.2 (17 Jul 2004)
+
+  17 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +ant-optional-1.6.2.ebuild:
+  Version bump
+  little cleaning
 
   19 May 2004; Chris Aniszczyk <zx@gentoo.org> ant-optional-1.6.1-r1.ebuild:
   Added dep for commons-net to allow for the ftp task. Closes #51011
diff --git a/dev-java/ant-optional/Manifest b/dev-java/ant-optional/Manifest
index a0d0a8429fe0..2adee7f5e805 100644
--- a/dev-java/ant-optional/Manifest
+++ b/dev-java/ant-optional/Manifest
@@ -1,5 +1,6 @@
 MD5 18cf25cf521f2fce405ff54ba713b6af ant-optional-1.6.0-r2.ebuild 4827
 MD5 f42b995fefed019cb3474c9cc66100b2 ant-optional-1.6.1-r1.ebuild 4675
+MD5 cc8739d993fbce55e9f17ac7e4b627de ant-optional-1.6.2.ebuild 1908
 MD5 9a43937da4c7e9089d8ecfa1bd224af9 ant-optional-1.6.0-r3.ebuild 4610
 MD5 d4583291297ac4e244f8364c2c393f70 ant-optional-1.6.1.ebuild 4605
 MD5 18c8d75c9db5a18730f6563eefc1e7d0 ChangeLog 2486
@@ -8,3 +9,4 @@ MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-optional-1.6.0-r2 74
 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-optional-1.6.0-r3 74
 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-optional-1.6.1-r1 74
 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-optional-1.6.1 74
+MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-optional-1.6.2 74
diff --git a/dev-java/ant-optional/ant-optional-1.6.2.ebuild b/dev-java/ant-optional/ant-optional-1.6.2.ebuild
new file mode 100644
index 000000000000..41496f64315d
--- /dev/null
+++ b/dev-java/ant-optional/ant-optional-1.6.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.2.ebuild,v 1.1 2004/07/17 09:57:51 axxo Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="Apache ANT Optional Tasks Jar Files"
+HOMEPAGE="http://ant.apache.org/"
+SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="javamail"
+
+DEPEND="=dev-java/ant-${PV}
+	>=dev-java/java-config-1.2
+	>=dev-java/log4j-1.2.8
+	>=dev-java/xerces-2.6.1
+	>=dev-java/xalan-2.5.2
+	>=dev-java/junit-3.8
+	>=dev-java/bsh-1.2-r7
+	>=dev-java/antlr-2.7.2
+	>=dev-java/commons-beanutils-1.6.1
+	>=dev-java/commons-logging-1.0.3
+	>=dev-java/commons-net-1.1.0
+	>=dev-java/bcel-5.1
+	>=dev-java/oro-2.0.7
+	>=dev-java/rhino-1.5_rc4
+	>=dev-java/jdepend-2.6
+	>=dev-java/jsch-0.1.12
+	>=dev-java/regexp-1.3
+	>=dev-java/jython-2.1
+	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/apache-ant-${PV}"
+
+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
+
+	libs=$(java-config -p ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,sun-javamail-bin,sun-jaf-bin,jdepend,jsch,junit,jython,log4j,oro,regexp,rhino,xalan,xerces-2)
+	./build.sh -Ddist.dir=${D}/usr/share/ant -lib ${libs} || die "build failed"
+}
+
+src_install() {
+	local jars="antlr apache-bcel junit vaj apache-bsf apache-log4j weblogic \
+		apache-resolver apache-oro netrexx xalan1 nodeps apache-regexp \
+		commons-logging javamail starteam xslp commons-net jdepend stylebook \
+		icontract jmf swing jai jsch trax"
+
+	dodir /usr/share/ant/lib
+	for jar in ${jars}; do
+		java-pkg_dojar build/lib/ant-${jar}.jar
+		dosym /usr/share/ant-optional/lib/ant-${jar}.jar /usr/share/ant/lib/
+	done
+}
diff --git a/dev-java/ant-optional/files/digest-ant-optional-1.6.2 b/dev-java/ant-optional/files/digest-ant-optional-1.6.2
new file mode 100644
index 000000000000..511c4167d672
--- /dev/null
+++ b/dev-java/ant-optional/files/digest-ant-optional-1.6.2
@@ -0,0 +1 @@
+MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 0a966bb5cd50..dd7fa3eb7c7a 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.65 2004/07/02 04:18:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.66 2004/07/17 09:58:26 axxo Exp $
+
+*ant-1.6.2 (17 Jul 2004)
+
+  17 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +files/1.6.2/ant,
+  +ant-1.6.2.ebuild:
+  Version bump
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ant-1.5.3-r5.ebuild,
   ant-1.5.4-r1.ebuild, ant-1.6.0-r2.ebuild, ant-1.6.0-r3.ebuild,
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index b83003778bc8..be407dc2315b 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,23 +1,26 @@
-MD5 47b374085512523339e0f276eacbd205 ChangeLog 11085
 MD5 42c27581a32bf53f2a5caf894fb7e2e0 ant-1.5.3-r5.ebuild 2945
-MD5 0a9e579c0585e31fa0f608df4fc596ab ant-1.5.4-r1.ebuild 3013
+MD5 8b4b5c55204c72ad12786b189c3178ee ant-1.6.2.ebuild 2224
 MD5 050ac1afea674f2d58b6cea499f83cec ant-1.6.0-r2.ebuild 1608
-MD5 70419153107f6844f4213d5a0a60b768 ant-1.6.0-r3.ebuild 1595
+MD5 0a9e579c0585e31fa0f608df4fc596ab ant-1.5.4-r1.ebuild 3013
 MD5 feb875c667f1fe035a07b0709bfa3b83 ant-1.6.1-r1.ebuild 2233
 MD5 cdb8b5b010df8ff5460d310b98b2f086 ant-1.6.1.ebuild 2222
+MD5 70419153107f6844f4213d5a0a60b768 ant-1.6.0-r3.ebuild 1595
+MD5 47b374085512523339e0f276eacbd205 ChangeLog 11085
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 9796e31a633d28a00242c76325bb85b4 files/20ant 26
+MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1 74
+MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-1.6.2 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 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-1.5.4-r1 70
 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-1.6.0-r2 74
 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-1.6.0-r3 74
-MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1 74
 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1-r1 74
-MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164
-MD5 9cb067e9b0997856af50e7e117263596 files/1.5.3/1_6_backport-jdk142.patch.gz 916
-MD5 c2ce37282a033b7a00993e622c685a9e files/1.5.3/ant 2207
-MD5 64e1d4bf5327dd353f61bc8b53c8ff5e files/1.5.4/ant 2271
 MD5 d3c75fa274bd1f48314029ca53b2c01e files/1.6.0-r2/ant 2440
 MD5 de2a686ad048c6b78da419b0aa7aa857 files/1.6.0-r3/ant 2440
+MD5 c2ce37282a033b7a00993e622c685a9e files/1.5.3/ant 2207
+MD5 9cb067e9b0997856af50e7e117263596 files/1.5.3/1_6_backport-jdk142.patch.gz 916
+MD5 64e1d4bf5327dd353f61bc8b53c8ff5e files/1.5.4/ant 2271
 MD5 25a7ebba11a8442506388faea61f5abc files/1.6.1/ant 2492
+MD5 25a7ebba11a8442506388faea61f5abc files/1.6.2/ant 2492
diff --git a/dev-java/ant/ant-1.6.2.ebuild b/dev-java/ant/ant-1.6.2.ebuild
new file mode 100644
index 000000000000..5319bb42f9d9
--- /dev/null
+++ b/dev-java/ant/ant-1.6.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.2.ebuild,v 1.1 2004/07/17 09:58:26 axxo Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+HOMEPAGE="http://ant.apache.org/"
+SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-src.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc"
+
+DEPEND="virtual/libc
+	>=virtual/jdk-1.4
+	>=dev-java/java-config-1.2
+	!<dev-java/ant-optional-${PV}"
+RDEPEND=">=virtual/jdk-1.4
+	app-shells/bash
+	>=dev-java/java-config-1.2"
+PDEPEND="=dev-java/ant-optional-${PV}"
+
+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}
+
+	# 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"
+
+	local myc
+	myc="${myc} -Ddist.dir=${D}/usr/share/ant"
+	myc="${myc} -Djavac.target=1.4"
+
+	echo $CLASSPATH
+	./build.sh -Ddist.dir=${D}/usr/share/ant || die
+}
+
+src_install() {
+	cp ${FILESDIR}/${PV}/ant ${S}/src/ant
+
+	exeinto /usr/bin
+	doexe src/ant
+
+	dodir /usr/share/ant/bin
+	for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do
+		dobin ${S}/src/script/${each}
+		dosym /usr/bin/${each} /usr/share/ant/bin/${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/1.6.2/ant b/dev-java/ant/files/1.6.2/ant
new file mode 100644
index 000000000000..eb60e9cfa66e
--- /dev/null
+++ b/dev-java/ant/files/1.6.2/ant
@@ -0,0 +1,90 @@
+#! /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.6.2/ant,v 1.1 2004/07/17 09:58:26 axxo Exp $
+
+if [ -f $HOME/.gentoo/java-env ] ; then
+  source $HOME/.gentoo/java-env
+else
+  JAVA_HOME=`java-config --jdk-home`
+  CLASSPATH=`java-config --classpath`:${CLASSPATH}
+fi
+
+if [ -z $JAVA_HOME ] ; then
+  echo "Error: No JDK found!"
+  echo "Try using java-config script to set your JDK"
+  echo "Remember that you need a JDK not a JRE"
+  exit 1
+fi
+
+# load system-wide ant configuration
+if [ -f "/etc/ant.conf" ] ; then 
+  . /etc/ant.conf
+fi
+
+# provide default values for people who don't use RPMs
+if [ -z "$rpm_mode" ] ; then
+  rpm_mode=false;
+fi
+if [ -z "$usejikes" ] ; then
+  usejikes=false;
+fi
+
+# load user ant configuration
+if [ -f "$HOME/.antrc" ] ; then 
+  . "$HOME/.antrc"
+fi
+
+ANT_HOME=/usr/share/ant
+
+# set ANT_LIB location
+ANT_LIB="${ANT_HOME}/lib"
+
+JAVACMD="`java-config --java`"
+ 
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly."
+  echo "  We cannot execute $JAVACMD"
+  exit 1
+fi
+
+
+if [ -n "$CLASSPATH" ] ; then
+  LOCALCLASSPATH="$CLASSPATH"
+fi
+
+# add in the dependency .jar files
+LOCALCLASSPATH="$ANT_LIB/ant-launcher.jar:${LOCALCLASSPATH}:`java-config --classpath=ant,ant-optional,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-logging,commons-net,oro,jdepend,jsch,regexp,rhino,jython,jta,jaf,javamail 2> /dev/null`"
+
+if [ -n "$JAVA_HOME" ] ; then
+  if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
+    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
+  fi
+
+  if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
+    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
+  fi
+
+else
+  echo "Warning: JAVA_HOME environment variable is not set (or not exported)."
+  echo "  If build fails because sun.* classes could not be found"
+  echo "  you will need to set the JAVA_HOME environment variable"
+  echo "  to the installation directory of java."
+  echo "  Try using java-config script"
+fi
+
+# Allow Jikes support (off by default)
+if $usejikes; then
+  ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
+fi
+
+# 2002-11-02, karltk@gentoo.org:
+# The Blackdown JDK on PPC hiccups with native threads
+#
+if [ "`arch`" == "ppc" ] ; then
+	export THREADS_FLAG="green"
+fi
+
+"$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" org.apache.tools.ant.launch.Launcher $ANT_ARGS -lib "$CLASSPATH" "$@"
diff --git a/dev-java/ant/files/digest-ant-1.6.2 b/dev-java/ant/files/digest-ant-1.6.2
new file mode 100644
index 000000000000..511c4167d672
--- /dev/null
+++ b/dev-java/ant/files/digest-ant-1.6.2
@@ -0,0 +1 @@
+MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237