Backport fix for bug 503180.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 16 insertions, 12 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 4ed9d6cea3f0..06ac38bc19ce 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.747 2014/03/15 21:48:51 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.748 2014/03/16 18:36:25 floppym Exp $
+
+  16 Mar 2014; Mike Gilbert <floppym@gentoo.org> python-2.6.9.ebuild:
+  Backport fix for bug 503180.
 
 *python-3.4.0_rc3 (15 Mar 2014)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 98b54f696473..4e6d012ffaed 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -27,6 +27,7 @@ DIST Python-3.3.4.tar.xz 12087568 SHA256 c6cc126d91c04e0348882cfbd36d7a844d4e50a
 DIST Python-3.4.0rc1.tar.xz 14047816 SHA256 4142820fca96ac2b2772efc5767e51ebb74e2171eda35798f205a0efa7017f6c SHA512 30cabfc8a89eb1d0a800bc3ec8e6effca3b7a36b47599b01e7743c8ffd9c5995af1ef7f28ebc69fe9c510c465f77d8933b9c80eb121df5440faa00ea47ed885d WHIRLPOOL 2318433f5e1715111a31cdcf99ef57aac846c60fc743deac75114979232f83598022f5dc226a3328c0cf5fc3cf077fe33b814c4fd534123bdae372f8a3ea8583
 DIST Python-3.4.0rc3.tar.xz 14039828 SHA256 48c99b690eb8f9e6317f1eb760a32b4f5c18a4777f03f0804429f28d3081cf37 SHA512 24777ebfdb9433ad69ac27971e0b50a6595c534edbf6c009b5f4cb6ca7a1f24cc73dbaeba118b751159e2671dd85f52016d1dbea6303595daa222a1b8501a84d WHIRLPOOL e859b240ad44574276f21853817c14b1cc001a5391658948d73f9eac48b70b2cdcdffd40d6b0697539b276cf37740b868b4c56d013feb41051bcbbe2b184c14a
 DIST python-gentoo-patches-2.6.8-0.tar.bz2 17608 SHA256 277dbeb19107d3244e58aee98f130ce98d03775e7d4074ff9e1577125c999c06 SHA512 2a988a81db888ce56e07d4591ab37b641e51f73f85c087ac0505dc2b703b1dd450ed36b2533e5e562935d2f5e17d581fbbcfd0b0dc4bee69c882f3442da29632 WHIRLPOOL 8ae0f01e1218ed758b9dfca9b4de6a9115c09db665a2831f9af7b8e3f9aa178c10d129104273b551b8a26e9ba575e3f8d3256d7622506a69d496935ce9d87685
+DIST python-gentoo-patches-2.6.9-0.tar.xz 17532 SHA256 6ff9448c3a8412f9624363ec6f321b4e7f098aff350a82fde74f82adfbb0cae3 SHA512 e6d134200df8320fe137f0a282b7564aba02b10eab2d4585fa82de5b4740223ddeac7a5ea922a40cea8496a1a706b6787310eae45978a3e69342bb80a7670a39 WHIRLPOOL 09b38d10f9415f41205dec2c9e9df5f0687e23f791d31ce1127d96bd489c9fc7825912096b37329d62e66d8c99778ad1ffcbdbd4a2b77b5305f75ea7c28fe15d
 DIST python-gentoo-patches-2.7.5-0.tar.xz 13848 SHA256 b84ff6a7669d639272cb2f94d4268d3be3af64903a380f4f60ab539e4a29b111 SHA512 9fec0ba9d958894861d4282ff9145f0387ad7fd3914a3689d148308f56158c1b397f0816c58383d2cf198f9a3b9bf321f2f441ec4aa91e4a503cd957b4a7fbd4 WHIRLPOOL 39d807453f6510f14db1b74f5dac1cd2c52d00be356d132c0f9229caeb8ba8bcbbbf32b05b3d3f6236e853b204ecb961e6b12cabacaadf5f515e93f00cda71d5
 DIST python-gentoo-patches-2.7.6-1.tar.xz 14572 SHA256 cb0fca8f006ee7b8501cfbed063c987ad6793f61072144ded2122bca6dc608ed SHA512 e6bc3de2053b1dbc5845effe86cc7d19acbcf10b52b2a1ce3d45988492a2430dd8f6ea3e547beaf57bdf176b06a07f267aa6afac82cde61ed730fe3f4b2ab238 WHIRLPOOL ecf800bc895609bbdf5ec5c53031142b56002b20930d9dd1c34610fb6628d0d5fa6874a1111fa691474bde6ae1e18a03da795bb298cde4a6f649e45637ea4da0
 DIST python-gentoo-patches-3.2.5-0.tar.xz 13892 SHA256 ebbfacc81486493ce4c16a697e53d77e9dc5c9d700e86cf92ae93b5e3e03abee SHA512 6d09ef5ed583dedd587d4247c7d0e99daf20d7cadb7afbcf4d951931e3a574a82f1b9dbc4e4f93d3dc55773808452284f50dee2fbfb6b68aff5f1f53c1665359 WHIRLPOOL 55b1ba0a25612b3987af93e252dd2dbd71ff0f4ff0bcadda9ba0b11e19278acdb3fa91166a854dcbe3d27bb570a104ee63a3976111d6f608614f7b3d9f734f67
@@ -35,7 +36,7 @@ DIST python-gentoo-patches-3.3.3-0.tar.xz 12992 SHA256 38b5c604416947fdd7d87ada2
 DIST python-gentoo-patches-3.3.4-0.tar.xz 12576 SHA256 2c942420760b92df826393a57b05f2952e0ca920bcbdc0263eef0c61c6875e15 SHA512 41b57de79865ac143c62fcff7b2d28f706c8cba03439067ae2e49075d7d830a807f14e105aeac1dc75f419e816912ebeb53aa2e0cd3c49e4f83bddc91c1dea7b WHIRLPOOL 94a651e3a510843f5314fa45538b3552dd586900dec8ad1ce8ff154c2ca17410b07652f76eff46fc5abd70650ae2b8c4d61c72afde8e2a28d4bd31ec5ea22b01
 DIST python-gentoo-patches-3.4.0_rc1-0.tar.xz 12628 SHA256 1db8c1650e7824e61a6a6a45925573d6bf0380345395b16b7d25679ab2fb34eb SHA512 26ce4953130075c1fe981adcee8a129de5f43aea28358c60552f641b0599c340223081d111a754e32e974e9692106f3d5c220c8f192a8a954f981ae9302e5f11 WHIRLPOOL 1f393a88ac1182870935f9a069af62f693b582966f776a6598dacf6a49ced3157b69a9318c90fa87d0dadbcc6682badd9d1445089b77a200a0a6eced571e794c
 EBUILD python-2.6.8-r3.ebuild 11326 SHA256 dda37aee6bf09c08406b7e5e55d284a864a456e093b74560ea8af90b1ac81de5 SHA512 bf917ce50ce515f43610945194f24d9dd9c2d323a9cad3cc0fe070103e5d4be3285e23cb379d4308923132e087d50c8d9991966e527fa63f512da587d69b8af1 WHIRLPOOL 00b17ba9f1b4ff379089e44714ee1503fdfb95328c9b4d753f18858f5e6b165bd5ce4bc8a9cafad9b893c714ce9bc2bfa9bdf51407960d16c8cb1e9a452d3230
-EBUILD python-2.6.9.ebuild 11282 SHA256 76b0c7d777649aab8e1c092b9bf319e2aa14cfd3aecf6cf678acc729d27cada9 SHA512 2106d68fa409ffd42535bcdd1447ade29eaffaf3fb0428397e50f8eaee8e62e74446e0611900b23218804c251fd48afddc0cdc043aede23a1345114b45d8f5c3 WHIRLPOOL 3d186d6ee7ee2a896c2219f40cb9901febf1b77901744693ad7bfbb72af14a507b1647b253599f08ae93a52acb3e741af1ad59b2909b8a0875f7dffe05b5ff31
+EBUILD python-2.6.9.ebuild 11291 SHA256 7c6835d6730113c085ae57f960ea1a85d8087b4554db7bba5450ca57a2ddb568 SHA512 b20d95ebaee99e86294fed7a9acc8fba21fe57e8ab8a29da66ccf44a5d3053cd16944ca217637c3657ceec23e328713fc0c94e7301441ff553ff21dea816902f WHIRLPOOL 632fd305442296dd7cc4450be72a7189723c071c8daaee1afb1247dd9476369f7708858360d37b1d96fd6af070e4d0540c199306ebce6c955bfe8860aa97a8a0
 EBUILD python-2.7.5-r3.ebuild 10577 SHA256 c26d18e0fc436e0639ce75e8372b7d05e94bab934ab46ce8e1e0deab7cd2f07d SHA512 37baba1b1c90f6d8355f9eb9af5dfe27187e1d23f9ac83cbc4da5585364cbcd5471ad15eacf92f5b7bd872e6e7d36a1bacb6caf37054cc70c387998dd70e8dce WHIRLPOOL 8df51382e48d72a188c59a43772a7be660713be2f5c568b150a7c23b82f1f1069024c17662ce3f282c4557dd8caf36e93f60900606a0442d1ec8039c3927771b
 EBUILD python-2.7.5-r4.ebuild 10639 SHA256 8ffedafb7b4c6544a13c9c4187532402002c77b355d0b556b5489a3354a3db3a SHA512 051556f998fded0add60cc576923e7a258333dff47b8ba04aae97447d6c6df04ef0ce01372f66707cba8a4bd7f119f005fc7f3beb6899a434a2760243de1a972 WHIRLPOOL 229db4f43ae9e8d6ed32f277235e635b04537ada07163df6c703d4666a6398ba40601c26506ed7ccaed1fa9ca84b263e55d6d46c37de9e78e05c2ad2059e2752
 EBUILD python-2.7.6.ebuild 10578 SHA256 157ff80818045290cf27d6cf4cc25d9b6bfe982e3732fd18bf2d96f6cbe15949 SHA512 34a173654c843642da63efd75463040ea3cacd10bd80fcb53125531443b8d2b63983b7ccf888e4b9dc65d4007f3ad012bce0578a6dc8177d8fa2b7a5e45894a0 WHIRLPOOL e3e1d6b101c7bf0115f46fb68ad0e08013bdd6c1e88b9a5b979d904bde679185bc0a10aa06b1b7d83a2c826b3858cfe5ae24d585b3313ad15ef5b892cf263b3d
@@ -45,13 +46,13 @@ EBUILD python-3.3.3.ebuild 9544 SHA256 2d1dc38e48e78275e6a269b6917564b2645bd28dc
 EBUILD python-3.3.4.ebuild 9453 SHA256 beaa18d3104df12339b09bd943b837a392bb861dc54bac07b121e9742ba3af77 SHA512 59e54bb6b680cfbfdcb3f5ec68ad7079a14cd699f1ebaa78151133b95c2b3bf98c677ef33ef1216af3bd951cfb6f9610f87cca14877f5f699a8fda087903d362 WHIRLPOOL 6fc5d410c77affdd5b7418d4ef27f96e9dfa0e8ee42f481ebd1369de2375f300e89644b93e3127d7234dad42d81172f8747bd07622a6ff4922914874d8cbea9a
 EBUILD python-3.4.0_rc1.ebuild 9529 SHA256 190a5063dd2eaf047ba9a0c0960fec77976b51afe9c589acd5f39df9008f7ca7 SHA512 489af787cc26fdca3b70842e99a8e6a9131c4c58b2048960d3f9bb55ea4046e218a3a049be3cb056184e46c98bf341c5d804c8f3c1eaaa60cc91612ad385b766 WHIRLPOOL e711c7080eda69ea115e412c405ee59fd24bc465b07e3e3211c950bfed6cf8dbe186b1603c707378d9fc3064835c7379cee4f3f8be686621615079f29907af51
 EBUILD python-3.4.0_rc3.ebuild 9533 SHA256 33bb634167ac3c81319560bbdebf4486b14c5d830073db632a78ac78779f3098 SHA512 f7a7dcb4802144dea1c489de81468b173d444aed4e965db3b2d01a1fed78e3f5aaf7829cb8ad646599e44aa109aa8d2fca341f9019e8523e4d654f268709e48b WHIRLPOOL e598e276df61825fc46f4258b6ec527d6ee46def7a87375b77ca12117071eff2d1ed132ec97b37f55fbbeb566385fa8baf0b079a1dd713a506f4865d2036aec8
-MISC ChangeLog 30923 SHA256 8a85f2cd125e1e4a9258ee1d7c67a2e036ce85b52c09755e9affc6ccd008c38b SHA512 cfccedcd074f152f3a57fc7c0cb7c8d8f634be5a40e52b28705184ada68195310fac9f30ce816d5bd7e7b57a4d95b508a5beac975490ed72f464150ebcc25de8 WHIRLPOOL ac10cc405525507a5e15d03d64ee4a3edca3f166a3324b62265202a96d07be6b6e06633946aba6f1fffc1f2e3be130da38a3d80d6beddf8368f520b66ff984de
+MISC ChangeLog 31025 SHA256 ebb656b76777adf8a2ff992ef6bc2fe78e01a31fba1da70ed0ac1d7677bd7e33 SHA512 d52f8cea0a910d527eb1a03d946bf69cc25d1ce1035134b54361a17e717a8ebfcffbd1722c51ec0b6bb99cfb6313181330e450db9eddec0120e9730c0c2a8d4f WHIRLPOOL 2d1b2a879926e720a524dbe5487d302e2bff858c60044e1c3295cf9b80be70d895893b750ed53e77793e8de9a2eec321e28ad3719b3ae0e7f1aca5aa2d3aa0aa
 MISC ChangeLog-2011 100599 SHA256 23129cb47321b2a6b1cb9323f1815d0cd11d6f30c3893908ed51575c270a0cc8 SHA512 4181ba9d965139ba58218da5b960c87b7a611b27606a1ab1ce1b4c3c9255b4e0e2947307cbfffc531f0f8b6b545ee11e083fcb29dc7b2b7ba31c6bb40b8ab128 WHIRLPOOL 4ceebb6a6ed58b906d3a7331795748ac6e4fe2e1401bcccae9024a8e81e2c444aebc5fec610398cfe6002354ad3b10487484598da5091867874727f07e239c56
 MISC metadata.xml 661 SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 SHA512 871989a29417ce20d95da950fa385f1a958139de7b1567beb9cda28a1217901243cd9d25235fe3c7b0e43a82176d72286e31e4e97310b26488d2a3252ef3a8a0 WHIRLPOOL b694b1b4270ba15640d04a3b0b26a08575ea4afc9be256717f7f3b1768d75da9f71ceca6afd2f69971906227d5ba42263d2df2fc9387441aa240222d39fd094e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlMkysQACgkQC77qH+pIQ6SdWAD+JlLKTMOVUESg49yQtxvDjAq/
-AMIAe4q1dOA8PF279hgA+wSaMEzpMjsUVI82l2hdQRCizpwFZcZyy8wCrpQ47/Fn
-=Xl8a
+iF4EAREIAAYFAlMl7yoACgkQC77qH+pIQ6Q9ngEAqYuoWpIIz3+s3K8HT8MTMaha
++vYGhv7JzaYsjBDKtzMBAJOqsxrm2qbqFAqrCOrVQo+9YG5NLJkMXahpr7QZIQjd
+=J60r
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.6.9.ebuild b/dev-lang/python/python-2.6.9.ebuild
index bc9c14c3b870..8a12f61a2ccf 100644
--- a/dev-lang/python/python-2.6.9.ebuild
+++ b/dev-lang/python/python-2.6.9.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.9.ebuild,v 1.3 2013/12/30 21:57:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.9.ebuild,v 1.4 2014/03/16 18:36:25 floppym Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
 WANT_LIBTOOL="none"
 
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
+inherit autotools eutils flag-o-matic multilib multiprocessing pax-utils python-utils-r1 toolchain-funcs unpacker
 
 MY_P="Python-${PV}"
-PATCHSET_REVISION="0"
+PATCHSET_VERSION="${PV}-0"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="http://www.python.org/"
 SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tgz
-	mirror://gentoo/python-gentoo-patches-2.6.8-${PATCHSET_REVISION}.tar.bz2"
+	http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
 
 LICENSE="PSF-2"
 SLOT="2.6"
@@ -91,7 +91,7 @@ src_prepare() {
 	fi
 
 	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/2.6.8-${PATCHSET_REVISION}"
+		epatch "${WORKDIR}/patches"
 
 	epatch "${FILESDIR}/python-2.5-tcl86.patch"