Removing ant 1.7.0, bug #261563.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

48 files changed, 96 insertions, 1151 deletions

diff --git a/dev-java/ant-antlr/ChangeLog b/dev-java/ant-antlr/ChangeLog
index 3e2fb28309e4..1d7ac754c9ce 100644
--- a/dev-java/ant-antlr/ChangeLog
+++ b/dev-java/ant-antlr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-antlr
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ChangeLog,v 1.24 2009/04/26 23:50:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ChangeLog,v 1.25 2009/05/15 22:19:53 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org> -ant-antlr-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   26 Apr 2009; Brent Baude <ranger@gentoo.org> ant-antlr-1.7.1-r1.ebuild:
   Marking ant-antlr-1.7.1-r1 ppc for bug 264198
diff --git a/dev-java/ant-antlr/ant-antlr-1.7.0.ebuild b/dev-java/ant-antlr/ant-antlr-1.7.0.ebuild
deleted file mode 100644
index f54130b4f7a7..000000000000
--- a/dev-java/ant-antlr/ant-antlr-1.7.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ant-antlr-1.7.0.ebuild,v 1.14 2009/03/24 19:45:35 betelgeuse Exp $
-
-EAPI="1"
-
-inherit java-pkg-2 ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-
-DEPEND=">=dev-java/antlr-2.7.5-r3:0"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! built_with_use dev-java/antlr:0 java; then
-		msg="dev-java/antlr needs to be built with the java use flag"
-		eerror ${msg}
-		die ${msg}
-	fi
-	java-pkg-2_pkg_setup
-}
diff --git a/dev-java/ant-apache-bcel/ChangeLog b/dev-java/ant-apache-bcel/ChangeLog
index 784291275fdc..6e9294044c8e 100644
--- a/dev-java/ant-apache-bcel/ChangeLog
+++ b/dev-java/ant-apache-bcel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-bcel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ChangeLog,v 1.14 2009/01/07 19:01:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ChangeLog,v 1.15 2009/05/15 22:20:14 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org>
+  -ant-apache-bcel-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> ant-apache-bcel-1.7.1.ebuild:
   Marking ant-apache-bcel-1.7.1 ppc64 for bug 250466
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.7.0.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.7.0.ebuild
deleted file mode 100644
index 7c0084d23ed7..000000000000
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.7.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ant-apache-bcel-1.7.0.ebuild,v 1.10 2007/05/12 17:51:21 wltjr Exp $
-
-ANT_TASK_DEPNAME="bcel"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-DEPEND="~dev-java/ant-nodeps-${PV}
-	>=dev-java/bcel-5.1-r3"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-	java-pkg_jar-from ant-nodeps
-}
diff --git a/dev-java/ant-apache-bsf/ChangeLog b/dev-java/ant-apache-bsf/ChangeLog
index eebe5e2a5444..be2516d2621b 100644
--- a/dev-java/ant-apache-bsf/ChangeLog
+++ b/dev-java/ant-apache-bsf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-bsf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ChangeLog,v 1.23 2009/03/11 19:26:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ChangeLog,v 1.24 2009/05/15 22:20:39 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org>
+  -ant-apache-bsf-1.7.0-r1.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   11 Mar 2009; Markus Meier <maekke@gentoo.org>
   ant-apache-bsf-1.7.1-r1.ebuild:
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.0-r1.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.0-r1.ebuild
deleted file mode 100644
index be545043a919..000000000000
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.0-r1.ebuild,v 1.3 2007/06/01 19:50:15 caster Exp $
-
-ANT_TASK_DEPNAME="bsf-2.3"
-
-inherit eutils ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-# ant-nodeps contains <script> task which is needed for this
-# although it's not a build dep through import
-DEPEND=">=dev-java/bsf-2.3.0-r3"
-RDEPEND="${DEPEND}
-	~dev-java/ant-nodeps-${PV}"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-src_install() {
-	ant-tasks_src_install
-	java-pkg_register-dependency ant-nodeps
-}
-
-built_with_use_warn() {
-	if ! built_with_use --missing false -o dev-java/bsf ${1}; then
-		elog "If you want to use ${2} in <script> tasks in build.xml files,"
-		elog "dev-java/bsf must be installed with \"${3-${1}}\" USE flag"
-	fi
-}
-
-pkg_postinst() {
-	built_with_use_warn python Python
-	built_with_use_warn "rhino javascript" JavaScript "rhino or javascript"
-	built_with_use_warn tcl TCL
-	elog "Also, >=dev-java/bsf-2.4.0-r1 adds optional support for groovy,"
-	elog "ruby and beanshell. See its postinst elog messages for instructions."
-}
diff --git a/dev-java/ant-apache-log4j/ChangeLog b/dev-java/ant-apache-log4j/ChangeLog
index 0062a56f91c2..614b1423024b 100644
--- a/dev-java/ant-apache-log4j/ChangeLog
+++ b/dev-java/ant-apache-log4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-log4j
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ChangeLog,v 1.14 2009/01/07 19:07:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ChangeLog,v 1.15 2009/05/15 22:21:00 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org>
+  -ant-apache-log4j-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org>
   ant-apache-log4j-1.7.1.ebuild:
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.7.0.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.7.0.ebuild
deleted file mode 100644
index 1424a3efb1c1..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.7.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ant-apache-log4j-1.7.0.ebuild,v 1.10 2007/05/12 17:54:24 wltjr Exp $
-
-ANT_TASK_DEPNAME="log4j"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-DEPEND=">=dev-java/log4j-1.2.13-r2"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/ChangeLog b/dev-java/ant-apache-oro/ChangeLog
index d27a7d248dfb..846681ec467c 100644
--- a/dev-java/ant-apache-oro/ChangeLog
+++ b/dev-java/ant-apache-oro/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-oro
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ChangeLog,v 1.14 2009/01/07 19:17:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ChangeLog,v 1.15 2009/05/15 22:21:21 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org>
+  -ant-apache-oro-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> ant-apache-oro-1.7.1.ebuild:
   Marking ant-apache-oro-1.7.1 ppc64 for bug 250466
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.7.0.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.7.0.ebuild
deleted file mode 100644
index ed7ca1b7cec5..000000000000
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.7.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ant-apache-oro-1.7.0.ebuild,v 1.10 2007/05/12 17:57:26 wltjr Exp $
-
-ANT_TASK_DEPNAME="jakarta-oro-2.0"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-DEPEND=">=dev-java/jakarta-oro-2.0.8-r2"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/ChangeLog b/dev-java/ant-apache-regexp/ChangeLog
index 8d2b65670a3c..2baf1a1e2df0 100644
--- a/dev-java/ant-apache-regexp/ChangeLog
+++ b/dev-java/ant-apache-regexp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-regexp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ChangeLog,v 1.14 2009/01/07 19:16:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ChangeLog,v 1.15 2009/05/15 22:21:42 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org>
+  -ant-apache-regexp-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org>
   ant-apache-regexp-1.7.1.ebuild:
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.7.0.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.7.0.ebuild
deleted file mode 100644
index 2f3742f485a1..000000000000
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.7.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ant-apache-regexp-1.7.0.ebuild,v 1.10 2007/05/12 18:04:17 wltjr Exp $
-
-ANT_TASK_DEPNAME="jakarta-regexp-1.4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-# could use slot deps
-DEPEND="=dev-java/jakarta-regexp-1.4*"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/ChangeLog b/dev-java/ant-apache-resolver/ChangeLog
index 7068b3eef110..901c560bb699 100644
--- a/dev-java/ant-apache-resolver/ChangeLog
+++ b/dev-java/ant-apache-resolver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-resolver
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ChangeLog,v 1.14 2009/01/07 19:14:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ChangeLog,v 1.15 2009/05/15 22:22:02 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org>
+  -ant-apache-resolver-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org>
   ant-apache-resolver-1.7.1.ebuild:
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.7.0.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.7.0.ebuild
deleted file mode 100644
index db1129991932..000000000000
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.7.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ant-apache-resolver-1.7.0.ebuild,v 1.10 2007/05/12 18:07:57 wltjr Exp $
-
-ANT_TASK_DEPNAME="xml-commons-resolver"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-DEPEND=">=dev-java/xml-commons-resolver-1.1-r1"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-logging/ChangeLog b/dev-java/ant-commons-logging/ChangeLog
index 3a479e2dc7aa..1a659d542494 100644
--- a/dev-java/ant-commons-logging/ChangeLog
+++ b/dev-java/ant-commons-logging/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-commons-logging
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ChangeLog,v 1.14 2009/01/07 19:08:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ChangeLog,v 1.15 2009/05/15 22:22:23 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org>
+  -ant-commons-logging-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org>
   ant-commons-logging-1.7.1.ebuild:
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.7.0.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.7.0.ebuild
deleted file mode 100644
index 02bc8a395c46..000000000000
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.7.0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ant-commons-logging-1.7.0.ebuild,v 1.10 2007/05/12 18:09:23 wltjr Exp $
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-DEPEND=">=dev-java/commons-logging-1.0.4-r2"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/ChangeLog b/dev-java/ant-commons-net/ChangeLog
index 13f0144ecbb9..61bf0694ee8e 100644
--- a/dev-java/ant-commons-net/ChangeLog
+++ b/dev-java/ant-commons-net/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-commons-net
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ChangeLog,v 1.14 2009/01/07 19:06:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ChangeLog,v 1.15 2009/05/15 22:22:44 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org>
+  -ant-commons-net-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> ant-commons-net-1.7.1.ebuild:
   Marking ant-commons-net-1.7.1 ppc64 for bug 250466
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.7.0.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.7.0.ebuild
deleted file mode 100644
index 971b3bb17f8a..000000000000
--- a/dev-java/ant-commons-net/ant-commons-net-1.7.0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ant-commons-net-1.7.0.ebuild,v 1.10 2007/05/12 18:10:28 wltjr Exp $
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-DEPEND=">=dev-java/commons-net-1.4.1-r1"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index a83942498573..f182ee741bb6 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for dev-java/ant-core
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.94 2009/05/10 15:14:37 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.95 2009/05/15 22:29:34 caster Exp $
 
 # Ant-core blocks lower/older versions of ant-tasks, 
 # since it will not run when there is a version mismatch betwean the 2 packages
 # Please unemerge ant-tasks when updating ant-core.
 
+  15 May 2009; Vlastimil Babka <caster@gentoo.org> -files/1.7.0-ant,
+  -ant-core-1.7.0.ebuild, -ant-core-1.7.0-r1.ebuild,
+  -ant-core-1.7.0-r2.ebuild, -files/1.7.1-ant,
+  -files/ant-core-1.7.0-services.patch, -ant-core-1.7.1-r1.ebuild:
+  Removing ant 1.7.0, bug #261563.
+
   10 May 2009; Raúl Porcel <armin76@gentoo.org> ant-core-1.7.1-r2.ebuild:
   ia64 stable
 
diff --git a/dev-java/ant-core/ant-core-1.7.0-r1.ebuild b/dev-java/ant-core/ant-core-1.7.0-r1.ebuild
deleted file mode 100644
index b4f8f478c1b0..000000000000
--- a/dev-java/ant-core/ant-core-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.0-r1.ebuild,v 1.5 2008/04/12 10:28:19 nixnut Exp $
-
-# don't depend on itself
-JAVA_ANT_DISABLE_ANT_CORE_DEP=true
-# rewriting build.xml files for the testcases has no reason atm
-JAVA_PKG_BSFIX_ALL=no
-inherit java-pkg-2 java-ant-2
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
-HOMEPAGE="http://ant.apache.org/"
-SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
-	mirror://gentoo/ant-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc source"
-
-# 1.7.0 instead of $PV in blocks is intentional, >1.7.0 upgrades should
-# be block free (but these fixed blocks should stay there for users upgrading
-# from <1.7.0 of course)
-RDEPEND=">=virtual/jdk-1.4
-	!<dev-java/ant-tasks-1.7.0
-	!<dev-java/ant-1.7.0
-	!dev-java/ant-optional"
-DEPEND="${RDEPEND}
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# remove bundled xerces
-	rm -v lib/*.jar
-
-	# use our split-ant build.xml
-	mv -f "${WORKDIR}/build.xml" .
-}
-
-src_compile() {
-	export ANT_HOME=""
-
-	local bsyscp
-
-	# this ensures that when building ant with bootstrapped ant,
-	# only the source is used for resolving references, and not
-	# the classes in bootstrapped ant
-	# but jikes in kaffe has issues with this...
-	if ! java-pkg_current-vm-matches kaffe; then
-		bsyscp="-Dbuild.sysclasspath=ignore"
-	fi
-
-	./build.sh ${bsyscp} jars-core $(use_doc javadocs) \
-		|| die "build failed"
-}
-
-src_install() {
-	newbin "${FILESDIR}/${PV}-ant" ant || die "failed to install wrapper"
-
-	dodir /usr/share/${PN}/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/${PN}/bin/${each}
-	done
-
-	echo "ANT_HOME=\"/usr/share/${PN}\"" > "${T}/20ant"
-	doenvd "${T}/20ant" || die "failed to install env.d file"
-
-	java-pkg_dojar build/lib/ant.jar
-	java-pkg_dojar build/lib/ant-bootstrap.jar
-	java-pkg_dojar build/lib/ant-launcher.jar
-
-	use source && java-pkg_dosrc src/main/*
-
-	dodoc README WHATSNEW KEYS
-
-	if use doc; then
-		dohtml welcome.html
-		dohtml -r docs/*
-		java-pkg_dojavadoc --symlink manual/api build/javadocs
-	fi
-}
-
-pkg_postinst() {
-	elog "The way of packaging ant in Gentoo has changed significantly since"
-	elog "the 1.7.0 version, For more information, please see:"
-	elog "http://www.gentoo.org/proj/en/java/ant-guide.xml"
-}
diff --git a/dev-java/ant-core/ant-core-1.7.0-r2.ebuild b/dev-java/ant-core/ant-core-1.7.0-r2.ebuild
deleted file mode 100644
index 9ee7ba30dab8..000000000000
--- a/dev-java/ant-core/ant-core-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.0-r2.ebuild,v 1.1 2008/06/16 18:59:17 betelgeuse Exp $
-
-# don't depend on itself
-JAVA_ANT_DISABLE_ANT_CORE_DEP=true
-# rewriting build.xml files for the testcases has no reason atm
-JAVA_PKG_BSFIX_ALL=no
-inherit java-pkg-2 java-ant-2
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
-HOMEPAGE="http://ant.apache.org/"
-SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
-	mirror://gentoo/ant-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source"
-
-# 1.7.0 instead of $PV in blocks is intentional, >1.7.0 upgrades should
-# be block free (but these fixed blocks should stay there for users upgrading
-# from <1.7.0 of course)
-RDEPEND=">=virtual/jdk-1.4
-	!<dev-java/ant-tasks-1.7.0
-	!<dev-java/ant-1.7.0
-	!dev-java/ant-optional"
-DEPEND="${RDEPEND}
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/ant-core-1.7.0-services.patch"
-
-	# remove bundled xerces
-	rm -v lib/*.jar
-
-	# use our split-ant build.xml
-	mv -f "${WORKDIR}/build.xml" .
-}
-
-src_compile() {
-	export ANT_HOME=""
-
-	local bsyscp
-
-	# this ensures that when building ant with bootstrapped ant,
-	# only the source is used for resolving references, and not
-	# the classes in bootstrapped ant
-	# but jikes in kaffe has issues with this...
-	if ! java-pkg_current-vm-matches kaffe; then
-		bsyscp="-Dbuild.sysclasspath=ignore"
-	fi
-
-	./build.sh ${bsyscp} jars-core $(use_doc javadocs) \
-		|| die "build failed"
-}
-
-src_install() {
-	newbin "${FILESDIR}/${PV}-ant" ant || die "failed to install wrapper"
-
-	dodir /usr/share/${PN}/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/${PN}/bin/${each}
-	done
-
-	echo "ANT_HOME=\"/usr/share/${PN}\"" > "${T}/20ant"
-	doenvd "${T}/20ant" || die "failed to install env.d file"
-
-	java-pkg_dojar build/lib/ant.jar
-	java-pkg_dojar build/lib/ant-bootstrap.jar
-	java-pkg_dojar build/lib/ant-launcher.jar
-
-	use source && java-pkg_dosrc src/main/*
-
-	dodoc README WHATSNEW KEYS
-
-	if use doc; then
-		dohtml welcome.html
-		dohtml -r docs/*
-		java-pkg_dojavadoc --symlink manual/api build/javadocs
-	fi
-}
-
-pkg_postinst() {
-	elog "The way of packaging ant in Gentoo has changed significantly since"
-	elog "the 1.7.0 version, For more information, please see:"
-	elog "http://www.gentoo.org/proj/en/java/ant-guide.xml"
-}
diff --git a/dev-java/ant-core/ant-core-1.7.0.ebuild b/dev-java/ant-core/ant-core-1.7.0.ebuild
deleted file mode 100644
index a42fe205363f..000000000000
--- a/dev-java/ant-core/ant-core-1.7.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.0.ebuild,v 1.14 2007/05/12 17:43:18 wltjr Exp $
-
-# don't depend on itself
-JAVA_ANT_DISABLE_ANT_CORE_DEP=true
-# rewriting build.xml files for the testcases has no reason atm
-JAVA_PKG_BSFIX_ALL=no
-inherit java-pkg-2 java-ant-2
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
-HOMEPAGE="http://ant.apache.org/"
-SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
-	mirror://gentoo/ant-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc source"
-
-# 1.7.0 instead of $PV in blocks is intentional, >1.7.0 upgrades should
-# be block free (but these fixed blocks should stay there for users upgrading
-# from <1.7.0 of course)
-RDEPEND=">=virtual/jdk-1.4
-	!<dev-java/ant-tasks-1.7.0
-	!<dev-java/ant-1.7.0
-	!dev-java/ant-optional"
-DEPEND="${RDEPEND}
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# remove bundled xerces
-	rm -v lib/*.jar
-
-	# use our split-ant build.xml
-	mv -f ${WORKDIR}/build.xml .
-}
-
-src_compile() {
-	export ANT_HOME=""
-
-	local bsyscp
-
-	# this ensures that when building ant with bootstrapped ant,
-	# only the source is used for resolving references, and not
-	# the classes in bootstrapped ant
-	# but jikes in kaffe has issues with this...
-	if ! java-pkg_current-vm-matches kaffe; then
-		bsyscp="-Dbuild.sysclasspath=ignore"
-	fi
-
-	./build.sh ${bsyscp} jars-core $(use_doc javadocs) \
-		|| die "build failed"
-}
-
-src_install() {
-	newbin ${FILESDIR}/${PV}-ant ant || die "failed to install wrapper"
-
-	dodir /usr/share/${PN}/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/${PN}/bin/${each}
-	done
-
-	echo "ANT_HOME=\"/usr/share/${PN}\"" > ${T}/20ant
-	doenvd ${T}/20ant || die "failed to install env.d file"
-
-	java-pkg_dojar build/lib/ant.jar
-	java-pkg_dojar build/lib/ant-bootstrap.jar
-	java-pkg_dojar build/lib/ant-launcher.jar
-
-	use source && java-pkg_dosrc src/main/*
-
-	dodoc README WHATSNEW KEYS
-
-	if use doc; then
-		dohtml welcome.html
-		dohtml -r docs/*
-		java-pkg_dojavadoc build/javadocs
-	fi
-}
-
-pkg_postinst() {
-	elog "The way of packaging ant in Gentoo has changed significantly since"
-	elog "the 1.7.0 version, For more information, please see:"
-	elog "http://www.gentoo.org/proj/en/java/ant-guide.xml"
-}
diff --git a/dev-java/ant-core/ant-core-1.7.1-r1.ebuild b/dev-java/ant-core/ant-core-1.7.1-r1.ebuild
deleted file mode 100644
index 2225ccd79f4a..000000000000
--- a/dev-java/ant-core/ant-core-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.1-r1.ebuild,v 1.2 2008/07/16 21:25:23 caster Exp $
-
-# don't depend on itself
-JAVA_ANT_DISABLE_ANT_CORE_DEP=true
-# rewriting build.xml files for the testcases has no reason atm
-JAVA_PKG_BSFIX_ALL=no
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
-HOMEPAGE="http://ant.apache.org/"
-SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
-	mirror://gentoo/ant-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	!dev-java/ant-tasks
-	!dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# remove bundled xerces
-	rm -v lib/*.jar || die
-
-	# use our split-ant build.xml
-	mv -f "${WORKDIR}/build.xml" . || die
-
-	# bug #196080
-	java-ant_bsfix_one build.xml
-}
-
-src_compile() {
-	export ANT_HOME=""
-
-	local bsyscp
-
-	# this ensures that when building ant with bootstrapped ant,
-	# only the source is used for resolving references, and not
-	# the classes in bootstrapped ant
-	# but jikes in kaffe has issues with this...
-	if ! java-pkg_current-vm-matches kaffe; then
-		bsyscp="-Dbuild.sysclasspath=ignore"
-	fi
-
-	./build.sh ${bsyscp} jars-core internal_dist $(use_doc javadocs) \
-		|| die "build failed"
-}
-
-src_install() {
-	dodir /usr/share/ant/lib
-	for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
-		java-pkg_dojar build/lib/${jar}
-		dosym /usr/share/${PN}/lib/${jar} /usr/share/ant/lib/${jar}
-	done
-
-	newbin "${FILESDIR}/${PV}-ant" ant || die "failed to install wrapper"
-	dodir /usr/share/${PN}/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/${PN}/bin/${each}
-	done
-	dosym /usr/share/${PN}/bin /usr/share/ant/bin
-
-	insinto /usr/share/${PN}
-	doins -r dist/etc
-	dosym /usr/share/${PN}/etc /usr/share/ant/etc
-
-	echo "ANT_HOME=\"/usr/share/ant\"" > "${T}/20ant"
-	doenvd "${T}/20ant" || die "failed to install env.d file"
-
-	dodoc README WHATSNEW KEYS
-
-	if use doc; then
-		dohtml welcome.html
-		dohtml -r docs/*
-		java-pkg_dojavadoc --symlink manual/api build/javadocs
-	fi
-
-	use source && java-pkg_dosrc src/main/*
-}
-
-pkg_postinst() {
-	elog "The way of packaging ant in Gentoo has changed significantly since"
-	elog "the 1.7.0 version, For more information, please see:"
-	elog "http://www.gentoo.org/proj/en/java/ant-guide.xml"
-	elog
-	elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
-	elog "flags have been moved to dev-java/ant."
-}
diff --git a/dev-java/ant-core/files/1.7.0-ant b/dev-java/ant-core/files/1.7.0-ant
deleted file mode 100755
index e5d1a7100495..000000000000
--- a/dev-java/ant-core/files/1.7.0-ant
+++ /dev/null
@@ -1,197 +0,0 @@
-#! /bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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-core/files/1.7.0-ant,v 1.1 2007/01/21 21:56:58 caster 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 (ONLY if ANT_HOME has NOT been set)
-  if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then
-      if [ -f "/etc/ant.conf" ] ; then
-          . /etc/ant.conf
-      fi
-  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
-
-export WANT_JAVA_CONFIG=2
-
-# Always get JAVA_HOME from java-config.
-# Use GENTOO_VM to change which VM is used instead.
-export JAVA_HOME="$(java-config -g JAVA_HOME)"
-
-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-core
-
-# set ANT_LIB location
-ANT_LIB="${ANT_HOME}/lib"
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-      JAVACMD="$JAVA_HOME/bin/java"
-  else
-    JAVACMD=`which java 2> /dev/null `
-    if [ -z "$JAVACMD" ] ; then
-        JAVACMD=java
-    fi
-  fi
-fi
-
-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 ANT_TASKS is not set, default to "all"
-ANT_TASKS="${ANT_TASKS:-all}"
-
-# if ANT_TASKS is set to "all", get the tasks list from /usr/share/ant/tasks/
-if [[ "${ANT_TASKS}" == "all" ]]; then
-	ANT_TASKS=""
-	# but only if it exists
-	if [[ -d /usr/share/ant/tasks ]]; then
-		ANT_TASKS="${ANT_TASKS} "/usr/share/ant/tasks/*
-	fi
-	if [[ -d /usr/share/ant/tasks-1.7.0 ]]; then
-		ANT_TASKS="${ANT_TASKS} "/usr/share/ant/tasks-1.7.0/*
-	fi
-# if set to "none", make ANT_TASKS empty list
-elif [[ "${ANT_TASKS}" == "none" ]]; then
-	ANT_TASKS=""
-fi
-# otherwise ANT_TASKS defines explicit task list
-
-# construct the tasks list separated with commas to pass to java-config
-TASKS_LIST=""
-for task in $ANT_TASKS; do
-  TASKS_LIST="${TASKS_LIST},$(basename $task)"
-done
-TASKS_LIST=${TASKS_LIST#,}
-
-# get the classpath for optional tasks and their dependency .jar files
-if [[ -n "${TASKS_LIST}" ]] ; then
-  ANT_TASKS_CLASSPATH="-lib \"$(java-config -dp ${TASKS_LIST})\""
-  ANT_TASKS_LIBPATH="-Djava.library.path=\"$(java-config -di ${TASKS_LIST})\""
-else
-  ANT_TASKS_CLASSPATH=""
-  ANT_TASKS_LIBPATH=""
-fi
-
-TOOLS_JAR="$(java-config --tools)"
-
-if [[ -n "${TOOLS_JAR}" ]] ; then
-  LOCALCLASSPATH="$LOCALCLASSPATH:${TOOLS_JAR}"
-else
-  echo "Warning: Unable to determine tools.jar location."
-  echo "  If build fails because sun.* classes could not be found,"
-  echo "  Make sure you are using a JDK, not JRE as your user/system VM."
-  echo "  and that you have java-config version 2.0.30 or above installed."
-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
-
-ant_exec_command="exec \"${JAVACMD}\" ${ANT_OPTS} -classpath \"${LOCALCLASSPATH}\" \
-	-Dant.home=\"${ANT_HOME}\" -Dant.library.dir=\"${ANT_LIB}\" ${ant_sys_opts} \
-	${ANT_TASKS_LIBPATH} org.apache.tools.ant.launch.Launcher \
-	${ANT_TASKS_CLASSPATH} ${ANT_ARGS} -cp \"${CLASSPATH}\" ${ant_exec_args}"
-
-if $ant_exec_debug ; then
-    echo $ant_exec_command
-fi
-eval $ant_exec_command
diff --git a/dev-java/ant-core/files/1.7.1-ant b/dev-java/ant-core/files/1.7.1-ant
deleted file mode 100644
index d31519cafd70..000000000000
--- a/dev-java/ant-core/files/1.7.1-ant
+++ /dev/null
@@ -1,197 +0,0 @@
-#! /bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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-core/files/1.7.1-ant,v 1.2 2008/07/16 14:41:51 caster 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 (ONLY if ANT_HOME has NOT been set)
-  if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then
-      if [ -f "/etc/ant.conf" ] ; then
-          . /etc/ant.conf
-      fi
-  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
-
-export WANT_JAVA_CONFIG=2
-
-# Always get JAVA_HOME from java-config.
-# Use GENTOO_VM to change which VM is used instead.
-export JAVA_HOME="$(java-config -g JAVA_HOME)"
-
-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-core
-
-# set ANT_LIB location
-ANT_LIB="${ANT_HOME}/lib"
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-      JAVACMD="$JAVA_HOME/bin/java"
-  else
-    JAVACMD=`which java 2> /dev/null `
-    if [ -z "$JAVACMD" ] ; then
-        JAVACMD=java
-    fi
-  fi
-fi
-
-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 ANT_TASKS is not set, default to "all"
-ANT_TASKS="${ANT_TASKS:-all}"
-
-# if ANT_TASKS is set to "all", get the tasks list from /usr/share/ant/tasks/
-if [[ "${ANT_TASKS}" == "all" ]]; then
-	ANT_TASKS=""
-	# but only if it exists
-	if [[ -d /usr/share/ant/tasks ]]; then
-		ANT_TASKS="${ANT_TASKS} "/usr/share/ant/tasks/*
-	fi
-	if [[ -d /usr/share/ant/tasks-1.7.1 ]]; then
-		ANT_TASKS="${ANT_TASKS} "/usr/share/ant/tasks-1.7.1/*
-	fi
-# if set to "none", make ANT_TASKS empty list
-elif [[ "${ANT_TASKS}" == "none" ]]; then
-	ANT_TASKS=""
-fi
-# otherwise ANT_TASKS defines explicit task list
-
-# construct the tasks list separated with commas to pass to java-config
-TASKS_LIST=""
-for task in $ANT_TASKS; do
-  TASKS_LIST="${TASKS_LIST},$(basename $task)"
-done
-TASKS_LIST=${TASKS_LIST#,}
-
-# get the classpath for optional tasks and their dependency .jar files
-if [[ -n "${TASKS_LIST}" ]] ; then
-  ANT_TASKS_CLASSPATH="-lib \"$(java-config -dp ${TASKS_LIST})\""
-  ANT_TASKS_LIBPATH="-Djava.library.path=\"$(java-config -di ${TASKS_LIST})\""
-else
-  ANT_TASKS_CLASSPATH=""
-  ANT_TASKS_LIBPATH=""
-fi
-
-TOOLS_JAR="$(java-config --tools)"
-
-if [[ -n "${TOOLS_JAR}" ]] ; then
-  LOCALCLASSPATH="$LOCALCLASSPATH:${TOOLS_JAR}"
-else
-  echo "Warning: Unable to determine tools.jar location."
-  echo "  If build fails because sun.* classes could not be found,"
-  echo "  Make sure you are using a JDK, not JRE as your user/system VM."
-  echo "  and that you have java-config version 2.0.30 or above installed."
-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
-
-ant_exec_command="exec \"${JAVACMD}\" ${ANT_OPTS} -classpath \"${LOCALCLASSPATH}\" \
-	-Dant.home=\"${ANT_HOME}\" -Dant.library.dir=\"${ANT_LIB}\" ${ant_sys_opts} \
-	${ANT_TASKS_LIBPATH} org.apache.tools.ant.launch.Launcher \
-	${ANT_TASKS_CLASSPATH} ${ANT_ARGS} -cp \"${CLASSPATH}\" ${ant_exec_args}"
-
-if $ant_exec_debug ; then
-    echo $ant_exec_command
-fi
-eval $ant_exec_command
diff --git a/dev-java/ant-core/files/ant-core-1.7.0-services.patch b/dev-java/ant-core/files/ant-core-1.7.0-services.patch
deleted file mode 100644
index 423e066d2c04..000000000000
--- a/dev-java/ant-core/files/ant-core-1.7.0-services.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -U3 apache-ant-1.7.0/src/main/org/apache/tools/ant/taskdefs/Jar.java apache-ant-1.7.0.my/src/main/org/apache/tools/ant/taskdefs/Jar.java
---- apache-ant-1.7.0/src/main/org/apache/tools/ant/taskdefs/Jar.java	2006-12-13 13:16:21.000000000 +0100
-+++ apache-ant-1.7.0.my/src/main/org/apache/tools/ant/taskdefs/Jar.java	2008-06-16 17:58:08.000000000 +0200
-@@ -397,7 +397,7 @@
-            service = (Service) serviceIterator.next();
-            //stolen from writeManifest
-            super.zipFile(service.getAsStream(), zOut,
--                         "META-INF/service/" + service.getType(),
-+                         "META-INF/services/" + service.getType(),
-                          System.currentTimeMillis(), null,
-                          ZipFileSet.DEFAULT_FILE_MODE);
-         }
diff --git a/dev-java/ant-jai/ChangeLog b/dev-java/ant-jai/ChangeLog
index 728c938a38f1..59bb9c232814 100644
--- a/dev-java/ant-jai/ChangeLog
+++ b/dev-java/ant-jai/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-jai
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ChangeLog,v 1.14 2009/01/07 19:28:32 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ChangeLog,v 1.15 2009/05/15 22:23:03 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org> -ant-jai-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> ant-jai-1.7.1.ebuild:
   Marking ant-jai-1.7.1 ppc64 for bug 250466
diff --git a/dev-java/ant-jai/ant-jai-1.7.0.ebuild b/dev-java/ant-jai/ant-jai-1.7.0.ebuild
deleted file mode 100644
index 056407af2f9e..000000000000
--- a/dev-java/ant-jai/ant-jai-1.7.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ant-jai-1.7.0.ebuild,v 1.10 2007/05/12 18:17:39 wltjr Exp $
-
-ANT_TASK_DEPNAME="sun-jai-bin"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-# unmigrated, has textrels and there's also some source one now too
-DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-javamail/ChangeLog b/dev-java/ant-javamail/ChangeLog
index 8984f1155891..f101edc4b811 100644
--- a/dev-java/ant-javamail/ChangeLog
+++ b/dev-java/ant-javamail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-javamail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ChangeLog,v 1.16 2009/01/07 19:10:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ChangeLog,v 1.17 2009/05/15 22:23:22 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org>
+  -ant-javamail-1.7.0.ebuild, -ant-javamail-1.7.0-r1.ebuild,
+  -ant-javamail-1.7.0-r2.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> ant-javamail-1.7.1.ebuild:
   Marking ant-javamail-1.7.1 ppc64 for bug 250466
diff --git a/dev-java/ant-javamail/ant-javamail-1.7.0-r1.ebuild b/dev-java/ant-javamail/ant-javamail-1.7.0-r1.ebuild
deleted file mode 100644
index 2e78dcc572af..000000000000
--- a/dev-java/ant-javamail/ant-javamail-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ant-javamail-1.7.0-r1.ebuild,v 1.2 2008/04/27 11:07:47 caster Exp $
-
-ANT_TASK_DEPNAME="--virtual javamail"
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for javamail"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DEPEND="java-virtuals/javamail
-	>=dev-java/sun-jaf-1.1"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-	java-pkg_jar-from sun-jaf
-}
diff --git a/dev-java/ant-javamail/ant-javamail-1.7.0-r2.ebuild b/dev-java/ant-javamail/ant-javamail-1.7.0-r2.ebuild
deleted file mode 100644
index 6376e06fd537..000000000000
--- a/dev-java/ant-javamail/ant-javamail-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ant-javamail-1.7.0-r2.ebuild,v 1.1 2008/04/28 00:58:02 betelgeuse Exp $
-
-ANT_TASK_DEPNAME="--virtual javamail,jaf"
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for javamail"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DEPEND="java-virtuals/javamail java-virtuals/jaf"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-}
diff --git a/dev-java/ant-javamail/ant-javamail-1.7.0.ebuild b/dev-java/ant-javamail/ant-javamail-1.7.0.ebuild
deleted file mode 100644
index 0aca899c61df..000000000000
--- a/dev-java/ant-javamail/ant-javamail-1.7.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ant-javamail-1.7.0.ebuild,v 1.9 2007/05/12 18:11:58 wltjr Exp $
-
-ANT_TASK_DEPNAME="sun-javamail"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-
-DEPEND=">=dev-java/sun-javamail-1.4
-	>=dev-java/sun-jaf-1.1"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-	java-pkg_jar-from sun-jaf
-}
diff --git a/dev-java/ant-jdepend/ChangeLog b/dev-java/ant-jdepend/ChangeLog
index 4fe4d3ce19b0..3de70ec111e0 100644
--- a/dev-java/ant-jdepend/ChangeLog
+++ b/dev-java/ant-jdepend/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-jdepend
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ChangeLog,v 1.14 2009/01/07 19:15:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ChangeLog,v 1.15 2009/05/15 22:23:42 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org>
+  -ant-jdepend-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> ant-jdepend-1.7.1.ebuild:
   Marking ant-jdepend-1.7.1 ppc64 for bug 250466
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.7.0.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.7.0.ebuild
deleted file mode 100644
index 2bf97f0b1c2c..000000000000
--- a/dev-java/ant-jdepend/ant-jdepend-1.7.0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ant-jdepend-1.7.0.ebuild,v 1.10 2007/05/12 18:12:57 wltjr Exp $
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-DEPEND=">=dev-java/jdepend-2.9-r2"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jmf/ChangeLog b/dev-java/ant-jmf/ChangeLog
index b119d49a7538..7b27a85ec62a 100644
--- a/dev-java/ant-jmf/ChangeLog
+++ b/dev-java/ant-jmf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-jmf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ChangeLog,v 1.15 2009/04/20 09:57:32 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ChangeLog,v 1.16 2009/05/15 22:24:03 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org> -ant-jmf-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   20 Apr 2009; Jean-Noël Rivasseau <elvanor@gentoo.org>
   ant-jmf-1.7.1.ebuild:
diff --git a/dev-java/ant-jmf/ant-jmf-1.7.0.ebuild b/dev-java/ant-jmf/ant-jmf-1.7.0.ebuild
deleted file mode 100644
index 2dbd43b62c40..000000000000
--- a/dev-java/ant-jmf/ant-jmf-1.7.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ant-jmf-1.7.0.ebuild,v 1.10 2007/05/12 18:14:20 wltjr Exp $
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-src_unpack() {
-	# seems no need to dep on jmf-bin, the classes ant imports are in J2SE API since 1.3
-	ant-tasks_src_unpack base
-}
diff --git a/dev-java/ant-jsch/ChangeLog b/dev-java/ant-jsch/ChangeLog
index 730144f24461..fc20dd5c688e 100644
--- a/dev-java/ant-jsch/ChangeLog
+++ b/dev-java/ant-jsch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-jsch
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ChangeLog,v 1.17 2009/01/07 19:18:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ChangeLog,v 1.18 2009/05/15 22:24:23 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org>
+  -ant-jsch-1.7.0-r1.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> ant-jsch-1.7.1.ebuild:
   Marking ant-jsch-1.7.1 ppc64 for bug 250466
diff --git a/dev-java/ant-jsch/ant-jsch-1.7.0-r1.ebuild b/dev-java/ant-jsch/ant-jsch-1.7.0-r1.ebuild
deleted file mode 100644
index 1ed291b14931..000000000000
--- a/dev-java/ant-jsch/ant-jsch-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ant-jsch-1.7.0-r1.ebuild,v 1.5 2007/05/12 18:15:14 wltjr Exp $
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-DEPEND=">=dev-java/jsch-0.1.21-r2"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/1.7-scp-hang.patch"
-}
diff --git a/dev-java/ant-junit/ChangeLog b/dev-java/ant-junit/ChangeLog
index dd0dd1366c58..1ac4b401a66b 100644
--- a/dev-java/ant-junit/ChangeLog
+++ b/dev-java/ant-junit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-junit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ChangeLog,v 1.14 2009/01/07 19:03:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ChangeLog,v 1.15 2009/05/15 22:24:43 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org> -ant-junit-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> ant-junit-1.7.1.ebuild:
   Marking ant-junit-1.7.1 ppc64 for bug 250466
diff --git a/dev-java/ant-junit/ant-junit-1.7.0.ebuild b/dev-java/ant-junit/ant-junit-1.7.0.ebuild
deleted file mode 100644
index be4ca197a813..000000000000
--- a/dev-java/ant-junit/ant-junit-1.7.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ant-junit-1.7.0.ebuild,v 1.10 2007/05/12 18:16:10 wltjr Exp $
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-DEPEND="=dev-java/junit-3*"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	eant jar-junit
-}
diff --git a/dev-java/ant-junit4/ChangeLog b/dev-java/ant-junit4/ChangeLog
index b44426ad3965..c884ac895193 100644
--- a/dev-java/ant-junit4/ChangeLog
+++ b/dev-java/ant-junit4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-junit4
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ChangeLog,v 1.8 2009/01/07 15:06:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ChangeLog,v 1.9 2009/05/15 22:25:03 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org> -ant-junit4-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> ant-junit4-1.7.1.ebuild:
   Marking ant-junit4-1.7.1 ppc64 for bug 252819
diff --git a/dev-java/ant-junit4/ant-junit4-1.7.0.ebuild b/dev-java/ant-junit4/ant-junit4-1.7.0.ebuild
deleted file mode 100644
index bac11a3ad9ff..000000000000
--- a/dev-java/ant-junit4/ant-junit4-1.7.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ant-junit4-1.7.0.ebuild,v 1.4 2008/07/22 19:38:53 corsair Exp $
-
-ANT_TASK_JDKVER=1.5
-ANT_TASK_JREVER=1.5
-ANT_TASK_DEPNAME="junit-4"
-
-inherit ant-tasks
-
-DESCRIPTION="A copy of ant-junit package which uses junit-4 to run <junit> tasks."
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DEPEND="=dev-java/junit-4*"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	eant jar-junit
-}
-
-src_install() {
-	# no registration as ant-task, would be loaded together with ant-junit
-	java-pkg_newjar build/lib/ant-junit.jar
-}
diff --git a/dev-java/ant-nodeps/ChangeLog b/dev-java/ant-nodeps/ChangeLog
index 4882bd954107..052347a49529 100644
--- a/dev-java/ant-nodeps/ChangeLog
+++ b/dev-java/ant-nodeps/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-nodeps
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ChangeLog,v 1.16 2009/01/07 19:00:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ChangeLog,v 1.17 2009/05/15 22:25:24 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org> -ant-nodeps-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> ant-nodeps-1.7.1.ebuild:
   Marking ant-nodeps-1.7.1 ppc64 for bug 250466
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.7.0.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.7.0.ebuild
deleted file mode 100644
index a328f90b5a8a..000000000000
--- a/dev-java/ant-nodeps/ant-nodeps-1.7.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.7.0.ebuild,v 1.11 2007/08/21 12:50:18 opfer Exp $
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks requiring no external deps"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-src_unpack() {
-	ant-tasks_src_unpack base
-	java-pkg_jar-from --build-only ant-core ant-launcher.jar
-	java-pkg_filter-compiler jikes
-}
-
-src_compile() {
-	eant jar-nodeps
-}
diff --git a/dev-java/ant-swing/ChangeLog b/dev-java/ant-swing/ChangeLog
index b243b8a8e347..c865a2baf2bb 100644
--- a/dev-java/ant-swing/ChangeLog
+++ b/dev-java/ant-swing/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-swing
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ChangeLog,v 1.15 2009/04/20 09:58:11 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ChangeLog,v 1.16 2009/05/15 22:25:44 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org> -ant-swing-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   20 Apr 2009; Jean-Noël Rivasseau <elvanor@gentoo.org>
   ant-swing-1.7.1.ebuild:
diff --git a/dev-java/ant-swing/ant-swing-1.7.0.ebuild b/dev-java/ant-swing/ant-swing-1.7.0.ebuild
deleted file mode 100644
index cb2ab716c101..000000000000
--- a/dev-java/ant-swing/ant-swing-1.7.0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ant-swing-1.7.0.ebuild,v 1.10 2007/05/12 18:20:36 wltjr Exp $
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-src_unpack() {
-	ant-tasks_src_unpack base
-}
diff --git a/dev-java/ant-trax/ChangeLog b/dev-java/ant-trax/ChangeLog
index b785df23ce33..8c468a959cb0 100644
--- a/dev-java/ant-trax/ChangeLog
+++ b/dev-java/ant-trax/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant-trax
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ChangeLog,v 1.14 2009/01/07 19:13:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ChangeLog,v 1.15 2009/05/15 22:26:05 caster Exp $
+
+  15 May 2009; Vlastimil Babka <caster@gentoo.org> -ant-trax-1.7.0.ebuild:
+  Removing ant 1.7.0, bug #261563.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> ant-trax-1.7.1.ebuild:
   Marking ant-trax-1.7.1 ppc64 for bug 250466
diff --git a/dev-java/ant-trax/ant-trax-1.7.0.ebuild b/dev-java/ant-trax/ant-trax-1.7.0.ebuild
deleted file mode 100644
index 166bae11d353..000000000000
--- a/dev-java/ant-trax/ant-trax-1.7.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ant-trax-1.7.0.ebuild,v 1.10 2007/05/12 18:19:06 wltjr Exp $
-
-ANT_TASK_DEPNAME="xalan"
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant .jar with optional tasks depending on XML transformer (xalan)"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-# it will build without it (ant manual says it's not needed since 1.4 JDK, dunno bout kaffe
-# but contains a Xalan2Executor task which probably wouldn't work
-DEPEND=">=dev-java/xalan-2.7.0-r2
-	~dev-java/ant-junit-${PV}"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-	java-pkg_jar-from ant-junit
-}