Migrate to splitted ant.

Package-Manager: portage-2.1.2.2

diff --git a/dev-java/commons-io/ChangeLog b/dev-java/commons-io/ChangeLog
index b55cae07a27f1a004140ce77259f8dbc55206c97..9576731a1f3bf1c076a199874c934427c286d0e9 100644 (file)
--- a/dev-java/commons-io/ChangeLog
+++ b/dev-java/commons-io/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-io
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.23 2007/03/17 19:16:07 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.24 2007/03/17 19:36:52 betelgeuse Exp $
+
+  17 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-io-1.3.1.ebuild:
+  Migrate to splitted ant.
 
   17 Mar 2007; nixnut <nixnut@gentoo.org> commons-io-1.3.ebuild:
   Stable on ppc wrt bug 168793

diff --git a/dev-java/commons-io/commons-io-1.3.1.ebuild b/dev-java/commons-io/commons-io-1.3.1.ebuild
index 101ac7a331476f5c627cba7ab8cbb1ad9c417d02..befa63bfe18d62de67c618df17fd88ca53bc0e17 100644 (file)
--- a/dev-java/commons-io/commons-io-1.3.1.ebuild
+++ b/dev-java/commons-io/commons-io-1.3.1.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/commons-io/commons-io-1.3.1.ebuild,v 1.1 2007/03/16 20:18:00 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/commons-io-1.3.1.ebuild,v 1.2 2007/03/17 19:36:52 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -17,12 +17,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="test"
 
 DEPEND=">=virtual/jdk-1.4
-       source? ( app-arch/zip )
-       test? (
-               =dev-java/junit-3.8*
-               dev-java/ant
-       )
-       !test? ( dev-java/ant-core )"
+       test? ( dev-java/ant-junit )"
 RDEPEND=">=virtual/jre-1.4"
 
 S="${WORKDIR}/${MY_P}"
@@ -31,8 +26,8 @@ src_unpack() {
        unpack ${A}
 
        cd "${S}"
-       rm *.jar
-       epatch ${FILESDIR}/${P}-build.xml.patch
+       rm -v *.jar || die
+       epatch "${FILESDIR}/${P}-build.xml.patch"
        java-ant_ignore-system-classes
        java-ant_rewrite-classpath
 }
@@ -40,7 +35,9 @@ src_unpack() {
 src_test() {
        if hasq userpriv ${FEATURES}; then
                #By default libdir is ${HOME}/.maven so it can be /root/.maven
-               ANT_OPTS="-Djava.io.tmpdir=${T}" eant test \
+               ANT_OPTS="-Djava.io.tmpdir=${T}" \
+               ANT_TASKS="ant-junit" \
+                       eant test \
                        -Dgentoo.classpath="$(java-pkg_getjars junit)" \
                        -Dlibdir="libdir"
        else