Fix running tests with out-of-source builds. Minor fixes & restore keywords lost due to python-exec.

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

3 files changed, 34 insertions, 30 deletions

diff --git a/dev-python/lxml/ChangeLog b/dev-python/lxml/ChangeLog
index 9bdc3d017f60..73d2b6701d43 100644
--- a/dev-python/lxml/ChangeLog
+++ b/dev-python/lxml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/lxml
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.139 2012/10/20 16:22:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.140 2012/10/29 16:26:39 mgorny Exp $
+
+  29 Oct 2012; Michał Górny <mgorny@gentoo.org> lxml-3.0.1.ebuild:
+  Fix running tests with out-of-source builds. Minor fixes & restore keywords
+  lost due to python-exec.
 
   20 Oct 2012; Jeroen Roovers <jer@gentoo.org> lxml-3.0.1.ebuild:
   Marked ~hppa (bug #438388).
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index a04a9d31828c..e49b8d3977c2 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -9,13 +9,15 @@ DIST lxml-3.0.1.tgz 3205224 SHA256 50367b086d18b1cadc8d6ddf2525495d9d216b81e9a70
 EBUILD lxml-2.3.4.ebuild 2387 SHA256 3f1f1f5278d3a25156181c725bbbcbcc39933e7a7f0710c7c42ef9ecff1aa90d SHA512 043e2941dedb405887b292f93ae5c17e1ad41dad2e935723b793cfbe5c5fa5dd947ac13030e055ed16bc63fee5c2c8dfef37b860efa7fc034b699f7674766772 WHIRLPOOL 5189a11f84b18128dd6c4e72085e70623c6fcc86c23891295f850a185b6f57c1f17c1abdaff73b32a7a20c70810c559c8728f2089d8e7709aaecee0dd86e464b
 EBUILD lxml-2.3.5.ebuild 2250 SHA256 ae75bc5f972f1d4aec8fce2122641578f537c821befcc794f6cec703451ecee0 SHA512 5a1dd98a130045d7b4bc61481bd5952e965bfc3a112178716d893b16835fe8660445c07de31a843135585bb8b29caee80d006741e4a9ab50fdb5de55c5659a9a WHIRLPOOL e189520a001c45f4d89a0888a9440b0f452f6a44f163831aed61e151cb95db6dad09ae58a66690371c4130344492ad85c9f69c81bedaf3ddd2f9836b2eb1e8cf
 EBUILD lxml-2.3.6.ebuild 2250 SHA256 9569aacea58d41b77e51e2ac5568136af6ac25731cae3de9f3cd673fece75e76 SHA512 b9ba78498665a035616428bde0c6aca5137162176dd72fc2cdd18814735407de041ad66674a17bb58a35b1c7a4d165ebe2aed63a95e0b70940e6cdd4f9e8ad98 WHIRLPOOL 599f795caa74b81d282464467d17766810bd1c13b993123af4357b1abf1e2a039b4fe417966d596ee96854956d8c0933caf56d9f6ed451b9139286abdc3475fc
-EBUILD lxml-3.0.1.ebuild 2178 SHA256 a2d90c830eb58c216a5438f45acae1d55d19c61adc9e6721d491db6eef083e68 SHA512 10cb40e978cd8dec700481f9bd1667d283af29329e83ec248cbaea3453c4609b50f0a1b67f9e3cf94aebbec31d03cabceb4bc9a24dbc03386fb66f3242323443 WHIRLPOOL 13d7428a147071398422f0d1ea7cfabb3f88faf32a8658ab79a4d88ff1bd3cd66cf345c717e94595bf6f932f4683e756f6b4d21514ee068344707db6a1e82cf3
-MISC ChangeLog 17141 SHA256 1bfa48c72f6e6d840071a33fcf4f6129547ea56d7534886755c22600fe024ebd SHA512 832b0ba9fdb1e76049a59da68a628c34fc3b8af82adffe6e82b0f5023524355e48dd71ee3c1ec4ab5622c35dab9c442ce548b1d43d9c77ac2025c22b91835d9a WHIRLPOOL fee2bb90035d6d650086450e504e112d4396140d0da25947cc9e0824e26ec41c05ee2e649665c8ec93c0312330c8e10c491983f9f39b4169bb173225caeb8fb2
+EBUILD lxml-3.0.1.ebuild 2182 SHA256 83aaa092952f94ecf30e2f1bc546023da80903edb5c563bd314c58f044745c65 SHA512 aa7f98cb92efc8ff750046dba92a764ae14056d11c82d349629f6efd4307de06560980c68b79c2a5ab377d7ba327705932905ee403ec2115d7dd698daf383b9c WHIRLPOOL 41d29690e53dba3d55b5f731267ad6f321092bd43a505d0579c9e9f2232dfeee8857345667451bd85d1ba0405cbac043d3b2e29a810a35911cd02da313b2f559
+MISC ChangeLog 17319 SHA256 b0f182a5edba5d9ee3b4c44513bf71f640e62d3e762503cceb62e7119ab1a8d8 SHA512 7c39ebe1a38c3b0bc952ac0fe33f813440376943cf79d6f55c92adf2b7f2ea3867b14a1ae3bc6988b63bb36b25e18dc34463273df4a0a0c79786a7d21e9c9e1b WHIRLPOOL 0d99f3eb320520daa982976f5d6b496106dbfb8313a7bb90ca1e5472e3a956dee1cdb99b1ff4372de7a005f849c1a479eb9e086a9e89d3629aeb09e444cc770b
 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCCz60ACgkQVWmRsqeSphN2UgCeNC8uobk6PGj1aExqjf4Eil24
-UfwAn0YL0a9nNOZ1DO+XDua4Npt809IJ
-=wRC1
+iJwEAQEIAAYFAlCOrnoACgkQfXuS5UK5QB3WpQP/XHgCXNkNHyDXSDqqIEDEsQFi
+Ch3q4wp/+OfEtvEVrdWppTrGQRFzDZ9UiZexTpyhoawn5Ps1yxJo+qZY9v6WzFDx
+TG0CZSkYfsECc0wK0snLipCGkwewEBx5V/YxBRzWbfLsmxTQ4nH2pvqjNlhTU+qx
+KIgFkda2VLOUY03sMec=
+=id7e
 -----END PGP SIGNATURE-----
diff --git a/dev-python/lxml/lxml-3.0.1.ebuild b/dev-python/lxml/lxml-3.0.1.ebuild
index 51a5a5eb5af6..05ddf192a7e0 100644
--- a/dev-python/lxml/lxml-3.0.1.ebuild
+++ b/dev-python/lxml/lxml-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild,v 1.2 2012/10/20 16:22:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild,v 1.3 2012/10/29 16:26:39 mgorny Exp $
 
 EAPI=4
 PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2 python3_3)
@@ -16,7 +16,7 @@ SRC_URI="http://codespeak.net/lxml/${MY_P}.tgz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # have to drop some keywords pending resolution of bug #438388
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
@@ -33,31 +33,29 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-skip-failing-test.patch"
+	PATCHES=( "${FILESDIR}/${P}-skip-failing-test.patch" )
 	distutils-r1_src_prepare
 }
 
-src_test() {
-	run_tests() {
-		# Tests broken with Python 3, generally due to Unicode.
-		[[ "${EPYTHON%.*}" == python3 ]] && return
-
-		local module
-		for module in $(ls build/lib.*/lxml/*.so); do
-			ln -s "../../${module}" "src/lxml/$(basename ${module})"
-		done
-
-		local exit_status="0" test
-		for test in test.py selftest.py selftest2.py; do
-			einfo "Running ${test}"
-			if ! "${PYTHON}" ${test}; then
-				eerror "${test} failed with ${EPYTHON}"
-				exit_status="1"
-			fi
-		done
-		return "${exit_status}"
-	}
-	python_foreach_impl run_tests
+python_test() {
+	# Tests broken with Python 3, generally due to Unicode.
+	[[ ${EPYTHON} == python3.* ]] && return
+
+	local module
+	for module in "${BUILD_DIR}"/lib.*/lxml/*.so; do
+		ln -fs "${module}" src/lxml/ || die
+	done
+
+	local exit_status="0" test
+	local PYTHONPATH=src/ # needed for selftest*
+	for test in test.py selftest.py selftest2.py; do
+		einfo "Running ${test}"
+		if ! "${PYTHON}" ${test}; then
+			eerror "${test} failed with ${EPYTHON}"
+			exit_status="1"
+		fi
+	done
+	return "${exit_status}"
 }
 
 src_install() {