In src_test, redirect stdin from /dev/tty as a workaround for bug #248081.

Package-Manager: portage-2.2_rc27_p13187/cvs/Linux i686

7 files changed, 31 insertions, 21 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 226f939b2c9b..0dfad379cb3a 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.368 2009/03/21 23:26:28 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.369 2009/03/26 05:10:31 zmedico Exp $
+
+  26 Mar 2009; Zac Medico <zmedico@gentoo.org> python-2.5.2-r7.ebuild,
+  python-2.5.2-r8.ebuild, python-2.5.4-r2.ebuild, python-2.6-r5.ebuild,
+  python-2.6.1-r1.ebuild:
+  In src_test, redirect stdin from /dev/tty as a workaround for bug #248081.
 
 *python-2.6.1-r1 (21 Mar 2009)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 01fcc6fb08b0..c6e53aee04dc 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -33,17 +33,17 @@ EBUILD python-2.4.4-r14.ebuild 10746 RMD160 4c5e1215ad1756eeab64bbe52ef88ffdcb04
 EBUILD python-2.4.4-r15.ebuild 10743 RMD160 1df6ba576dfd3b0a5eb25b5b29a0dbedf53c483e SHA1 8c43ac03cdbbf6e91b7a9e7eec766cbf4f2f59ae SHA256 1a4515d15197601c56f27a0f9b4d206dff67ed8a02472b5c046dd04e6977a24a
 EBUILD python-2.4.4-r5.ebuild 10577 RMD160 9beeae06b88a2fb12d55a8a3e40e0444b4d7c382 SHA1 91c46a25e45ef7d87c69426cfeee1f4b4ac28287 SHA256 cf164d816a56fdc6ebd9f4482a03cc574e1c7429f4cab4a2002796d678576899
 EBUILD python-2.4.4-r6.ebuild 10578 RMD160 1ae5c7e5c2130c5822de6923211c0507605d2d0b SHA1 b74df8d15b3ae97a38e961abb59720e5bb492795 SHA256 f3f0c49db7b629fa16b4cf27b7ab999e049209ff9b71df8982586dce76530b3b
-EBUILD python-2.5.2-r7.ebuild 10592 RMD160 9a021df57bb34054eba3e4d8576b5477a37ed8a6 SHA1 dc63d81497b3c2cac2626c46d5f58ee70386a96f SHA256 769bb360c74dc550740c85d738127409145c04cf19c501b54983aa4b44264cea
-EBUILD python-2.5.2-r8.ebuild 10719 RMD160 79b6019052c5454b034f568d37655cf2f0ea6c3b SHA1 7dc81809cd8059440fe28ca2c65e92613757b72b SHA256 12530023d205e6da95bdda889de761107025a2a21cbac48485f4847fe3d150b6
-EBUILD python-2.5.4-r2.ebuild 10625 RMD160 9a458050d43482f2b58683a7061bb5abde9451ad SHA1 e248bf328ad963a6bca42bebd75901fef7b283eb SHA256 0abb9ca878484ed09cf2bb9e4315e0ce760d10c4c65a5a91109f13a805214a39
-EBUILD python-2.6-r5.ebuild 8604 RMD160 f3cfac5916e833778f39d00c0e86d42826b5bba0 SHA1 bda4dfabfb8b607e44cac17d9719315982189a87 SHA256 8190c058216b8d26fcda6340dda5d1a0628b6359b54b385fd2149b08891ffca3
-EBUILD python-2.6.1-r1.ebuild 8752 RMD160 22f2291b48b8d894a7e5170dc94ca34b0e5c8325 SHA1 a73f5e13d886f724e025c8a3bb3b136dd150b42f SHA256 58afa472250e7dbc1c252fdf10c05bf94c1218766951f04b760c1fcab67ffe8f
-MISC ChangeLog 65452 RMD160 32beb9e38843303f7a7faf79e2d76a8c597a5be4 SHA1 d29ba4ac52daa4945195553718f43100b8720a71 SHA256 9ecee170773f446eb837d215a4ca102ba92d3e7336242e1cc195750c2e4271a0
+EBUILD python-2.5.2-r7.ebuild 10669 RMD160 b155d1db61f9bbf21195358d4bf924a77847e2d9 SHA1 49d5a793399e3e1164a23ca391332badd9dcc7ab SHA256 8218d47daf2414fc210063c15e32fb3c0e007f9532dfdb1f2c1cb186fe1e0411
+EBUILD python-2.5.2-r8.ebuild 10797 RMD160 8f30ee723f9371f4fe228a188248d6aa8140ab5c SHA1 b29df521b889c292f8eebcab767997f452252c7e SHA256 4949ecd970eee3531969e0d13c3c8eb2b2dfbf73e9a8e86bd7d1449ea83b99c7
+EBUILD python-2.5.4-r2.ebuild 10702 RMD160 e1a95bf5de0200e22a1320ef24db54092035417a SHA1 78c4798c6a67262aa31b9d5ba22616b5acdc94c7 SHA256 6ff5cd47fd9606ff6554636136bfe5955e4fe1b6bca38e2473aa559b2b03526b
+EBUILD python-2.6-r5.ebuild 8681 RMD160 a8577073be5d6a014e6aca436197c109053bcd1b SHA1 367276ccda59abd20dc8ed7a60c7453302a07fd6 SHA256 2d795d6730e515c0dee83f095b0d8dfb6ff6c2830dcc7fd4aed9768504b4262d
+EBUILD python-2.6.1-r1.ebuild 8826 RMD160 656587be303dd1e47271ade1d53ecba295bc5c7d SHA1 c3df39f6b9162a6d4e3e974f4e9194177a78a0b3 SHA256 e69b17aae04b869dfe7e33f9c360ea6b03c9d1973a0839abdd0d5887bcd7a546
+MISC ChangeLog 65697 RMD160 0c774b9a4a936ec94d12636a1e9cd8d5c2c0c723 SHA1 b0d282f6c130334c54ac4af7734c8708c7afc806 SHA256 a76ebb8647aa44e80b8c3d3961ef4af207d3df0d57891270358680952d506c4a
 MISC metadata.xml 490 RMD160 b919b92704616b974d1da46bfea1f03c7ea50330 SHA1 d1901bc18d0aa431b05fccfe13f2f87ab2aa9e18 SHA256 765be0142679faeeaf01cfa489424c3af08ad38ed627e6a7246b4a6f96f2dffa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAknFd7UACgkQdIssYB9vBoOycwCeNIjPOjBRIU+MvHZ9+dxfezx3
-MwsAn1kFKjDnnD61pObFVWvSEDaWBYOI
-=5/bH
+iEYEARECAAYFAknLDlgACgkQ/ejvha5XGaMXlwCgoFg+u4avEESK7KTrywzhe3Ef
+Ni0An3oZb65YVbUTpFk5vXrf0PRjLGnY
+=dkIg
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.5.2-r7.ebuild b/dev-lang/python/python-2.5.2-r7.ebuild
index 8597f8936066..ac52b688568b 100644
--- a/dev-lang/python/python-2.5.2-r7.ebuild
+++ b/dev-lang/python/python-2.5.2-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r7.ebuild,v 1.14 2009/02/26 05:55:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r7.ebuild,v 1.15 2009/03/26 05:10:31 zmedico Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -314,8 +314,9 @@ src_test() {
 		mv "${S}"/Lib/test/test_${test}.py "${T}"
 	done
 
+	# Redirect stdin from /dev/tty as a workaround for bug #248081.
 	# rerun failed tests in verbose mode (regrtest -w)
-	EXTRATESTOPTS="-w" make test || die "make test failed"
+	EXTRATESTOPTS="-w" make test < /dev/tty || die "make test failed"
 
 	for test in ${skip_tests} ; do
 		mv "${T}"/test_${test}.py "${S}"/Lib/test/test_${test}.py
diff --git a/dev-lang/python/python-2.5.2-r8.ebuild b/dev-lang/python/python-2.5.2-r8.ebuild
index 62a303774ffe..1d28cfc386fb 100644
--- a/dev-lang/python/python-2.5.2-r8.ebuild
+++ b/dev-lang/python/python-2.5.2-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r8.ebuild,v 1.9 2009/02/26 05:55:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r8.ebuild,v 1.10 2009/03/26 05:10:31 zmedico Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -318,8 +318,9 @@ src_test() {
 		mv "${S}"/Lib/test/test_${test}.py "${T}"
 	done
 
+	# Redirect stdin from /dev/tty as a workaround for bug #248081.
 	# rerun failed tests in verbose mode (regrtest -w)
-	EXTRATESTOPTS="-w" make test || die "make test failed"
+	EXTRATESTOPTS="-w" make test < /dev/tty || die "make test failed"
 
 	for test in ${skip_tests} ; do
 		mv "${T}"/test_${test}.py "${S}"/Lib/test/test_${test}.py
diff --git a/dev-lang/python/python-2.5.4-r2.ebuild b/dev-lang/python/python-2.5.4-r2.ebuild
index 3c7c023892cd..0abb8e648a00 100644
--- a/dev-lang/python/python-2.5.4-r2.ebuild
+++ b/dev-lang/python/python-2.5.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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-r2.ebuild,v 1.4 2009/02/26 05:55:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r2.ebuild,v 1.5 2009/03/26 05:10:31 zmedico Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -320,8 +320,9 @@ src_test() {
 		mv "${S}"/Lib/test/test_${test}.py "${T}"
 	done
 
+	# Redirect stdin from /dev/tty as a workaround for bug #248081.
 	# rerun failed tests in verbose mode (regrtest -w)
-	EXTRATESTOPTS="-w" make test || die "make test failed"
+	EXTRATESTOPTS="-w" make test < /dev/tty || die "make test failed"
 
 	for test in ${skip_tests} ; do
 		mv "${T}"/test_${test}.py "${S}"/Lib/test/test_${test}.py
diff --git a/dev-lang/python/python-2.6-r5.ebuild b/dev-lang/python/python-2.6-r5.ebuild
index 0adc837306b9..4f41cc57c1c8 100644
--- a/dev-lang/python/python-2.6-r5.ebuild
+++ b/dev-lang/python/python-2.6-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6-r5.ebuild,v 1.6 2009/02/26 05:28:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6-r5.ebuild,v 1.7 2009/03/26 05:10:31 zmedico Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -254,8 +254,9 @@ src_test() {
 		mv "${S}"/Lib/test/test_${test}.py "${T}"
 	done
 
+	# Redirect stdin from /dev/tty as a workaround for bug #248081.
 	# rerun failed tests in verbose mode (regrtest -w)
-	EXTRATESTOPTS="-w" make test || die "make test failed"
+	EXTRATESTOPTS="-w" make test < /dev/tty || die "make test failed"
 
 	for test in ${skip_tests} ; do
 		mv "${T}"/test_${test}.py "${S}"/Lib/test/test_${test}.py
diff --git a/dev-lang/python/python-2.6.1-r1.ebuild b/dev-lang/python/python-2.6.1-r1.ebuild
index 4d2bc89f9cc2..13f72c0b7123 100644
--- a/dev-lang/python/python-2.6.1-r1.ebuild
+++ b/dev-lang/python/python-2.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.1-r1.ebuild,v 1.1 2009/03/21 23:26:28 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.1-r1.ebuild,v 1.2 2009/03/26 05:10:31 zmedico Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -258,8 +258,9 @@ src_test() {
 		mv "${S}"/Lib/test/test_${test}.py "${T}"
 	done
 
+	# Redirect stdin from /dev/tty as a workaround for bug #248081.
 	# rerun failed tests in verbose mode (regrtest -w)
-	EXTRATESTOPTS="-w" make test || die "make test failed"
+	EXTRATESTOPTS="-w" make test < /dev/tty || die "make test failed"
 
 	for test in ${skip_tests} ; do
 		mv "${T}"/test_${test}.py "${S}"/Lib/test/test_${test}.py