Support FEATURES="test-fail-continue". Don't install byte-compiled Python modules (bug #301915).

Package-Manager: portage-HEAD/cvs/Linux x86_64

6 files changed, 54 insertions, 24 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 79ba9501079e..f948e980f0b4 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.468 2010/05/21 19:22:17 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.469 2010/05/23 20:13:15 arfrever Exp $
+
+  23 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.5-r2.ebuild,
+  python-3.1.2-r3.ebuild:
+  Support FEATURES="test-fail-continue". Don't install byte-compiled Python
+  modules (bug #301915).
 
   21 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   python-2.6.5-r2.ebuild:
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a9acaab8fdd7..6ca5bfc092f2 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -15,10 +15,10 @@ DIST python-gentoo-patches-2.5.4-r3.tar.bz2 19473 RMD160 c3a807693103f9e26c3cce4
 DIST python-gentoo-patches-2.6.4-r1.tar.bz2 12570 RMD160 2a58eb651ce5adc68c4667fb0ddc42cc215ea342 SHA1 c5de0442890bc0753c445a88390d932e629c8648 SHA256 2fe6c8838df2c07d3232ebb26c128dab2787c43a76ddb0b55acec1bed657f9f2
 DIST python-gentoo-patches-2.6.5-r4.tar.bz2 68611 RMD160 63a67a772df32dcf1977c1060228f5282a332a41 SHA1 e29469ff9800ff3125d203eea152bfdf378b7234 SHA256 7497892864469a9ff8698dcd6467cb6ddadd3b8472e8847b9e27f738ff7962ab
 DIST python-gentoo-patches-3.1.2-r5.tar.bz2 67359 RMD160 0ee5576b7de728a0840c6020d8403b94a883eeaa SHA1 5900a751c7e6fea512f79e045aa2f7870e378595 SHA256 fa5eabe0cc84789e9ed2fd6140dfdf08ca29de00474b117b9998b0eefc2e850a
-EBUILD python-2.4.6.ebuild 9183 RMD160 2c5c071f04ba8d7b4b2f7feaab4edeb2ced45c75 SHA1 de4b23fedda9acec609670078c59336658ae405a SHA256 39b2bc7a0966acb52e0211fa8b3e492241869a8c30ffc6c894dc266bdf54f3f8
-EBUILD python-2.5.4-r4.ebuild 9546 RMD160 7883e9270894f2a1f0ad9aaa39f6bbf303c0d150 SHA1 bb73bfa7e770196792335141a689601aad3531fe SHA256 1ba673bb92492cd6f9cb7be8ec0750203a5a446f85ed646d60e58cc2a254a953
+EBUILD python-2.4.6.ebuild 9289 RMD160 eedb888d8e09b9c4d9d7ef5fed20d03d5d895af8 SHA1 e4db285767993695c96f59438e8a5d2b2a9deead SHA256 dfc8484280aeae036ad7277c0cd6454733e98e8e0ae2a8aab898a89be989ae18
+EBUILD python-2.5.4-r4.ebuild 9652 RMD160 ee0d82269ba84985711dbf5a8d17dbdce646182a SHA1 3632a7c4aa1bbea63ead63ea2abc8cc78e7ba5ac SHA256 7c9e4a824fe9dd03464be48e0f18ceadf7374f1acc7857f4b92e90c6200038e3
 EBUILD python-2.6.4-r1.ebuild 9595 RMD160 16965b55db01472c632cd5c5e6a97a5de6afb9f1 SHA1 089452541a0e5c98c5299dc6eefb57bc1f3fede7 SHA256 226a1228e20485b484f6e5581b2ed65e3946229f42b6bf5f07a8794fd592e6dc
-EBUILD python-2.6.5-r2.ebuild 9404 RMD160 2564685cc974c8091daae4b894b6f3a844ee4457 SHA1 722b65fbe3869df6e79a4407dd6f33123d0d077a SHA256 0c76cf16a64fa6471325b04b0ab56e56ccab039eb0bce45b6f2b391b9daa0f1b
-EBUILD python-3.1.2-r3.ebuild 9144 RMD160 bbadcf587205bf0e3712cb459002ee3e1f3cfee5 SHA1 c5e714e98d8e9a19c18a3912d1ec11a97a336e5e SHA256 861ab835557897034311275a74e95cb6a23ef21b861d884cad41aee5b9096eff
-MISC ChangeLog 83404 RMD160 97c60394258d37cf5f3740a2cba7f8c22214ecab SHA1 0ab88c4c8934b4ce793746cfb8e7f440bb320ae2 SHA256 792ed379800e03d2619133e7e6a2f5120895f4de22a64d370d0470017161d64c
+EBUILD python-2.6.5-r2.ebuild 9506 RMD160 ecf4c7022df3d37e03cff9ccdde75176b918b503 SHA1 462dfe5deb704ece2373ece9b476d067fb772ee5 SHA256 abcb77ee87aa8fb41abc0d608b47d641212957b97bb4a9c7714277080608531c
+EBUILD python-3.1.2-r3.ebuild 9246 RMD160 6b6be9b5710cbb06382eca5e4878f4d7c763c0cb SHA1 a224ad5c5e287434de525fbe1368229bc4d8e2ef SHA256 175987714e3128c785a3a8ddd6096a155103207af1e047757866e0a8e1513992
+MISC ChangeLog 83676 RMD160 ee804385a23fce0e1bb9b2f3dc7fe1c6af0392cd SHA1 e17c17cea5404a48eb8b80e452eb527225f95eaa SHA256 509fab8dbba50649d1960681ef5f6300af61a61ab3c7fa87f63c1ad1d6424099
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
diff --git a/dev-lang/python/python-2.4.6.ebuild b/dev-lang/python/python-2.4.6.ebuild
index e25c91fe0657..709685c6e9b2 100644
--- a/dev-lang/python/python-2.4.6.ebuild
+++ b/dev-lang/python/python-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.37 2010/05/20 21:14:08 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.38 2010/05/23 20:13:15 arfrever Exp $
 
 EAPI="1"
 
@@ -196,7 +196,8 @@ src_test() {
 	done
 
 	# Rerun failed tests in verbose mode (regrtest -w).
-	EXTRATESTOPTS="-w" make test || die "make test failed"
+	EXTRATESTOPTS="-w" emake test
+	local result="$?"
 
 	for test in ${skip_tests}; do
 		mv "${T}/test_${test}.py" "${S}/Lib/test/test_${test}.py"
@@ -207,17 +208,22 @@ src_test() {
 		elog "test_${test}.py"
 	done
 
-	elog "If you'd like to run them, you may:"
+	elog "If you would like to run them, you may:"
 	elog "cd '${EPREFIX}$(python_get_libdir)/test'"
 	elog "and run the tests separately."
 
 	python_disable_pyc
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
 }
 
 src_install() {
 	[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
 
 	emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
+	python_clean_installation_image -q
 
 	# Install our own custom python-config
 	exeinto /usr/bin
@@ -265,7 +271,7 @@ pkg_preinst() {
 }
 
 eselect_python_update() {
-	local eselect_python_options=
+	local eselect_python_options
 	[[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
 
 	# Create python2 symlink.
@@ -278,7 +284,7 @@ pkg_postinst() {
 	eselect_python_update
 
 	# Python 2.4 partially doesn't respect $(get_libdir).
-	python_mod_optimize -x "(site-packages|test)" /usr/lib/python${SLOT}
+	python_mod_optimize -x "/(site-packages|test|tests)/" /usr/lib/python${SLOT}
 
 	if [[ "${python_updater_warning}" == "1" ]]; then
 		ewarn
diff --git a/dev-lang/python/python-2.5.4-r4.ebuild b/dev-lang/python/python-2.5.4-r4.ebuild
index aaefc537f8fe..d2f81d4b494d 100644
--- a/dev-lang/python/python-2.5.4-r4.ebuild
+++ b/dev-lang/python/python-2.5.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.19 2010/05/20 21:14:08 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.20 2010/05/23 20:13:15 arfrever Exp $
 
 EAPI="1"
 
@@ -215,7 +215,8 @@ src_test() {
 
 	# Redirect stdin from /dev/tty as a workaround for bug #248081.
 	# Rerun failed tests in verbose mode (regrtest -w).
-	EXTRATESTOPTS="-w" make test < /dev/tty || die "make test failed"
+	EXTRATESTOPTS="-w" emake test < /dev/tty
+	local result="$?"
 
 	for test in ${skip_tests}; do
 		mv "${T}/test_${test}.py" "${S}/Lib/test/test_${test}.py"
@@ -226,17 +227,22 @@ src_test() {
 		elog "test_${test}.py"
 	done
 
-	elog "If you'd like to run them, you may:"
+	elog "If you would like to run them, you may:"
 	elog "cd '${EPREFIX}$(python_get_libdir)/test'"
 	elog "and run the tests separately."
 
 	python_disable_pyc
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
 }
 
 src_install() {
 	[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
 
 	emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
+	python_clean_installation_image -q
 
 	mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
 
@@ -279,7 +285,7 @@ pkg_preinst() {
 }
 
 eselect_python_update() {
-	local eselect_python_options=
+	local eselect_python_options
 	[[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
 
 	# Create python2 symlink.
@@ -291,7 +297,7 @@ eselect_python_update() {
 pkg_postinst() {
 	eselect_python_update
 
-	python_mod_optimize -x "(site-packages|test)" $(python_get_libdir)
+	python_mod_optimize -x "/(site-packages|test|tests)/" $(python_get_libdir)
 
 	if [[ "${python_updater_warning}" == "1" ]]; then
 		ewarn
diff --git a/dev-lang/python/python-2.6.5-r2.ebuild b/dev-lang/python/python-2.6.5-r2.ebuild
index cef70fe7052f..e92bc2fa465c 100644
--- a/dev-lang/python/python-2.6.5-r2.ebuild
+++ b/dev-lang/python/python-2.6.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v 1.8 2010/05/21 19:22:17 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v 1.9 2010/05/23 20:13:15 arfrever Exp $
 
 EAPI="2"
 
@@ -205,7 +205,8 @@ src_test() {
 	done
 
 	# Rerun failed tests in verbose mode (regrtest -w).
-	EXTRATESTOPTS="-w" make test || die "make test failed"
+	EXTRATESTOPTS="-w" emake test
+	local result="$?"
 
 	for test in ${skip_tests}; do
 		mv "${T}/test_${test}.py" "${S}/Lib/test/test_${test}.py"
@@ -221,12 +222,17 @@ src_test() {
 	elog "and run the tests separately."
 
 	python_disable_pyc
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
 }
 
 src_install() {
 	[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
 
 	emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
+	python_clean_installation_image -q
 
 	mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
 
@@ -271,7 +277,7 @@ pkg_preinst() {
 }
 
 eselect_python_update() {
-	local eselect_python_options=
+	local eselect_python_options
 	[[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
 
 	# Create python2 symlink.
@@ -283,7 +289,7 @@ eselect_python_update() {
 pkg_postinst() {
 	eselect_python_update
 
-	python_mod_optimize -x "(site-packages|test)" $(python_get_libdir)
+	python_mod_optimize -x "/(site-packages|test|tests)/" $(python_get_libdir)
 
 	if [[ "${python_updater_warning}" == "1" ]]; then
 		ewarn
diff --git a/dev-lang/python/python-3.1.2-r3.ebuild b/dev-lang/python/python-3.1.2-r3.ebuild
index 4db6ee79fb88..a19d2442afdd 100644
--- a/dev-lang/python/python-3.1.2-r3.ebuild
+++ b/dev-lang/python/python-3.1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r3.ebuild,v 1.7 2010/05/22 21:08:23 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r3.ebuild,v 1.8 2010/05/23 20:13:15 arfrever Exp $
 
 EAPI="3"
 
@@ -195,7 +195,8 @@ src_test() {
 	done
 
 	# Rerun failed tests in verbose mode (regrtest -w).
-	EXTRATESTOPTS="-w" make test || die "make test failed"
+	EXTRATESTOPTS="-w" emake test
+	local result="$?"
 
 	for test in ${skip_tests}; do
 		mv "${T}/test_${test}.py" "${S}/Lib/test/test_${test}.py"
@@ -211,10 +212,15 @@ src_test() {
 	elog "and run the tests separately."
 
 	python_disable_pyc
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
+	python_clean_installation_image -q
 
 	mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
 
@@ -254,7 +260,7 @@ pkg_preinst() {
 }
 
 eselect_python_update() {
-	local eselect_python_options=
+	local eselect_python_options
 	[[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
 
 	# Create python3 symlink.
@@ -266,7 +272,7 @@ eselect_python_update() {
 pkg_postinst() {
 	eselect_python_update
 
-	python_mod_optimize -x "(site-packages|test)" $(python_get_libdir)
+	python_mod_optimize -x "/(site-packages|test|tests)/" $(python_get_libdir)
 
 	if [[ "$(eselect python show)" == "python2."* ]]; then
 		ewarn