Apply linux3 platform workaround. Fixes bug 394143.

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64

3 files changed, 14 insertions, 8 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 808c78e64072..f25177b8e0cc 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.562 2011/12/13 18:10:35 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.563 2011/12/14 23:05:44 floppym Exp $
+
+  14 Dec 2011; Mike Gilbert <floppym@gentoo.org> python-2.5.4-r4.ebuild:
+  Apply linux3 platform workaround. Fixes bug 394143.
 
   13 Dec 2011; Dirkjan Ochtman <djc@gentoo.org> files/linux2.patch:
   Prune back linux2.patch to prevent race conditions (bug 394547).
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index ab270624960b..68c137f34955 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX linux2.patch 332 RMD160 b6c4f45baee17fc5b0a88b63bbca87b77eaa16d3 SHA1 7722cc338a88d690e06f2ed0d9257b086286c288 SHA256 8c5f8d73e279767190c9567f959514167101ea2648f9f4c8146704c5946d8b41
 AUX pydoc.conf 279 RMD160 85dcc3abd24faf09f3753b5c2299517f9b2ebc6a SHA1 c1faef486a0041c2175bfbc2cf10eccaa574e8c2 SHA256 6437e85d16d34efaf2665b3cabb0707392e6dee3df04989d3fcac63fd22997e8
@@ -29,7 +29,7 @@ DIST python-gentoo-patches-3.1.3-r1.tar.bz2 13730 RMD160 73f922d850e464e589c7a3c
 DIST python-gentoo-patches-3.1.4.tar.bz2 12930 RMD160 5ba5d20e065e6c346848d0c3ed12d65cd6b089be SHA1 b6bb595e03a78a87e3164874a9a12711bee4b9f8 SHA256 9800f3a9989c8aac4c96a7e6411baf96af0c18c041627a330681783a84cb4316
 DIST python-gentoo-patches-3.2.2.tar.bz2 10834 RMD160 f1ca3bec5705b72ee488a37ea71dc7110b4495f1 SHA1 c5daaea3c52a564228c84be741da6cf039b10e19 SHA256 521c1bd7c360fb66788e7c5e191497e014bb104f2ef2272d99a40b764082d7cb
 EBUILD python-2.4.6.ebuild 9411 RMD160 53ad3acad20e23e4ab1edab8f400211df27f4772 SHA1 5434007f9e697d0bbfe31e018515f439f4e335d0 SHA256 e054c684ca729c81a117b49db8192ed7a13e23728f24e07a235af71a8f036f35
-EBUILD python-2.5.4-r4.ebuild 9761 RMD160 abd16725421330ef8a312b435d84afe6caa42687 SHA1 78467f3eed7934aa39da1d52e5cb3285203ed3d4 SHA256 1ec9596fef71bdfb9bf31893469bdde13401dbde05cf53071d19d24d4cc25008
+EBUILD python-2.5.4-r4.ebuild 9873 RMD160 31c328c12bbd8f665819ea11d7cbbf048b8408a1 SHA1 753861bb541b10073451361530521127b47f68e3 SHA256 6d8a822a849209cbceb18a5d8ccd9922e971b11ce7c27b33942e2c048cb0da01
 EBUILD python-2.6.6-r2.ebuild 10643 RMD160 05d2ccb6c2190fd8670e4746813661402492d228 SHA1 e9593163f531cb8bcebf65e510671fc762fbaefa SHA256 4c662ef2238e60fe0007566b2ac19869edfef18c2b3b965eb94606ae525ac45c
 EBUILD python-2.6.7-r2.ebuild 11713 RMD160 8ae1389d4475f4257684f2bfebbe07a1989123bd SHA1 d7040fbeb217975d4d109795052e10763757f9e2 SHA256 2ca0e45d147cefe8114015d0756425de97ecea8f241c1ac4881aa53bb40653c7
 EBUILD python-2.7.1-r1.ebuild 11217 RMD160 c26e835583ee4797dfc0e5ae51932fd8e9303777 SHA1 62830059f58bff5c6e05b53d3e9bf2da733a752c SHA256 316d43bb68f55203cfee8029262e39c594af822f8d8b536fc19a89d5da698769
@@ -37,12 +37,12 @@ EBUILD python-2.7.2-r3.ebuild 11997 RMD160 425059fd1d381a08f53df8ac8f9b229b34040
 EBUILD python-3.1.3-r1.ebuild 9894 RMD160 edd846b9fe5c472e4e99dfa95395708afa71ed13 SHA1 2807dad1ee84148cb2ddd466f047e5610e7c668b SHA256 ff762195045158c7cf2719a7ebfdb8317b4aa7fcf089db52afa9559a36ed01bc
 EBUILD python-3.1.4-r3.ebuild 10497 RMD160 b6e737a8eeee28b66c92fe19df31d3bda80b2f20 SHA1 97b5df3896f924d8e1203eb6d6319ead6c7ad228 SHA256 f364881588d07d2eba7a1c897caa071c2378ef8c3f5ddd3ae9df3b919b3238e9
 EBUILD python-3.2.2.ebuild 10825 RMD160 aa133da67f9db98ea8d131addbf61cfbbf281d59 SHA1 8033372f907492fc4bbf3fc390764954f650e3de SHA256 ba79f24437d8eefffa1fef4f13e3554488f17574551e381c2fcba37d1eab4af2
-MISC ChangeLog 100462 RMD160 0ec677b106c259f4443d2a4731477fd0e7a8b37f SHA1 d2d034ad9562bb32818d17c9dddd384865dcdc12 SHA256 e0dc6b60cacfd0dd3da69a5ac1b274051a2a05baf0391fb9ce037f729c6d4899
+MISC ChangeLog 100594 RMD160 babb37dc67dfe5514d54706e905b029607ef6d93 SHA1 5ffa8daae42ccf8774da7510e96980a23b2ce183 SHA256 fe7e7250824c71186fa5d594af9958a0df4ce4697feacc87e290e7fb6155387a
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk7nlSUACgkQxeMuLWsGW/vf1wCgs4BpEpP91vcIYDxB2pWBFvDz
-VVIAmgIxzdK0Dk5pB6jDfMzt2YAwcJX/
-=7Xjz
+iF4EAREIAAYFAk7pK9AACgkQC77qH+pIQ6QF1AD8DCLV1uG3nx89oKdmNpwndUYE
+nrVlAW3gVpq62tIifqgA/A3QE4sDxe3qfEnIjhsQAK3y5XPo0/j++jAXPQxCp34V
+=GPSJ
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.5.4-r4.ebuild b/dev-lang/python/python-2.5.4-r4.ebuild
index 77d8226026e4..5dbd4aee97c6 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-2011 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.30 2011/10/27 13:56:55 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.31 2011/12/14 23:05:44 floppym Exp $
 
 EAPI="1"
 
@@ -102,6 +102,9 @@ src_unpack() {
 		rm Lib/distutils/command/wininst-*.exe
 	fi
 
+	# Linux-3 compat. Bug #374579 (upstream issue12571)
+	cp -r "${S}/Lib/plat-linux2" "${S}/Lib/plat-linux3" || die
+
 	eautoreconf
 }