summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-11-24 17:57:06 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-11-24 17:57:06 +0000
commit5023a0c4efaf8c191d66a5131fcf323de3f011a4 (patch)
tree8bb9ee01f40c0d44a3d64a82184a1178b968bbe8 /dev-java/commons-io
parentStable on ppc64; bug #186809 (diff)
downloadgentoo-2-5023a0c4efaf8c191d66a5131fcf323de3f011a4.tar.gz
gentoo-2-5023a0c4efaf8c191d66a5131fcf323de3f011a4.tar.bz2
gentoo-2-5023a0c4efaf8c191d66a5131fcf323de3f011a4.zip
Only run tests when userpriv is enabled and rewrite build.xml to use clonevm so that we can change java.io.tmpdir to .
(Portage version: 2.1.4_rc2)
Diffstat (limited to 'dev-java/commons-io')
-rw-r--r--dev-java/commons-io/ChangeLog7
-rw-r--r--dev-java/commons-io/commons-io-1.3.2.ebuild25
2 files changed, 22 insertions, 10 deletions
diff --git a/dev-java/commons-io/ChangeLog b/dev-java/commons-io/ChangeLog
index 4ebb7944847d..0bef8b910d18 100644
--- a/dev-java/commons-io/ChangeLog
+++ b/dev-java/commons-io/ChangeLog
@@ -1,6 +1,11 @@
# 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.37 2007/11/19 18:28:53 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.38 2007/11/24 17:57:06 betelgeuse Exp $
+
+ 24 Nov 2007; Petteri Räty <betelgeuse@gentoo.org>
+ commons-io-1.3.2.ebuild:
+ Only run tests when userpriv is enabled and rewrite build.xml to use clonevm
+ so that we can change java.io.tmpdir to $T.
19 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org>
commons-io-1.3.2.ebuild:
diff --git a/dev-java/commons-io/commons-io-1.3.2.ebuild b/dev-java/commons-io/commons-io-1.3.2.ebuild
index df73187e665e..a0befa1219ee 100644
--- a/dev-java/commons-io/commons-io-1.3.2.ebuild
+++ b/dev-java/commons-io/commons-io-1.3.2.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.2.ebuild,v 1.6 2007/11/19 18:28:53 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/commons-io-1.3.2.ebuild,v 1.7 2007/11/24 17:57:06 betelgeuse Exp $
JAVA_PKG_IUSE="doc source"
@@ -27,18 +27,25 @@ src_unpack() {
cd "${S}"
java-ant_ignore-system-classes
java-ant_rewrite-classpath
+ # Setting java.io.tmpdir doesn't have effect unless we do this because the
+ # vm is forked
+ java-ant_xml-rewrite -f build.xml --change -e junit -a clonevm -v "true"
}
-src_compile() {
- eant jar $(use_doc javadoc) -Duser.home="${T}"
-}
+EANT_EXTRA_ARGS="-Duser.home=${T}"
src_test() {
- ANT_OPTS="-Djava.io.tmpdir=${T} -Duser.home=${T}" \
- ANT_TASKS="ant-junit" \
- eant test \
- -Dgentoo.classpath="$(java-pkg_getjars junit)" \
- -Dlibdir="libdir"
+ if has userpriv ${FEATURES}; then
+ ANT_OPTS="-Djava.io.tmpdir=${T} -Duser.home=${T}" \
+ ANT_TASKS="ant-junit" \
+ eant test \
+ -Dgentoo.classpath="$(java-pkg_getjars junit)" \
+ -Dlibdir="libdir" \
+ -Djava.io.tmpdir="${T}"
+ else
+ elog "Tests fail unless userpriv is enabled because they test for"
+ elog "file permissions which doesn't work when run as root."
+ fi
}
src_install() {