Work around bug #321145.

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

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 5c3b4319cad4cb19da2c9450032733861c0b1a6c..c83dc4427e4dffa8f385de2315650a261b33e6e4 100644 (file)
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
 # 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.470 2010/05/24 13:55:59 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.471 2010/05/25 17:09:38 arfrever Exp $
+
+  25 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.4-r1.ebuild,
+  python-2.6.5-r2.ebuild, python-3.1.2-r3.ebuild:
+  Work around bug #321145.
 
   24 May 2010; <nixnut@gentoo.org> python-2.6.5-r2.ebuild:
   ppc stable #319723

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 76cb2470876aa7587776cac2801ae6aeb37c1dc4..45eaab2a4234d1ebe3ed705bccd4cfadc25f81c0 100644 (file)
--- 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 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 9504 RMD160 3a14731bfa7d3a730f10f82b423540272da00c92 SHA1 36078c4c60c23eb639c0977169acd7a74f4f70c1 SHA256 5f3c5eb010591aff6a2811a2c3ebff60b4db2e9d6a9ee6a7dc68213f8fa17997
-EBUILD python-3.1.2-r3.ebuild 9246 RMD160 6b6be9b5710cbb06382eca5e4878f4d7c763c0cb SHA1 a224ad5c5e287434de525fbe1368229bc4d8e2ef SHA256 175987714e3128c785a3a8ddd6096a155103207af1e047757866e0a8e1513992
-MISC ChangeLog 83755 RMD160 475f7b9c7d7e34f9576f1e055f23b44471425ff0 SHA1 e34a79ab5cf08b7fc9c2a5998094463a5ece9738 SHA256 e583eb650bf973a96d1aeabbcaa1516c66e0a60c764ee45de8fcf24b5d88e243
+EBUILD python-2.4.6.ebuild 9276 RMD160 51eb414f4153758f8dc5f97650c97245674d12ed SHA1 357fce56ac7d7ecc2cac1f9f79ea1c044c44ed93 SHA256 1c6b0378a89a5916769f05c843ef57d0346e5807ac3ac7bb67ba8b660f8817b7
+EBUILD python-2.5.4-r4.ebuild 9639 RMD160 ec2c5a0732e1b3125441896a6b7034adee58023a SHA1 4b1270f9d732797e2d8b659dffa77530135defe4 SHA256 110a277fbe85b98763ec1448d405f50458c0ee75d2d53f896ba8e6a76eb4bef1
+EBUILD python-2.6.4-r1.ebuild 9579 RMD160 63713df2187e8f3adc35038b26e58fc8e4cf8e4f SHA1 05640ba05170caff47cf8998d6ac1ad127a682a2 SHA256 5fb3de2f4f6b9b13c16c8f0b452bde4057a8a889a828920762b4c4c02e2aad98
+EBUILD python-2.6.5-r2.ebuild 9493 RMD160 ee92df7a9c9264c3a89b602dfdddea5f0f76cf22 SHA1 68f9e68b00d222dcc6073868a1d5fcc43bf14836 SHA256 0d5352b289484190477df25fb1cc5911a143a177b27e12f78904e0c09c434046
+EBUILD python-3.1.2-r3.ebuild 9233 RMD160 4fe8f502973b65a1ed3cff896b02b1778ba4476a SHA1 68ce4d445e8f8190f0098766fe69b709a068de12 SHA256 9f9c48b18167a0572a809272651388f26c4ea7f37429db191808c5bf258bcb74
+MISC ChangeLog 83979 RMD160 c2978c82487dbef5104f267b5645ee7cac3d14bf SHA1 bece0cb17e1a7b01b8bee537c2a71c8524a21d8f SHA256 dca26d065e5433a6125f2e1e625239ac926211284dd61da5d0e8584ba3086d61
 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 709685c6e9b2efae9abcae1df01fa0dc060c4267..b3e16894f21e58f040b424b339f36248d5a97bcb 100644 (file)
--- 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.38 2010/05/23 20:13:15 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.39 2010/05/25 17:09:38 arfrever Exp $
 
 EAPI="1"
 
@@ -18,6 +18,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
 
 LICENSE="PSF-2.2"
 SLOT="2.4"
+PYTHON_ABI="${SLOT}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb bootstrap build +cxx doc elibc_uclibc examples gdbm ipv6 +ncurses +readline +ssl +threads tk +wide-unicode wininst +xml"
 
@@ -47,8 +48,7 @@ PDEPEND="app-admin/python-updater"
 PROVIDE="virtual/python"
 
 pkg_setup() {
-       python_set_active_version ${SLOT}
-       # python_pkg_setup
+       python_pkg_setup
 
        if use berkdb; then
                ewarn "\"bsddb\" module is out-of-date and no longer maintained inside dev-lang/python. It has"
@@ -284,7 +284,7 @@ pkg_postinst() {
        eselect_python_update
 
        # Python 2.4 partially doesn't respect $(get_libdir).
-       python_mod_optimize -x "/(site-packages|test|tests)/" /usr/lib/python${SLOT}
+       python_mod_optimize -f -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 d2f81d4b494d241053f5a63a057c538ae7f37188..d2963e335bc5faac7d7f0d1547e2d1cc9a426f86 100644 (file)
--- 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.20 2010/05/23 20:13:15 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.21 2010/05/25 17:09:38 arfrever Exp $
 
 EAPI="1"
 
@@ -18,6 +18,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
 
 LICENSE="PSF-2.2"
 SLOT="2.5"
+PYTHON_ABI="${SLOT}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
@@ -54,8 +55,7 @@ PDEPEND="app-admin/python-updater"
 PROVIDE="virtual/python"
 
 pkg_setup() {
-       python_set_active_version ${SLOT}
-       # python_pkg_setup
+       python_pkg_setup
 
        if use berkdb; then
                ewarn "\"bsddb\" module is out-of-date and no longer maintained inside dev-lang/python. It has"
@@ -297,7 +297,7 @@ eselect_python_update() {
 pkg_postinst() {
        eselect_python_update
 
-       python_mod_optimize -x "/(site-packages|test|tests)/" $(python_get_libdir)
+       python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
 
        if [[ "${python_updater_warning}" == "1" ]]; then
                ewarn

diff --git a/dev-lang/python/python-2.6.4-r1.ebuild b/dev-lang/python/python-2.6.4-r1.ebuild
index 6629e0ed53ef7d5cbef27950f4368ccf925c58fd..41d50d9f0cd99e3f373d1cfdc8cb8ae280db3687 100644 (file)
--- a/dev-lang/python/python-2.6.4-r1.ebuild
+++ b/dev-lang/python/python-2.6.4-r1.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.4-r1.ebuild,v 1.11 2010/05/20 21:14:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.4-r1.ebuild,v 1.12 2010/05/25 17:09:38 arfrever Exp $
 
 EAPI="2"
 
@@ -18,6 +18,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
 
 LICENSE="PSF-2.2"
 SLOT="2.6"
+PYTHON_ABI="${SLOT}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
@@ -57,8 +58,7 @@ PDEPEND="app-admin/python-updater"
 PROVIDE="virtual/python"
 
 pkg_setup() {
-       python_set_active_version ${SLOT}
-       # python_pkg_setup
+       python_pkg_setup
 
        if use berkdb; then
                ewarn "\"bsddb\" module is out-of-date and no longer maintained inside dev-lang/python. It has"

diff --git a/dev-lang/python/python-2.6.5-r2.ebuild b/dev-lang/python/python-2.6.5-r2.ebuild
index 09dd1b5d670d580c7babd453e66c37d33598c3d0..69ac8ade712f370e3f594d2a22e57fd1684fbc7a 100644 (file)
--- 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.10 2010/05/24 13:55:59 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v 1.11 2010/05/25 17:09:38 arfrever Exp $
 
 EAPI="2"
 
@@ -18,6 +18,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
 
 LICENSE="PSF-2.2"
 SLOT="2.6"
+PYTHON_ABI="${SLOT}"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
@@ -57,8 +58,7 @@ PDEPEND="app-admin/python-updater"
 PROVIDE="virtual/python"
 
 pkg_setup() {
-       python_set_active_version ${SLOT}
-       # python_pkg_setup
+       python_pkg_setup
 
        if use berkdb; then
                ewarn "\"bsddb\" module is out-of-date and no longer maintained inside dev-lang/python. It has"
@@ -289,7 +289,7 @@ eselect_python_update() {
 pkg_postinst() {
        eselect_python_update
 
-       python_mod_optimize -x "/(site-packages|test|tests)/" $(python_get_libdir)
+       python_mod_optimize -f -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 a19d2442afdd1796ae3554133a7e16e68816166b..f5c41589458cb411eefdf2ff533d0d69e2369196 100644 (file)
--- 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.8 2010/05/23 20:13:15 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r3.ebuild,v 1.9 2010/05/25 17:09:38 arfrever Exp $
 
 EAPI="3"
 
@@ -18,6 +18,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
 
 LICENSE="PSF-2.2"
 SLOT="3.1"
+PYTHON_ABI="${SLOT}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
@@ -50,8 +51,7 @@ PDEPEND=">=app-admin/python-updater-0.8
 PROVIDE="virtual/python"
 
 pkg_setup() {
-       python_set_active_version ${SLOT}
-       # python_pkg_setup
+       python_pkg_setup
 }
 
 src_prepare() {
@@ -272,7 +272,7 @@ eselect_python_update() {
 pkg_postinst() {
        eselect_python_update
 
-       python_mod_optimize -x "/(site-packages|test|tests)/" $(python_get_libdir)
+       python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
 
        if [[ "$(eselect python show)" == "python2."* ]]; then
                ewarn