diff options
| author |   Dirkjan Ochtman <djc@gentoo.org> | 2011-12-13 18:10:36 +0000 |
|---|---|---|
| committer | Dirkjan Ochtman <djc@gentoo.org> | 2011-12-13 18:10:36 +0000 |
| commit | c6a27e61326fa7ff91b8a0cee725705c28f1ff4f (patch) | |
| tree | cc747e87f674b2b03876466e7353497b2b07c166 /dev-lang | |
| parent | Remove || dir on emake (diff) | |
| download | historical-c6a27e61326fa7ff91b8a0cee725705c28f1ff4f.tar.gz historical-c6a27e61326fa7ff91b8a0cee725705c28f1ff4f.tar.bz2 historical-c6a27e61326fa7ff91b8a0cee725705c28f1ff4f.zip | |
Commit a fix for bug 394547.
Package-Manager: portage-2.1.10.39/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/python/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/python/Manifest | 14 | ||||
| -rw-r--r-- | dev-lang/python/files/linux2.patch | 11 |
3 files changed, 11 insertions, 19 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 10f1a63c8b2b..808c78e64072 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.561 2011/12/09 03:10:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.562 2011/12/13 18:10:35 djc Exp $ + + 13 Dec 2011; Dirkjan Ochtman <djc@gentoo.org> files/linux2.patch: + Prune back linux2.patch to prevent race conditions (bug 394547). 09 Dec 2011; Mike Frysinger <vapier@gentoo.org> python-3.2.2.ebuild: Replace hardcoded /lib64 searching with /<abi_libdir> paths. diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index d33289e726b6..ab270624960b 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 -AUX linux2.patch 606 RMD160 0cca6f619a98e6090d01f4a80c2178c323416a47 SHA1 8fc817c8da2f74d3ccc93d84a1bc713ed26c00e2 SHA256 a178120a3022ecb14044c82eff7e828f6d060b6885acacd4a4d8569fde372fd7 +AUX linux2.patch 332 RMD160 b6c4f45baee17fc5b0a88b63bbca87b77eaa16d3 SHA1 7722cc338a88d690e06f2ed0d9257b086286c288 SHA256 8c5f8d73e279767190c9567f959514167101ea2648f9f4c8146704c5946d8b41 AUX pydoc.conf 279 RMD160 85dcc3abd24faf09f3753b5c2299517f9b2ebc6a SHA1 c1faef486a0041c2175bfbc2cf10eccaa574e8c2 SHA256 6437e85d16d34efaf2665b3cabb0707392e6dee3df04989d3fcac63fd22997e8 AUX pydoc.init 741 RMD160 f6414ad95d7f1258f34afa5c9ff5efaa508a4d9d SHA1 576b5e7ac3c7e36d2e809de5b419d87f1bf23aba SHA256 913be80dea585dd161d2fd439f56a358f148853d8305cb0dbf113c91eb1643f5 AUX python-2.4.4-test-cross.patch 977 RMD160 8fdcd45dc202993988f7a1c2b3d918068883b99e SHA1 96f25777150ba05765282a43f08da6b6fab3cb73 SHA256 ff2a131776d560d188ec5069e17fea3eb09c26fdd02124ae5ff34d791c9fd9f6 @@ -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 100329 RMD160 3b1d8faa0f91ec9e800b57104e5cd44e902b9c93 SHA1 d596c10f19a0bfaa8f2dbbd47918f55811a1f75d SHA256 0ea768df45b0ca33344263dab2b6d9850338a031dbc38810a9f879938811e47c +MISC ChangeLog 100462 RMD160 0ec677b106c259f4443d2a4731477fd0e7a8b37f SHA1 d2d034ad9562bb32818d17c9dddd384865dcdc12 SHA256 e0dc6b60cacfd0dd3da69a5ac1b274051a2a05baf0391fb9ce037f729c6d4899 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk7hfCAACgkQaC/OocHi7JYVJwD/e3I+oP2lN+f3HW+/EE3ol9Lr -s/yzdossqEdLcWw89sgA/3n7eWid0Op1rSMjkptpnR5gy0gKqtxuWoeOTr6ihKVL -=9etB +iEYEAREKAAYFAk7nlSUACgkQxeMuLWsGW/vf1wCgs4BpEpP91vcIYDxB2pWBFvDz +VVIAmgIxzdK0Dk5pB6jDfMzt2YAwcJX/ +=7Xjz -----END PGP SIGNATURE----- diff --git a/dev-lang/python/files/linux2.patch b/dev-lang/python/files/linux2.patch index c34142381878..b002dc3392b2 100644 --- a/dev-lang/python/files/linux2.patch +++ b/dev-lang/python/files/linux2.patch @@ -1,15 +1,4 @@ http://hg.python.org/cpython/rev/c816479f6aaf/ -diff --git a/configure b/configure ---- a/configure -+++ b/configure -@@ -2995,6 +2995,7 @@ then - MACHDEP="$ac_md_system$ac_md_release" - - case $MACHDEP in -+ linux*) MACHDEP="linux2";; - cygwin*) MACHDEP="cygwin";; - darwin*) MACHDEP="darwin";; - atheos*) MACHDEP="atheos";; diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in |