Remove monolithic ant support as split ant is stable now.

Package-Manager: portage-2.1.3_rc9

4 files changed, 13 insertions, 11 deletions

diff --git a/dev-java/xjavadoc/ChangeLog b/dev-java/xjavadoc/ChangeLog
index a0ca2aa41828..c48735551b50 100644
--- a/dev-java/xjavadoc/ChangeLog
+++ b/dev-java/xjavadoc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xjavadoc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/ChangeLog,v 1.11 2007/04/26 21:24:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/ChangeLog,v 1.12 2007/08/03 15:46:13 betelgeuse Exp $
+
+  03 Aug 2007; Petteri Räty <betelgeuse@gentoo.org> xjavadoc-1.1-r1.ebuild:
+  Remove monolithic ant support as split ant is stable now.
 
   26 Apr 2007; Vlastimil Babka <caster@gentoo.org> xjavadoc-1.1-r1.ebuild:
   Add missing junit dep, minor style tweaks.
diff --git a/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild b/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild
index f6a5635ddb82..16b927907d5c 100644
--- a/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild
+++ b/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild,v 1.6 2007/04/26 21:24:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild,v 1.7 2007/08/03 15:46:13 betelgeuse Exp $
 
 JAVA_PKG_IUSE="source"
+WANT_ANT_TASKS="ant-nodeps"
+
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="A standalone implementation of JavaDoc engine suited for XDoclet"
@@ -21,7 +23,6 @@ COMMON_DEPEND="dev-java/commons-collections
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEPEND}"
 DEPEND=">=virtual/jdk-1.4
-	|| ( dev-java/ant-nodeps dev-java/ant-tasks )
 	dev-java/javacc
 	${COMMON_DEPEND}"
 
@@ -38,8 +39,6 @@ src_unpack() {
 	java-pkg_jar-from --build-only javacc
 }
 
-EANT_ANT_TASKS="ant-nodeps"
-
 src_install() {
 	java-pkg_dojar target/${PN}.jar
 	use source && java-pkg_dosrc src/*
diff --git a/dev-java/xpp3/ChangeLog b/dev-java/xpp3/ChangeLog
index b8d8df7677d3..3cb99ed17826 100644
--- a/dev-java/xpp3/ChangeLog
+++ b/dev-java/xpp3/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xpp3
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/ChangeLog,v 1.16 2007/06/03 22:38:19 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/ChangeLog,v 1.17 2007/08/03 15:46:01 betelgeuse Exp $
+
+  03 Aug 2007; Petteri Räty <betelgeuse@gentoo.org> xpp3-1.1.4c.ebuild:
+  Remove monolithic ant support as split ant is stable now.
 
   03 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> -xpp3-1.1.3.4m.ebuild:
   Remove generation 1 ebuild.
diff --git a/dev-java/xpp3/xpp3-1.1.4c.ebuild b/dev-java/xpp3/xpp3-1.1.4c.ebuild
index 8ba19bfd9c1a..88ab1ac53229 100644
--- a/dev-java/xpp3/xpp3-1.1.4c.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/xpp3-1.1.4c.ebuild,v 1.7 2007/05/09 14:53:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/xpp3-1.1.4c.ebuild,v 1.8 2007/08/03 15:46:01 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -20,10 +20,7 @@ IUSE="test"
 
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip
-	test? (
-		=dev-java/junit-3.8*
-		|| ( dev-java/ant-junit dev-java/ant-tasks )
-	)"
+	test? ( dev-java/ant-junit )"
 RDEPEND=">=virtual/jre-1.4"
 
 S=${WORKDIR}/${MY_P}