Only run tests when userpriv is enabled and rewrite build.xml to use clonevm so that we can change java.io.tmpdir to .

Package-Manager: portage-2.1.4_rc2

3 files changed, 40 insertions, 18 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/Manifest b/dev-java/commons-io/Manifest
index b3d811473bac..7c9e2a728cc7 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX commons-io-1.3-build.xml.patch 1026 RMD160 f8fdd740aea41e8e54dd09f0a2585da43e2dc9b2 SHA1 f5bdd83e997dfd49329895eb21d18efa73f431b4 SHA256 e4c6b2738d4b8e4a269153cc8d20ecbcc5c0fd03340dfc7d5538ab094c552fd1
 MD5 57e860da0874edeb8492e4df9dcf81b9 files/commons-io-1.3-build.xml.patch 1026
 RMD160 f8fdd740aea41e8e54dd09f0a2585da43e2dc9b2 files/commons-io-1.3-build.xml.patch 1026
@@ -12,14 +15,14 @@ EBUILD commons-io-1.3.1.ebuild 1498 RMD160 5edb60a0a93f74c8d1bcbfa4c2267b5079df4
 MD5 7a0419896f1e7201e7e2634d07550513 commons-io-1.3.1.ebuild 1498
 RMD160 5edb60a0a93f74c8d1bcbfa4c2267b5079df4d71 commons-io-1.3.1.ebuild 1498
 SHA256 73900923849d271feea545663965685a1b60542f552e73f0dfc7bcaeb2c00bd8 commons-io-1.3.1.ebuild 1498
-EBUILD commons-io-1.3.2.ebuild 1276 RMD160 ae42b19a67afaec3e20e925193141c2193327585 SHA1 125b0d7a83477ab429d0e79cbafc8471bdb176ca SHA256 3a1b61ce0890a7376608370beb83b6a4e55ca4b35db3ab2ec78fe9cf425a2cdc
-MD5 bc6c3c1e30f63645de5fd798cd2bada5 commons-io-1.3.2.ebuild 1276
-RMD160 ae42b19a67afaec3e20e925193141c2193327585 commons-io-1.3.2.ebuild 1276
-SHA256 3a1b61ce0890a7376608370beb83b6a4e55ca4b35db3ab2ec78fe9cf425a2cdc commons-io-1.3.2.ebuild 1276
-MISC ChangeLog 5151 RMD160 b47d2483227419d7934f15e78bf358c48a9a1f7b SHA1 ebe42f7b39ad2a89e395308dfa8a73ec72136885 SHA256 d298a7e3a13b9cb2a7a61ed99ee586c1706e9ba2e8a9d9b7155448ef9b5d0027
-MD5 689e7f035dd80a5984d577ed3afced21 ChangeLog 5151
-RMD160 b47d2483227419d7934f15e78bf358c48a9a1f7b ChangeLog 5151
-SHA256 d298a7e3a13b9cb2a7a61ed99ee586c1706e9ba2e8a9d9b7155448ef9b5d0027 ChangeLog 5151
+EBUILD commons-io-1.3.2.ebuild 1627 RMD160 26d2ac684d0f51fcce15ec6a74e00e533a4327a9 SHA1 1d51dfe77b47b258bdacb5c607c2a28fda11d3e5 SHA256 a38ad5faa952179c9ba6f5e0f5cb39dfef4efa45f4dacd6b143fc9545f9b80ba
+MD5 3bc5883e974b877fe68afa8fe7128476 commons-io-1.3.2.ebuild 1627
+RMD160 26d2ac684d0f51fcce15ec6a74e00e533a4327a9 commons-io-1.3.2.ebuild 1627
+SHA256 a38ad5faa952179c9ba6f5e0f5cb39dfef4efa45f4dacd6b143fc9545f9b80ba commons-io-1.3.2.ebuild 1627
+MISC ChangeLog 5362 RMD160 ec5f97d5ed46a9a5306522a61596ebdbb29c465f SHA1 a2f7b5a9e542d02d9efcdc641cca3d18aa31441e SHA256 3a8275965e32b009eea8d54ef92989a7e31f95c5721a0900477d586db8cd733d
+MD5 eadc50a1e5c2aa5d78f53b1ee0fbf84d ChangeLog 5362
+RMD160 ec5f97d5ed46a9a5306522a61596ebdbb29c465f ChangeLog 5362
+SHA256 3a8275965e32b009eea8d54ef92989a7e31f95c5721a0900477d586db8cd733d ChangeLog 5362
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -30,3 +33,10 @@ SHA256 a6f7ca7a29e0f9708c47f0ddf7e9717eb4c72e3f30255b7deae4bb1f95a76045 files/di
 MD5 dd9b8c14aa150a1f14e1adc3b30271b6 files/digest-commons-io-1.3.2 262
 RMD160 11658bff7f8a16f12c2c0499f001b2ce6eabc629 files/digest-commons-io-1.3.2 262
 SHA256 e249d716fdd2b77bf801936ae2e4e13eb2ad3dea08de9b4092573b8a44bed6c9 files/digest-commons-io-1.3.2 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHSGWzcxLzpIGCsLQRAm3eAJ0Q4vXsxiMhBtdVoBoi+STlYOOPyQCeOIlk
+0QnAWfo5ul6aOPG5HpbPh+k=
+=UxbP
+-----END PGP SIGNATURE-----
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() {