Use distutils_install_for_testing().

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

6 files changed, 37 insertions, 39 deletions

diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog
index 066b5084b2dc..717b73875496 100644
--- a/dev-python/logilab-common/ChangeLog
+++ b/dev-python/logilab-common/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/logilab-common
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.121 2013/02/09 20:05:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.122 2013/02/10 11:55:24 mgorny Exp $
+
+  10 Feb 2013; Michał Górny <mgorny@gentoo.org> logilab-common-0.59.0.ebuild:
+  Use distutils_install_for_testing().
 
   09 Feb 2013; Mike Gilbert <floppym@gentoo.org>
   -files/logilab-common-0.59.0-utf8-test.patch, logilab-common-0.59.0.ebuild:
diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
index e1d6faac7b58..96013644b6c4 100644
--- a/dev-python/logilab-common/Manifest
+++ b/dev-python/logilab-common/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX logilab-common-0.59.0-syntax.patch 520 SHA256 77a17ccefe982a2cc64a39b678b9b75253e19ad4f4e9550d7b360c4b3fc5d41a SHA512 deb6d7e4b44dfa8092bd531362a64dfb51fee841e4b4123fb18a7c4cc4f6ce41d222be508c73a2aa62cc8cffd347febd04a648b939b510740316a3f668e3f435 WHIRLPOOL 1840b91834bda4eee3d96e85a6a85d6486a219a82904b606fa29c2d6b4807ef01826e990f1fac2a00f5a03d02fdac16f80a426b2fcfa2707045ed90119fd649d
 AUX logilab-common-0.59.0-utf8-test.patch 1198 SHA256 d4cc82d7430efb8415c45cd0d85fa7cc37175627c6f430720f03647d2c5990e5 SHA512 427d5ea7068f43d92c15f21f353aca261c0d1672c0fc0597152db2fbe3eb73ea70d1fbd71817037908714f2a0d4131e015ebbea5f2ddcfef3b1b9391d17d7c9d WHIRLPOOL 6ec162a5514167dd76fd9762ebd2af3756d4a23bf348b4e6a5931660d58ed2c69e74f9173363ea3d2453172cc3da82d2475fe44bdb7f91ab95ebf7c92ce0be5c
 DIST logilab-common-0.55.2.tar.gz 182524 SHA256 3242039f4e0732b510e03ef638f1ea43e65ddb7154164a9bda02514ee514f99a SHA512 bbc5b3ee84e53a20ddd04be9703022ae73b163537c9a9d812ec4c49fdfdfa9758c3a45e065cb8fb693cca2deb1dfbd032493923ab3000f59d88945139f95719a WHIRLPOOL 8d5f6c62ebf5e5ced1902f4dfed457b94aa879b92ceb854ed715b0d2975a82ebefb38f64bf4f1ff6bf7a57ae63ec4a56f867782d1e0739ed1ee35474e3490b92
@@ -13,6 +16,15 @@ EBUILD logilab-common-0.58.1-r1.ebuild 2654 SHA256 e7f56d5e5ebdd4a654a11e53a4818
 EBUILD logilab-common-0.58.1.ebuild 2099 SHA256 4a117044779e7de41aa23b420c05f42ae64c8cfd593473897f8ff8f4d2ee1d9b SHA512 ea3b1c25c7dcb62859209f3b93374a58a7f84d502ce72fb22753099ad0295919af4ec45f5f779c7feb152b38669016c67ac11fa6a38c63cf1482b697dc6dbfde WHIRLPOOL 64435bf497d7bd92e0a59c34fb3809f4339e176179a830a044aad007b0e20018d110a4d31a8c2c18185cafea76fbcd77b626274f01c3deffb8a013b3cb744f7a
 EBUILD logilab-common-0.58.3-r1.ebuild 2639 SHA256 2f4a816d5d2842c8a1b58dc899f6a9bcc4bb5f1836dcc7438af0f825cecb8bbd SHA512 1ed2258213a04a216f8c5c2a095e39eeaa5bdd5afd5152a6cdfb42f20c1ceb9d1a4e30d99728fc8391def76021d493950bb80acc5e049ebda37c2e9e9f7b7489 WHIRLPOOL ca936c0cfc1cf633e29e2204a97b98eb8e047f65e11a9819d6e6cbc3f5ed1123116d58c6c86c6d8f02f7bc3d66f3d83d48f7baaec49c7af387d7568c4015eae3
 EBUILD logilab-common-0.58.3.ebuild 2651 SHA256 25b8be1c03f29cff9f2f53dafa38972db5b639e5de0f500593760eb998cf4ea5 SHA512 f1cef916c5e23768e198434c6169912b0870f4291aeb593367ff03e99712a556a0c1bd47738250a9dcf9ec56f2e5568c776361124595e58f8c2dc9d7ec15855f WHIRLPOOL a63d479dd6e9f052a7f9ecd884ba8a3c34610c9f179513b8eb331a972a639543dde5aaec982d4b5053c5c8b9573b9e8466897e063f64a329f721d1c13148eb9a
-EBUILD logilab-common-0.59.0.ebuild 2776 SHA256 fedd1a6323f3fc58533402798f2ac35f292c36237c1b110b8385856c9a311517 SHA512 fbb64978168ed86371a588fca783bee066e5bbbb93d45a9b0786c8e2aedb1f4cca3c153bff51a94249b70bae14536cc8c99ce339b8e2d2e3b261a6331786de39 WHIRLPOOL 57084f64815cdda36754c654bf16bb4dc31e02a72ac7fe9d6402aa68e280138213f661fdb9589e8944e9d8a25bdbe69ea35850d69c7406efd182f75496a8a9a2
-MISC ChangeLog 19686 SHA256 a9786b514515d2fda4e3c4ec20c5c92e664250be1d532b870061d3d75fb6cf11 SHA512 0dfd3c377e4c6fc20c09f0b145ff8690bcb6eab4d091267a1efa6a736adfa98d0ec428ad961378b80285b96dc248d01cb9201279d357f3b63df4a91440486e9a WHIRLPOOL a9c6845f17c55ddf55ac43b84d82d5e3f12e77c054edc280b51332cb3d9ad8f7929c9a0abec5e1818ac6d5e54bd9c8c300ca7903826effdbb3c726d1d8236747
+EBUILD logilab-common-0.59.0.ebuild 1973 SHA256 0a4cab163123f6548eab7bd96a93f72db65c56d3410b00f37cc240bbcc19d13c SHA512 a79fda9ba4f329411666fc25f8e0f5c4740d304cd4d0af5e85df5e1fe714833ca0b03b518a1d789ae4973413316a9a5f3904c56892ccdb61291dacea2763b110 WHIRLPOOL ad47c74fbcbfa899dcd94f7ce3545f9e59ad3e276f11817f087c8a6cb786d5302990b748bca7ffd35ae17bc298be3959ab59b609a6a8d8f25a21c07975ff7bc1
+MISC ChangeLog 19805 SHA256 0a009f4412f4507f44fcb7ac142f4eec059c87bf5d3c8cdf7fe0f29e9b887e77 SHA512 aecc49305c8a477a48b3573f32f9434d4f65acc462b308f806a2428c37db5d4116d802db4962dcf55199e499fbfd5f9c45e2f8c68cf98ecaf2a301003bbcf739 WHIRLPOOL b610a5c037aedf7c1608118e10e873df967689f67fd889943d78ffc7ef9fce59a280e450d042106bc7b7f1c9685dfdb50749b6e74cd859069ebb7687bb4091be
 MISC metadata.xml 237 SHA256 523ae42d51ae087b615a63e6b30e3c6c1d3910f2ccc0c03685d6939756660c16 SHA512 74f7a5fc9ffe80a474f05ed5ab7fe94511ea85f65325d3f16c5cb9af5b072b9aaab5ddf99464e34d12a47dd4861a76e16486fc8815a502036530ed74c73047db WHIRLPOOL d95ffbf06f4021d81c7b5f17bc1c240e47db7a3344526c053ae504d8442658d93ffc13d9f89e91991d6327fc92b31bd9499a9ec3f57830dd9834ca3b349b1e1f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iJwEAQEIAAYFAlEXirUACgkQfXuS5UK5QB2ljAP6A4BOTcwTL5jIDGIfWLNif4d7
+fQ1dJvUllS07NOOBBf3nsH5/wZysr6U6NPr+KGD66oO5bA3/5FVnorMD+M1YyOKr
+Emdd9q7I8eW3iIN3N54Riut06EkAUq2pYAYSOxdXub4g2x4qd4Gv0BHT8hi9M2AQ
+E4AO8p/0hT/OuZJjPIw=
+=oK0C
+-----END PGP SIGNATURE-----
diff --git a/dev-python/logilab-common/logilab-common-0.59.0.ebuild b/dev-python/logilab-common/logilab-common-0.59.0.ebuild
index 962f5fb14c45..78d55fe5093f 100644
--- a/dev-python/logilab-common/logilab-common-0.59.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.59.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.59.0.ebuild,v 1.6 2013/02/10 05:27:36 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.59.0.ebuild,v 1.7 2013/02/10 11:55:24 mgorny Exp $
 
 EAPI=5
 # broken with python3.3, bug #449276
@@ -51,33 +51,14 @@ python_compile_all() {
 }
 
 python_test() {
-	# The package has to be 'installed' before testing.
-	# 1) because of namespaces, we can't use 'install --root',
-	# 2) 'install --home' is terribly broken on pypy,
-	# 3) non-root 'install' complains about PYTHONPATH and missing dirs,
-	#    so we need to set it properly and mkdir them,
-	# 4) it runs a bunch of commands which write random files to cwd,
-	#    in order to avoid that, we need to run them ourselves to pass
-	#    alternate build paths,
-	# 5) 'install' needs to go before 'bdist_egg' or the latter would
-	#    re-set install paths.
-
-	local tpath=${BUILD_DIR}/test
-	local bindir=${tpath}/bin
-	local libdir=${tpath}/lib
-	local PYTHONPATH=${libdir}:${PYTHONPATH}
-
-	mkdir -p "${libdir}" || die
-	esetup.py egg_info --egg-base="${tpath}" \
-		install --install-lib="${libdir}" --install-scripts="${bindir}" \
-		bdist_egg --dist-dir="${tpath}"
+	distutils_install_for_testing
 
 	# Prevent timezone related failure.
 	export TZ=UTC
 
 	# Make sure that the tests use correct modules.
-	cd "${libdir}" || die
-	"${bindir}"/pytest || die "Tests fail with ${EPYTHON}"
+	cd "${TEST_DIR}"/lib || die
+	"${TEST_DIR}"/scripts/pytest || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 246e2be2bb85..65ed9d8b1bad 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.184 2013/02/03 13:48:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.185 2013/02/10 11:55:23 mgorny Exp $
+
+  10 Feb 2013; Michał Górny <mgorny@gentoo.org> numpy-1.6.2-r2.ebuild:
+  Use distutils_install_for_testing().
 
 *numpy-1.6.2-r2 (03 Feb 2013)
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index cb7f9e99692e..5d1243c8fd81 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -6,16 +6,16 @@ DIST numpy-1.6.0-html.zip 9242421 SHA256 555cfd5899ee54d129169fb70e418c2593d5377
 DIST numpy-1.6.0-ref.pdf 6106335 SHA256 cbeea9b1395e0576bbd256c5de11886c63321d434785c6777df7bdd50109ba9f SHA512 ff00333beae3d886cf96cd72687f68dd0f226c88c390824c3f0cfc18a50ea6b8d6e12035eda76e10a97d58e7bc9b48b6dff7e0447b6045cc4e40fff3225721ec WHIRLPOOL 3ccb0373f0ef0f22a0a1ad967cecc1c7fd8e663d9c4437cfd31bf42a23d121619d89bcfcbb25091609cfdc20f13b551f6d904b1d13b4da6104dfca094734ca19
 DIST numpy-1.6.0-user.pdf 474664 SHA256 d8d51913cb494228f69c5f16d659b8539cbd04c6e584fde72c00c382e86eea8f SHA512 6af1275e46cb0df11d2654f191871504683bb3b5752e45ec6cca92d302babc4e66bd35dc037fdb48c8aad2a8a6414ba239b8874cc590720150c94a832a8cce74 WHIRLPOOL da8fc8a074d8b5a01f566f3c844d668c7652dba03cc618d9d2c162b72fec864a580e05cd940417dd8fcef4bb2c8340bf8e17d166fb582909ff69098332844e91
 DIST numpy-1.6.2.tar.gz 2585329 SHA256 0b83d96ab79711b548470b7aeee1272c4ba8fcbba6586a67116b566a21ed16c6 SHA512 a92667b92ecf2942bef4715189facccb8726866dfd90522b8e4b1e65991d1e6448ab06962e40a7cb83adaebf37eb48cf61417e7ba367da425a2ad7b3302a60a5 WHIRLPOOL 7aa9d7a1ca69bb9a6ce1cc5930997a5b9b8c9573ba261812706c9f12ea9ed42c1fd948552e25049d7b606fd3fda27c6a3ea72e2ffe43fb16e999b0b62515b32d
-EBUILD numpy-1.6.2-r2.ebuild 3989 SHA256 24aa6dcb9121f3690e37382d8910c8e5c0926edb3ceddbac6d2865a81d987a1e SHA512 8d39b77f6806c5e0c0d75888bb1c7589761db72e24f25c6d2c93f3cf7f4796312793a43179313c3dc9ebe2cfebc24ec2f4fe1f9eeb53658763c12c3e0d3f2fff WHIRLPOOL 3e188749a934766ee09067b31f794b3872f09d454ed1985bfda278c29310b7b5f1016470ac0a5f1cc604086bd629159f4eae0657c66f41cafcb78ce0ff172272
+EBUILD numpy-1.6.2-r2.ebuild 3912 SHA256 7de7d939d90a2261d453db7738ad804ddb7d4834cc68709a179256cb0f9152c3 SHA512 51bc7fca362140c3cd60f4354d30dcf41d2da7ba99a877407028592886dd77b2c23bf1b12686573d4769f0a950063639c64be92fde415703b6de08c29c6c905d WHIRLPOOL d58fe4cf248a0bb080872defdbc1922ef86ad49278bbca2b79978f9669d9a6ec9bba4432e25983d92edcfd7b557a292001a76a9628f2c7d2914d40a8d16fdee3
 EBUILD numpy-1.6.2.ebuild 4099 SHA256 70d34a03f6fda89ffaa1261ba10d0a4a1f9fd9dd5e203e98088d23367f660e7e SHA512 ca46002daa02f07648deb16dcbfc67894c61dc93c42279b23083716521a77150974bae2e7778902198591124d204db7e7ffd0f53297fe66291c6756c1f52ba30 WHIRLPOOL 8861957b2dfe125422de3efdb14dc2b6b8cace201cd64579845d1f8ac78020be67788444fb01745ca788f5ca2cfa8c545de0b7c038b55eab8db78a049323cf16
-MISC ChangeLog 26030 SHA256 c2a52cd4f7860860721edae9d4415bcd6e202ade4779808bd38f0031fa237ecd SHA512 84e480907b3bc374c07f7f916fbbda0d4e5c12249f60fd2d3371bbd4e11c1adfbe98086c78e9ea8613a196539e19d1e5ae7e133826141f468f26b0ed0284df45 WHIRLPOOL 768f72f68d7953558c62d249d2aa2bf4ceb20da4f9e9192a9f318a9125b44089356282239def032ed7a711455edd655fcf394f7c8b5713f30479d7a3f419dcd4
+MISC ChangeLog 26143 SHA256 fbcfcfcce03ac6500e916bd7f9f3d69b367692c934444a60cca74177af22ef80 SHA512 49ee6f1e890b1a3776a993d52995103d75e4888888770d349c6c2e5dece387a3aa895a80ca760eaa32657d2e2b0860df05aec082eb44db92e6e1dda23c9cfcd8 WHIRLPOOL ecf72cd2684ce772b370a8e6db2c63e263205d78dbdee53cbbd8fb2bbc21940e4514c5c95df59f2f2c2e20ef3f0f7dbeb467a8a706946bad618299d36725f66b
 MISC metadata.xml 618 SHA256 4610361cfafbcd8533c0982e1d804f7f1c4e247bbf41a07102591f22f1034305 SHA512 8c017dd0a066f11291188a3dadac6a23c5f8451231ac32f73771954c530e569de8212e581cd750ff071fc9c9b22e7dbbcedad6e8bfe0c0b0c7b7682f48269dbd WHIRLPOOL 90dbe9165a89a4f57e67859ce58076c3312caa0a75aa79ce635be1cdc5fcafce58bf771cd405630e3c72c795a13023f3374f70480a9e798c5dc3211813a0df60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlEOasgACgkQfXuS5UK5QB2dHwP+NMIg+s9/Qc4ekc1/AIvQ6mit
-MYtxUvbN48+Dy5io8OYXruAIdqZ3HSHcZADHfRCKxURC2o60y67bGzTRcOLOXCp7
-bxdB+bWFl2LywTVkk5p1vqLm8vrtZx2cTBfwGWVVCrkZs1VrYRuQzHfuBTJtCb+r
-3z0a3oVjOEePQIUvDH4=
-=IzT0
+iJwEAQEIAAYFAlEXirQACgkQfXuS5UK5QB3SyAP7BpextXBbz+D7mZTsh01nKAfg
+CUcRWfdms1vFpZRUjA23b0IdXvvBry4oKOwMTqN4vTnpqmU60mlFqpnDteVqvhip
+TJiry5qffdf22BKgRJpUYUYbmekoVylmEQs5zD/ynOlW7Kv31byc2PuitSNfCoZD
+StVNNSKDJDQBshv4TPM=
+=TD8e
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.6.2-r2.ebuild b/dev-python/numpy/numpy-1.6.2-r2.ebuild
index 96c2c405878c..379e023e5e93 100644
--- a/dev-python/numpy/numpy-1.6.2-r2.ebuild
+++ b/dev-python/numpy/numpy-1.6.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2-r2.ebuild,v 1.1 2013/02/03 13:48:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2-r2.ebuild,v 1.2 2013/02/10 11:55:23 mgorny Exp $
 
 EAPI=5
 
@@ -113,11 +113,10 @@ python_compile() {
 }
 
 python_test() {
-	local fake_root=${BUILD_DIR}/tests
+	distutils_install_for_testing ${NUMPY_FCONFIG}
 
-	esetup.py ${NUMPY_FCONFIG} build install --home="${fake_root}"
-	cd "${fake_root}"/lib || die
-	PYTHONPATH=python "${PYTHON}" -c "
+	cd "${TMPDIR}" || die
+	"${PYTHON}" -c "
 import numpy, sys
 r = numpy.test()
 sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"