Restore djc's fix for bug 368207.

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

6 files changed, 21 insertions, 17 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 1fd6c4a8ee48..c9c5a89bfa32 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.581 2012/04/26 22:32:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.582 2012/04/26 23:29:48 floppym Exp $
+
+  26 Apr 2012; Mike Gilbert <floppym@gentoo.org> python-2.6.8.ebuild,
+  python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild:
+  Restore djc's fix for bug 368207.
 
   26 Apr 2012; Mike Gilbert <floppym@gentoo.org> python-2.6.8.ebuild,
   python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild:
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 851b67df460f..9ddd5d8aee91 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -35,23 +35,23 @@ DIST python-gentoo-patches-3.2.3-0.tar.bz2 14265 RMD160 90d2d94efbbbdf2d4018f97b
 EBUILD python-2.5.4-r4.ebuild 9758 RMD160 10db51f6007c6e3baea435f72d1b23f3252fc03e SHA1 0577fb9820a4dfe978c63a691b4d7e4ac414a2b6 SHA256 e346b52c7fdc35a6881d994a8ffb254be7324f67b229d4c28d8b0a0db166a887
 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.6.8.ebuild 9273 RMD160 9eea176dfe73b3d14ef9d52552d7bcdbcf64e2b3 SHA1 939c67bfd9e681883ff428416e747c97816c972b SHA256 14489ccd28b5748e0901b084feff312d47e93a0375033b1c0b0822fbe57e6f4e
+EBUILD python-2.6.8.ebuild 9271 RMD160 0163bc65279b439e9f1f8f7210be79d06110bb2b SHA1 4cd0f70ce524964a32ba492c81b85e4d374e40ea SHA256 021e82749b30a12fb966c8175b451cba19b1ec7f892a2027ece1c9941aedcd84
 EBUILD python-2.7.2-r3.ebuild 12003 RMD160 8edbbcd451e1a3b60a6f36a2be88690cd302d661 SHA1 9a0fbeff4cd481b3aea2aed624fafee45984c3f3 SHA256 323c805b10ece2125f2950f3ac93e1c1f7008483fdcd43730159c5e60c36b8f9
-EBUILD python-2.7.3-r1.ebuild 9593 RMD160 08c6d4ea0cc573717b1b4e65a24c8f9fa7166fb6 SHA1 9be7ff27aa997d8cccf847465b6ad0c327e18a49 SHA256 b190f89d8aea3062e38abf9e787043346f57b3f0485b61bce363637b57280a82
+EBUILD python-2.7.3-r1.ebuild 9591 RMD160 1ee1bac6406e1f2c144e87c8abb578381a919cb7 SHA1 bf938a9e9dde9931d8ce91e64c0f41abdceb1c71 SHA256 27ab6ee02ba9b27335a9cbfd8eeda3a8caed8a5414fe02428be4bc8d8da1eaaa
 EBUILD python-2.7.3.ebuild 10514 RMD160 ed2180da276704719d722c4bacc243d06ff58558 SHA1 20701ddc7bb553b4c8c83b4334b58016c5c18e48 SHA256 3c8c368607d9de3d9e31e276c815e8a0ba9758d4eb203909e5ac8a917e86135f
 EBUILD python-3.1.4-r3.ebuild 10502 RMD160 7394f5044a668c595cb6c1155bbaf1275765818a SHA1 84d53cdc94a04dfa72dc8ce8c3e6d39ff31a86e4 SHA256 58d1f2cab26a26b49526a3a5b02100a57e5a2811ee638e942918731379e8b42b
 EBUILD python-3.1.4-r4.ebuild 10610 RMD160 02ef48bc76c9d5c30d2f35e9331076b3a8adb4a5 SHA1 be1f56063ec82fcf84310a73ef3c22aa810a5594 SHA256 3400eb206e13fbcbd43b7a2a2889e574bdd02b03beb61411c1e89ae57b66cfcf
-EBUILD python-3.1.5.ebuild 8073 RMD160 3957f09618042bd7e5d58812e6878f8280f59757 SHA1 9e6a0f6c8790cf217b6e02594ba0db53cb0c1d23 SHA256 7bc4b8270314c69980f98feea5a29dd50f214becd409d79e3cb842e94c2a3a15
+EBUILD python-3.1.5.ebuild 8071 RMD160 bd74c59646029f4ffba462f175b3dfa0bb1eecbc SHA1 a037b8f012e55e6f9e588733399d93505c93a1e4 SHA256 61a23c5f3648a18bea94fec343e3dbd74b77bb69854ac22c5331a199048eb4a4
 EBUILD python-3.2.2-r1.ebuild 10948 RMD160 e1b138294ac62bffff6208372d2509e72cc43a60 SHA1 3fb7f8ce8d394c20d0829914a1a063d9e1f78ac9 SHA256 e8e29aebb7d348b588c7269b95e2dcaab0f045be3d28f59a5471b1402f402c6d
 EBUILD python-3.2.2.ebuild 10821 RMD160 2d51343b5a915c8880a0a5a846bbd86ce6805992 SHA1 4aff2efe6d752e4bee654cd96c08c17f521fe276 SHA256 584046f821e5a9abc733662fde2b0156a62767a12c9c5c9a4d42b359d823f6c1
-EBUILD python-3.2.3.ebuild 8503 RMD160 a6786a17070c7796ce69b25d5905937c4cde01cd SHA1 69668ceb645923f79eae7bbe7fe8836b05699739 SHA256 09515e51a0456b21d13d992fbd49b37fe7abb9dc13203a997d979f1df137b236
-MISC ChangeLog 3019 RMD160 efd2bdb5b41194a4d290f0a15b6bf7b6df8eeb33 SHA1 5cd2f1acfe4eb427df6276d1c5a801276bf65200 SHA256 cbf416aeb1da51f729206fe88dcb7630f453ab0935597fe7ace3ed23b674d698
+EBUILD python-3.2.3.ebuild 8501 RMD160 61d49fc5ef7a2e0a5661f6136257cbc0b70d71d3 SHA1 1657c5731650d5d11f0c7fd925f67f649a7b9609 SHA256 44f27056de9e580d280d2433a4689072b528033017886b80dde8136c6101bab8
+MISC ChangeLog 3194 RMD160 bb91f069bd6e046e3a66fe790d8511af6903429d SHA1 b5340eb0edb413c4d24f2c20773959bf8cdd18f7 SHA256 cd868615ffcf0e370d6a33fd1203cd40808965c9810a2271a15ee73286bd8c19
 MISC ChangeLog-2011 100599 RMD160 2b79c394a837d8d321a2750084da3fe0835e1d3b SHA1 3dbff45b51526c994fa3aa85f4eed7b962bdd09f SHA256 23129cb47321b2a6b1cb9323f1815d0cd11d6f30c3893908ed51575c270a0cc8
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+ZzSEACgkQC77qH+pIQ6S/WQD/Z4rjZhVKNPzO5qsdhiiuYgeZ
-UO4mxZIxy/Eqhf8vbFwA/Rlk5U04QRQo5qW05B4MejLoIfNbYlyri6A9CQBvOObE
-=0ALB
+iF4EAREIAAYFAk+Z2nQACgkQC77qH+pIQ6QGpgEAjCYdRodtzJG8nu8okjpLDfmt
+R15bH9wwxGFz4+WrOhsA/0XThUmQn4ew7WtG4NOXjc3ozUssaemoKxQST6cvjmlS
+=RRj5
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.6.8.ebuild b/dev-lang/python/python-2.6.8.ebuild
index 5708a3038de8..5c5d52bd75c3 100644
--- a/dev-lang/python/python-2.6.8.ebuild
+++ b/dev-lang/python/python-2.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8.ebuild,v 1.3 2012/04/26 22:32:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8.ebuild,v 1.4 2012/04/26 23:29:48 floppym Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -296,7 +296,7 @@ pkg_postinst() {
 	if [[ "${python_updater_warning}" == "1" ]]; then
 		ewarn "You have just upgraded from an older version of Python."
 		ewarn "You should switch active version of Python ${PV%%.*} and run"
-		ewarn "'python-updater \${options}' to rebuild Python modules."
+		ewarn "'python-updater [options]' to rebuild Python modules."
 	fi
 }
 
diff --git a/dev-lang/python/python-2.7.3-r1.ebuild b/dev-lang/python/python-2.7.3-r1.ebuild
index fb13a65ec433..1ed50b2a1c20 100644
--- a/dev-lang/python/python-2.7.3-r1.ebuild
+++ b/dev-lang/python/python-2.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3-r1.ebuild,v 1.3 2012/04/26 22:32:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3-r1.ebuild,v 1.4 2012/04/26 23:29:48 floppym Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -311,7 +311,7 @@ pkg_postinst() {
 	if [[ "${python_updater_warning}" == "1" ]]; then
 		ewarn "You have just upgraded from an older version of Python."
 		ewarn "You should switch active version of Python ${PV%%.*} and run"
-		ewarn "'python-updater \${options}' to rebuild Python modules."
+		ewarn "'python-updater [options]' to rebuild Python modules."
 	fi
 }
 
diff --git a/dev-lang/python/python-3.1.5.ebuild b/dev-lang/python/python-3.1.5.ebuild
index 9df2437c640b..e2cf84025435 100644
--- a/dev-lang/python/python-3.1.5.ebuild
+++ b/dev-lang/python/python-3.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.5.ebuild,v 1.3 2012/04/26 22:32:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.5.ebuild,v 1.4 2012/04/26 23:29:48 floppym Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -277,7 +277,7 @@ pkg_postinst() {
 	if [[ "${python_updater_warning}" == "1" ]]; then
 		ewarn "You have just upgraded from an older version of Python."
 		ewarn "You should switch active version of Python ${PV%%.*} and run"
-		ewarn "'python-updater \${options}' to rebuild Python modules."
+		ewarn "'python-updater [options]' to rebuild Python modules."
 	fi
 }
 
diff --git a/dev-lang/python/python-3.2.3.ebuild b/dev-lang/python/python-3.2.3.ebuild
index 23a24332008c..f8ee6f97702b 100644
--- a/dev-lang/python/python-3.2.3.ebuild
+++ b/dev-lang/python/python-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3.ebuild,v 1.3 2012/04/26 22:32:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3.ebuild,v 1.4 2012/04/26 23:29:48 floppym Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -288,7 +288,7 @@ pkg_postinst() {
 	if [[ "${python_updater_warning}" == "1" ]]; then
 		ewarn "You have just upgraded from an older version of Python."
 		ewarn "You should switch active version of Python ${PV%%.*} and run"
-		ewarn "'python-updater \${options}' to rebuild Python modules."
+		ewarn "'python-updater [options]' to rebuild Python modules."
 	fi
 }