remove older ebuild that use ant-optional

17 files changed, 23 insertions, 943 deletions

diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 21f752838983..491e53eb25d2 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.79 2004/09/04 12:58:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.80 2004/09/06 08:44:28 axxo Exp $
+
+  06 Sep 2004; Thomas Matthijs <axxo@gentoo.org> -files/1.6.0-r3/ant,
+  -files/1.6.1/ant, -files/1.6.2-r2/ant, -files/1.6.2-r3/ant,
+  -ant-1.6.0-r3.ebuild, -ant-1.6.1-r1.ebuild, -ant-1.6.1.ebuild,
+  -ant-1.6.2-r2.ebuild, -ant-1.6.2-r3.ebuild, ant-1.6.2-r5.ebuild:
+  remove older ebuild that use ant-optional
 
   04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> files/1.6.2-r5/ant,
   ant-1.6.2-r5.ebuild:
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 148f9c2a8a53..dd02fc8a0580 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,35 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5f6b6c258c3edf75842d1753a95dc309 ant-1.6.2-r3.ebuild 2224
 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 1c32cf321566b712cf581daa76820de9 ant-1.6.2-r5.ebuild 2220
-MD5 16df02d2f27b258ec276ae47cb5fb844 ant-1.6.2-r2.ebuild 2221
-MD5 c658c82e510af29ddedca0f00f1d9cfd ant-1.6.0-r3.ebuild 1594
-MD5 bef17aea24c7251641c36e59ac3b5956 ChangeLog 13141
+MD5 a833a5807679d0593148982e4cf3c473 ChangeLog 13450
 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
 MD5 9796e31a633d28a00242c76325bb85b4 files/20ant 26
-MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1 74
 MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256
 MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164
 MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-1.5.4-r1 70
-MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-1.6.0-r3 74
-MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1-r1 74
-MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-1.6.2-r2 74
-MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-1.6.2-r3 74
 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-1.6.2-r5 74
-MD5 b175a3f82c4b6326054b651bf39217fd files/1.6.0-r3/ant 2444
-MD5 7f78a7891b6440422489d4e55c08384a files/1.6.2-r2/ant 4697
-MD5 9e239f4c98abe5ae2f940e2e01d6d898 files/1.6.2-r3/ant 4965
 MD5 cf3e02894f5e6ceebcf81e03e473ee2c files/1.6.2-r5/ant 4962
 MD5 f8c9e03bf0f5924ebf9162718bf15169 files/1.5.4/ant 2275
-MD5 25a7ebba11a8442506388faea61f5abc files/1.6.1/ant 2492
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBObw+/rLF9B432nYRAr4sAJ9PfLN9re/FzRUkiZsxpuq7x2py5wCgqQMV
-qxwPT6fEmrIgKmEUIMXirqw=
-=5akd
+iD8DBQFBPCPB/rLF9B432nYRAsXMAKCSB91T9TEBOerWvP4MVmr44V1sjwCgoIey
+PD0PWDYIuklrB43k7mMMKgs=
+=upWL
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant/ant-1.6.0-r3.ebuild b/dev-java/ant/ant-1.6.0-r3.ebuild
deleted file mode 100644
index 94fd8421552d..000000000000
--- a/dev-java/ant/ant-1.6.0-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.0-r3.ebuild,v 1.10 2004/08/27 18:29:39 sejo 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-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ppc"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	>=virtual/jdk-1.4
-	>=dev-java/java-config-1.2
-	!<dev-java/${PF}"
-RDEPEND=">=virtual/jdk-1.4
-	app-shells/bash
-	>=dev-java/java-config-1.2"
-PDEPEND="=dev-java/ant-optional-1.6.0-r3"
-
-S="${WORKDIR}/apache-ant-${PV}"
-
-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/ant-1.6.1-r1.ebuild b/dev-java/ant/ant-1.6.1-r1.ebuild
deleted file mode 100644
index ec79390dbdda..000000000000
--- a/dev-java/ant/ant-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.1-r1.ebuild,v 1.11 2004/07/02 04:18:20 eradicator 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="~amd64 ~x86 ~sparc"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	>=virtual/jdk-1.4
-	>=dev-java/java-config-1.2
-	!<dev-java/ant-optional-${PV}-r1"
-RDEPEND=">=virtual/jdk-1.4
-	app-shells/bash
-	>=dev-java/java-config-1.2"
-PDEPEND="=dev-java/ant-optional-${PV}-r1"
-
-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/ant-1.6.1.ebuild b/dev-java/ant/ant-1.6.1.ebuild
deleted file mode 100644
index 164a25e37141..000000000000
--- a/dev-java/ant/ant-1.6.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.1.ebuild,v 1.11 2004/07/02 04:18:20 eradicator 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="~amd64 ~x86 ~ppc"
-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/ant-1.6.2-r2.ebuild b/dev-java/ant/ant-1.6.2-r2.ebuild
deleted file mode 100644
index 2e851a519640..000000000000
--- a/dev-java/ant/ant-1.6.2-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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-r2.ebuild,v 1.2 2004/08/27 18:29:39 sejo 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 ~amd64 ~ppc"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	>=virtual/jdk-1.4
-	>=dev-java/java-config-1.2
-	!<dev-java/ant-optional-${PVR}"
-RDEPEND=">=virtual/jdk-1.4
-	app-shells/bash
-	>=dev-java/java-config-1.2"
-PDEPEND="=dev-java/ant-optional-${PVR}"
-
-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}/${PVR}/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/ant-1.6.2-r3.ebuild b/dev-java/ant/ant-1.6.2-r3.ebuild
deleted file mode 100644
index dc68f1b9164e..000000000000
--- a/dev-java/ant/ant-1.6.2-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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-r3.ebuild,v 1.2 2004/08/27 20:03:13 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 ~amd64 ~ppc"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	>=virtual/jdk-1.4
-	>=dev-java/java-config-1.2
-	!<dev-java/ant-optional-1.6.2-r2"
-RDEPEND=">=virtual/jdk-1.4
-	app-shells/bash
-	>=dev-java/java-config-1.2"
-PDEPEND="=dev-java/ant-optional-1.6.2-r2"
-
-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}/${PVR}/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.0-r3/ant b/dev-java/ant/files/1.6.0-r3/ant
deleted file mode 100644
index 973afe48e5b6..000000000000
--- a/dev-java/ant/files/1.6.0-r3/ant
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /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.0-r3/ant,v 1.2 2004/07/18 02:50:14 dragonheart 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="${LOCALCLASSPATH}:`java-config --classpath=ant,ant-optional,log4j,xerces,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" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
diff --git a/dev-java/ant/files/1.6.1/ant b/dev-java/ant/files/1.6.1/ant
deleted file mode 100644
index 138e26e89917..000000000000
--- a/dev-java/ant/files/1.6.1/ant
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /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.1/ant,v 1.5 2004/06/20 16:19:32 sejo 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/1.6.2-r2/ant b/dev-java/ant/files/1.6.2-r2/ant
deleted file mode 100644
index 5141c76c77bd..000000000000
--- a/dev-java/ant/files/1.6.2-r2/ant
+++ /dev/null
@@ -1,164 +0,0 @@
-#! /bin/bash
-
-#   Copyright 2001-2004 The Apache Software Foundation
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-#   Edited for Gentoo Linux
-#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.6.2-r2/ant,v 1.1 2004/07/29 14:54:47 axxo Exp $
-
-# Extract launch and ant arguments, (see details below).
-ant_exec_args=
-no_config=false
-use_jikes_default=false
-ant_exec_debug=false
-show_help=false
-for arg in "$@" ; do
-  if [ "$arg" = "--noconfig" ] ; then
-    no_config=true
-  elif [ "$arg" = "--usejikes" ] ; then
-    use_jikes_default=true
-  elif [ "$arg" = "--execdebug" ] ; then
-    ant_exec_debug=true
-  elif [ my"$arg" = my"--h"  -o my"$arg" = my"--help"  ] ; then
-    show_help=true
-    ant_exec_args="$ant_exec_args -h"
-  else
-    if [  my"$arg" = my"-h"  -o  my"$arg" = my"-help" ] ; then
-      show_help=true
-    fi
-    ant_exec_args="$ant_exec_args \"$arg\""
-  fi
-done
-
-# Source/default ant configuration
-if $no_config ; then
-  rpm_mode=false
-  usejikes=$use_jikes_default
-else
-  # load system-wide ant configuration
-  if [ -f "/etc/ant.conf" ] ; then
-    . /etc/ant.conf
-  fi
-
-  # load user ant configuration
-  if [ -f "$HOME/.ant/ant.conf" ] ; then
-    . $HOME/.ant/ant.conf
-  fi
-  if [ -f "$HOME/.antrc" ] ; then
-    . "$HOME/.antrc"
-  fi
-
-  # provide default configuration values
-  if [ -z "$rpm_mode" ] ; then
-    rpm_mode=false
-  fi
-  if [ -z "$usejikes" ] ; then
-    usejikes=$use_jikes_default
-  fi
-fi
-
-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
-
-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 [ -z "$LOCALCLASSPATH" ] ; then
-  LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
-else
-  LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
-fi
-
-
-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
-
-# Show script help if requested
-if $show_help ; then
-  echo $0 '[script options] [options] [target [target2 [target3] ..]]'
-  echo 'Script Options:'
-  echo '  --help, --h            print this message and ant help'
-  echo '  --noconfig             suppress sourcing of /etc/ant.conf,'
-  echo '                         $HOME/.ant/ant.conf, and $HOME/.antrc'
-  echo '                         configuration files'
-  echo '  --usejikes             enable use of jikes by default, unless'
-  echo '                         set explicitly in configuration files'
-  echo '  --execdebug            print ant exec line generated by this'
-  echo '                         launch script'
-  echo '  '
-fi
-
-# Execute ant using eval/exec to preserve spaces in paths,
-# java options, and ant args
-ant_sys_opts=
-
-
-if [ -n "$JIKESPATH" ]; then
-	ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
-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
-
-
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -lib \"$CLASSPATH\" $ant_exec_args"
-
-if $ant_exec_debug ; then
-  echo $ant_exec_command
-fi
-eval $ant_exec_command
diff --git a/dev-java/ant/files/1.6.2-r3/ant b/dev-java/ant/files/1.6.2-r3/ant
deleted file mode 100644
index 2a5e4186a54a..000000000000
--- a/dev-java/ant/files/1.6.2-r3/ant
+++ /dev/null
@@ -1,166 +0,0 @@
-#! /bin/bash
-
-#   Copyright 2001-2004 The Apache Software Foundation
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-#   Edited for Gentoo Linux
-#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.6.2-r3/ant,v 1.1 2004/08/27 19:36:24 axxo Exp $
-
-# Extract launch and ant arguments, (see details below).
-ant_exec_args=
-no_config=false
-use_jikes_default=false
-ant_exec_debug=false
-show_help=false
-for arg in "$@" ; do
-  if [ "$arg" = "--noconfig" ] ; then
-    no_config=true
-  elif [ "$arg" = "--usejikes" ] ; then
-    use_jikes_default=true
-  elif [ "$arg" = "--execdebug" ] ; then
-    ant_exec_debug=true
-  elif [ my"$arg" = my"--h"  -o my"$arg" = my"--help"  ] ; then
-    show_help=true
-    ant_exec_args="$ant_exec_args -h"
-  else
-    if [  my"$arg" = my"-h"  -o  my"$arg" = my"-help" ] ; then
-      show_help=true
-    fi
-    ant_exec_args="$ant_exec_args \"$arg\""
-  fi
-done
-
-# Source/default ant configuration
-if $no_config ; then
-  rpm_mode=false
-  usejikes=$use_jikes_default
-else
-  # load system-wide ant configuration
-  if [ -f "/etc/ant.conf" ] ; then
-    . /etc/ant.conf
-  fi
-
-  # load user ant configuration
-  if [ -f "$HOME/.ant/ant.conf" ] ; then
-    . $HOME/.ant/ant.conf
-  fi
-  if [ -f "$HOME/.antrc" ] ; then
-    . "$HOME/.antrc"
-  fi
-
-  # provide default configuration values
-  if [ -z "$rpm_mode" ] ; then
-    rpm_mode=false
-  fi
-  if [ -z "$usejikes" ] ; then
-    usejikes=$use_jikes_default
-  fi
-fi
-
-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
-
-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 [ -z "$LOCALCLASSPATH" ] ; then
-  LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
-else
-  LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
-fi
-
-# add in the dependency .jar files
-LOCALCLASSPATH="${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
-
-# Show script help if requested
-if $show_help ; then
-  echo $0 '[script options] [options] [target [target2 [target3] ..]]'
-  echo 'Script Options:'
-  echo '  --help, --h            print this message and ant help'
-  echo '  --noconfig             suppress sourcing of /etc/ant.conf,'
-  echo '                         $HOME/.ant/ant.conf, and $HOME/.antrc'
-  echo '                         configuration files'
-  echo '  --usejikes             enable use of jikes by default, unless'
-  echo '                         set explicitly in configuration files'
-  echo '  --execdebug            print ant exec line generated by this'
-  echo '                         launch script'
-  echo '  '
-fi
-
-# Execute ant using eval/exec to preserve spaces in paths,
-# java options, and ant args
-ant_sys_opts=
-
-
-if [ -n "$JIKESPATH" ]; then
-	ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
-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
-
-
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -lib \"$CLASSPATH\" $ant_exec_args"
-
-if $ant_exec_debug ; then
-  echo $ant_exec_command
-fi
-eval $ant_exec_command
diff --git a/dev-java/ant/files/digest-ant-1.6.0-r3 b/dev-java/ant/files/digest-ant-1.6.0-r3
deleted file mode 100644
index dd7fbab35622..000000000000
--- a/dev-java/ant/files/digest-ant-1.6.0-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 18aed5aa33951aa85c237fc4139bad6e apache-ant-1.6.0-src.tar.bz2 6217526
diff --git a/dev-java/ant/files/digest-ant-1.6.1 b/dev-java/ant/files/digest-ant-1.6.1
deleted file mode 100644
index 60b89a8cc1ed..000000000000
--- a/dev-java/ant/files/digest-ant-1.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3e1f06aae6b691543299ccb1a5cb038f apache-ant-1.6.1-src.tar.bz2 6203438
diff --git a/dev-java/ant/files/digest-ant-1.6.1-r1 b/dev-java/ant/files/digest-ant-1.6.1-r1
deleted file mode 100644
index 60b89a8cc1ed..000000000000
--- a/dev-java/ant/files/digest-ant-1.6.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3e1f06aae6b691543299ccb1a5cb038f apache-ant-1.6.1-src.tar.bz2 6203438
diff --git a/dev-java/ant/files/digest-ant-1.6.2-r2 b/dev-java/ant/files/digest-ant-1.6.2-r2
deleted file mode 100644
index 511c4167d672..000000000000
--- a/dev-java/ant/files/digest-ant-1.6.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237
diff --git a/dev-java/ant/files/digest-ant-1.6.2-r3 b/dev-java/ant/files/digest-ant-1.6.2-r3
deleted file mode 100644
index 511c4167d672..000000000000
--- a/dev-java/ant/files/digest-ant-1.6.2-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 1ad43b47c3a8..04b3e3484edf 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,4 +1,14 @@
-MD5 be405c58763a7b348f1973970e3d6cb2 ChangeLog 584
-MD5 5ec17cb8ea105f600c333c10f54840f2 fop-0.20.5.ebuild 1095
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e8bac89ece7731f86ee633866f2243fd fop-0.20.5.ebuild 1119
+MD5 7f001ce95a3d470a6eff4c0731e7b3a9 ChangeLog 677
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 198aedddc6ad08dbc64dec1545524d8d files/digest-fop-0.20.5 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBPCQj/rLF9B432nYRAjiAAJ4lcMeTeR2VIe5Mj9RzKCED+c6yPwCgtrB5
+1kHGFU3jMV9AIEQ9yGg7QCo=
+=Holw
+-----END PGP SIGNATURE-----