Make logging module ignore absence of multiprocessing module (bug #291109).

Package-Manager: portage-14803-svn/cvs/Linux x86_64

3 files changed, 11 insertions, 9 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 0146c0aaf7e7..2e1d1665868c 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.430 2009/10/30 11:49:20 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.431 2009/11/07 23:17:35 arfrever Exp $
+
+  07 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  python-3.1.1-r1.ebuild:
+  Make logging module ignore absence of multiprocessing module (bug
+  #291109).
 
 *python-2.6.4 (30 Oct 2009)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 0087e543651e..1ae9b4499c60 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -17,13 +17,13 @@ DIST python-gentoo-patches-2.6.2-r4.tar.bz2 11802 RMD160 d04d80d3ed2ead001dbdbe2
 DIST python-gentoo-patches-2.6.2-r5.tar.bz2 12206 RMD160 43f321ac4df2b4c6ccb5777d3627c089d46b9024 SHA1 2e35f77a7216b61a9aac9508eac2ddce882c993a SHA256 f3e1593911130ed4bb5879c13e5afa4edd0a873682e1e8609184ec24cae244e1
 DIST python-gentoo-patches-2.6.3.tar.bz2 10996 RMD160 6247c60c54dc80f4a243e5fd2cb56e91989b1703 SHA1 066d76528e892b588d4b643ab4e7e310f2e0079e SHA256 d116be09c88ecd8b93b1f1cfa5a18100e1aeb21ca515a8425e3e14ce6b3e5554
 DIST python-gentoo-patches-2.6.4.tar.bz2 11032 RMD160 83903892ef18880f876e7a140c803c1e8a67e24b SHA1 51d4174b2a4136a11c64ae0007b59e4c2f0e13f2 SHA256 19a66a0855df270c030438f21c29260e7ff69b299830409f6aa9140611b721e2
-DIST python-gentoo-patches-3.1.1-r2.tar.bz2 8929 RMD160 26afbdbbec3bf0e394cb3082d77abd75d4c75a6b SHA1 e7e775954777a336eff8e9c6c2600d053338fdb2 SHA256 d72acfbf1adeb0ab19da4833bf4663acc9ba4518c614ca92e990dde088d9a07c
+DIST python-gentoo-patches-3.1.1-r3.tar.bz2 8874 RMD160 06058325dec089258b5e61510c1c2e2369a26f3e SHA1 5ad63e6eb12842b31bc701d9d115669f7fbc79b2 SHA256 3be52f704a6eccfd1d6b889651420f3a04f85d09f910410f5ea93c6b4d776c68
 EBUILD python-2.4.6.ebuild 9245 RMD160 e89bd99217b8c112e07f6a4fa307e1958a464b78 SHA1 02a6a74bd26ec016cf739098ec10b5ebaa4ba267 SHA256 e2735edcf44549cfd36daac0ac8b8d25071759fa21e0c1c8a7bf1a7e4990d1b2
 EBUILD python-2.5.4-r3.ebuild 9440 RMD160 b62893e604c3ee97601008769cbd6a02c3550e9b SHA1 483dcb785b6d239dc81d5c5d85592f8a4e4d206c SHA256 3efcd9c632ca68fea5bcbc09f84305bcbf270a8f6d44fe86307274025bba80d2
 EBUILD python-2.6.2-r1.ebuild 9992 RMD160 e20b90452458a7e5670d4ac0af302348909cde73 SHA1 7c8cb884cebb23a18c0c98cc14a15e1af58030b0 SHA256 6a6115fc0175db78113894d282fbccbea155c2264fe247ede6418cf5c3580de5
 EBUILD python-2.6.2-r2.ebuild 10027 RMD160 22c959d84a0fb293ca68570bfefb262e49ba1968 SHA1 c2defcc702e24b4cca2012e7e28363cc3941cb02 SHA256 cbcaec2c35ad3e02ac2d7bc57b035eaf45199db426da2d939623ef48ca58dfae
 EBUILD python-2.6.3.ebuild 9964 RMD160 ed2c2676741c87a8584afb6d70af7d817657dc0d SHA1 3965499f2c1514b8e066d45315ff0c05e5a20354 SHA256 53d76ed3ba52e95656f72b7f2d14d5ccc1e1f0e5d337c2ca61caf949a49dae39
 EBUILD python-2.6.4.ebuild 9902 RMD160 4b2a0fde7557713e89d7c1cb62eb5831ea14d2bd SHA1 6c7fbaf11a75a37577277e48fe551cbc7ea96f73 SHA256 c105af0a8d35b5c9c6ef007ed9b27568e585dbfb7b7480a2b8c23fc1262306de
-EBUILD python-3.1.1-r1.ebuild 9334 RMD160 5178da2b5304b9f273783f36510afbd9d46f8f37 SHA1 50dc687e2f4080b2a0c68c8b95039ceb61081b80 SHA256 9234f8e27cefafef640031fe96f4575c61c9ba4704e76a0669b56785d7f58df5
-MISC ChangeLog 75233 RMD160 1618a69626d1e7af5982aade48733294a5cbc2d1 SHA1 41706d184dff0d2c8aea7cd16302b96a97258b7a SHA256 51a2c7deb042f6b9fd3df1f7d81c489608a3a798aa9e73c353b067cef4ec3a89
+EBUILD python-3.1.1-r1.ebuild 9245 RMD160 40a9ef3ca90dd35b2d8da9ce1b32164539f05601 SHA1 e4ec47b969a6f5412694cc515fee32b7fc0113ce SHA256 fb99ba3a6bd49310c43802c247b979cd7746bd2b9b1d6e599ecced05e08e09a6
+MISC ChangeLog 75413 RMD160 834edff638286985001c359167f1f9a7150be556 SHA1 73d8c7cb6cec6504a84994fa7a72c2c445a18fea SHA256 ebd61e5273a21ccb58913999b1a2b713407639320c22518a4d2e1777b30edec0
 MISC metadata.xml 501 RMD160 0cc2c851a7c59ed77809c1f3ac2130710f0700e9 SHA1 59bfd447cf15419f68077913de7228f3556ce6e3 SHA256 51c09ee221463f34722a6c655db605a7d6d683069453d173947e4416a43a071c
diff --git a/dev-lang/python/python-3.1.1-r1.ebuild b/dev-lang/python/python-3.1.1-r1.ebuild
index 56f0a1c37ba2..3ffd64ac5388 100644
--- a/dev-lang/python/python-3.1.1-r1.ebuild
+++ b/dev-lang/python/python-3.1.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-3.1.1-r1.ebuild,v 1.16 2009/10/30 11:45:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.17 2009/11/07 23:17:35 arfrever Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 MY_P="Python-${PV}"
 S="${WORKDIR}/${MY_P}"
 
-PATCHSET_REVISION="2"
+PATCHSET_REVISION="3"
 
 DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
 HOMEPAGE="http://www.python.org/"
@@ -79,9 +79,6 @@ src_prepare() {
 		rm Lib/distutils/command/wininst-*.exe
 	fi
 
-	# Don't silence output of setup.py.
-	sed -e "/setup\.py -q build/d" -i Makefile.pre.in
-
 	# Fix OtherFileTests.testStdin() not to assume
 	# that stdin is a tty for bug #248081.
 	sed -e "s:'osf1V5':'osf1V5' and sys.stdin.isatty():" -i Lib/test/test_file.py || die "sed failed"