summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-03-17 19:36:52 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-03-17 19:36:52 +0000
commit51c4f4da1e47800e8fb469221e7fdc5bf5bba552 (patch)
tree4682401a1dc298960d5900f3988336039288d8d9 /dev-java/commons-io
parentStable on ppc wrt bug 166700 (diff)
downloadhistorical-51c4f4da1e47800e8fb469221e7fdc5bf5bba552.tar.gz
historical-51c4f4da1e47800e8fb469221e7fdc5bf5bba552.tar.bz2
historical-51c4f4da1e47800e8fb469221e7fdc5bf5bba552.zip
Migrate to splitted ant.
Package-Manager: portage-2.1.2.2
Diffstat (limited to 'dev-java/commons-io')
-rw-r--r--dev-java/commons-io/ChangeLog6
-rw-r--r--dev-java/commons-io/commons-io-1.3.1.ebuild17
2 files changed, 12 insertions, 11 deletions
diff --git a/dev-java/commons-io/ChangeLog b/dev-java/commons-io/ChangeLog
index b55cae07a27f..9576731a1f3b 100644
--- 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 101ac7a33147..befa63bfe18d 100644
--- 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