Only apply crosscompile patch conditionally, drop tests if crosscompiling and fix PyLocale.strxfrm leak from bug 177804. srtxfrm from Debian bug 416934

(Portage version: 2.1.2.7)
 (Signed Manifest commit)

1 files changed, 23 insertions, 8 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index f91352223dd7..9562961fe4a4 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -65,6 +65,7 @@ DIST python-gentoo-patches-2.3.6-r3.tar.bz2 8950 RMD160 a9bd4dfadf711ade1a314ace
 DIST python-gentoo-patches-2.4.3-r1.tar.bz2 8594 RMD160 0a93e8b315eefa832db92398b3f5e8da83fe3ea3 SHA1 7f20fffc6ec4273b898cda394c87929ddd939419 SHA256 295d8131b1f6c0622d92133f6e612821c2af6e1ebefe527aec8d42de49b0b1e9
 DIST python-gentoo-patches-2.4.3-r4.tar.bz2 9386 RMD160 5515c58b626a21a19064a142a9b95e3085b20ad1 SHA1 d10654343754026e909c74111bd96f079879b0ec SHA256 06a00ae4944fae1f0920a5cb91d973bff24b5b37d609f3ef5daaacafa6bb35fb
 DIST python-gentoo-patches-2.4.4-r2.tar.bz2 8150 RMD160 e6881576bb7c900ec99825647d828be8bfc8ea78 SHA1 1a414a653fd8e167a57731d8317491f4afef7e64 SHA256 19130cf701a0eaca52572fb7a34db23868aaa00354ed427a9504f2efc21d167a
+DIST python-gentoo-patches-2.4.4-r3.tar.bz2 8348 RMD160 e9b59a7cd1469668d43a41d396d7a275bef78270 SHA1 16373b922895d1c14ccfa9d6b39079f2d5a2bcb6 SHA256 1c81397312136625fc220db660f701d4eccbde75e74bb40a0d77015b4d5d4f9f
 DIST python-gentoo-patches-2.4.4.tar.bz2 8841 RMD160 4652b5f3bba59b969816c00927453e0de058663e SHA1 a1b1e8d1b80e41b503e8f49e21ea6a554f23f046 SHA256 6b6b72cd25bc854f3841361d488ab74bdf0febd5a8b73c4a92054d731cd45321
 DIST python-gentoo-patches-2.5-r1.tar.bz2 5180 RMD160 88f7f49ccea043986d837962e3a7d463302b6055 SHA1 395dd562729911815d871bf6df638a96cfa3ae1f SHA256 e56145f22a8d1093a6004177ccd6ecef5e7f9b655633846ee753bd3b45eff4c6
 DIST python-gentoo-patches-2.5-r2.tar.bz2 6047 RMD160 b11e1d529486e2ed88bd34e1ebb0cebf6d4e47cc SHA1 1af955b338cdffe4da7cb6416eeeb6e35490e9c5 SHA256 f4c8d4a924f48ab35b3281cceffe7237efef69f3bc5a68c3492d8b21d60813b8
@@ -113,6 +114,10 @@ EBUILD python-2.4.4-r3.ebuild 9905 RMD160 35d231f92aaebc37974a470aeb77ed138ec079
 MD5 a4e5b83ff6b06bf24eed97a253b81003 python-2.4.4-r3.ebuild 9905
 RMD160 35d231f92aaebc37974a470aeb77ed138ec079b1 python-2.4.4-r3.ebuild 9905
 SHA256 beb92998f0ee42244eef332c8063083a24824a65524ebc26a48b1cc23da9e63d python-2.4.4-r3.ebuild 9905
+EBUILD python-2.4.4-r4.ebuild 10202 RMD160 63698e9e8093720a453e93a8495c30a85d732aa5 SHA1 171c49616bf6f8aed891349d1da222e69c8379a1 SHA256 d1155e9f4645db3d47e20d622a9600f338a8659649546865c5b9e77989cfc81f
+MD5 97a8a42681bdad3413fd727062937cad python-2.4.4-r4.ebuild 10202
+RMD160 63698e9e8093720a453e93a8495c30a85d732aa5 python-2.4.4-r4.ebuild 10202
+SHA256 d1155e9f4645db3d47e20d622a9600f338a8659649546865c5b9e77989cfc81f python-2.4.4-r4.ebuild 10202
 EBUILD python-2.4.4.ebuild 10393 RMD160 3a036a4a1eb8662303aedbadfe56a76ca33ad943 SHA1 f17d5d1c554df54057a5e5e3bec4d3ff75520460 SHA256 032bb614e47b3afa5b456a4d2bef8436d14478abc344593ce4beadc34d9d68ab
 MD5 de6f40dad405eface55886fe943305d1 python-2.4.4.ebuild 10393
 RMD160 3a036a4a1eb8662303aedbadfe56a76ca33ad943 python-2.4.4.ebuild 10393
@@ -129,14 +134,18 @@ EBUILD python-2.5.1-r1.ebuild 10274 RMD160 6e4dfa702751a47303623bc1d9a11201811c4
 MD5 8fea8c122c0273140f3cc649d4c59869 python-2.5.1-r1.ebuild 10274
 RMD160 6e4dfa702751a47303623bc1d9a11201811c4705 python-2.5.1-r1.ebuild 10274
 SHA256 55d6d116e0be7105ee5da8d2895596e6cc9bac9ea34015084bf89b1e360e6980 python-2.5.1-r1.ebuild 10274
+EBUILD python-2.5.1-r2.ebuild 10548 RMD160 ddd9d939de85af6e30c8118c0929fb251fdc3601 SHA1 7557bbe9912c72e1f39cd584b8eb52d4274be00e SHA256 9da29259c3687ae224febb5bec66ab4d25a9420780a11cfb2b61ab422f35a97b
+MD5 8116c7d1c46284628e719032f1ddf5d7 python-2.5.1-r2.ebuild 10548
+RMD160 ddd9d939de85af6e30c8118c0929fb251fdc3601 python-2.5.1-r2.ebuild 10548
+SHA256 9da29259c3687ae224febb5bec66ab4d25a9420780a11cfb2b61ab422f35a97b python-2.5.1-r2.ebuild 10548
 EBUILD python-2.5.1.ebuild 10021 RMD160 43c21c538cb70b82c53b34d7549ef1bc4fd7c6f3 SHA1 a20b32a93bde44a2abc0361f9899735273a6294c SHA256 d0dcf5af1e35630d5eefe8597bf01648bb0c17332fdbb299a47928cc030e568b
 MD5 489d681bf11cf7b1639c3e04ba1c6e6e python-2.5.1.ebuild 10021
 RMD160 43c21c538cb70b82c53b34d7549ef1bc4fd7c6f3 python-2.5.1.ebuild 10021
 SHA256 d0dcf5af1e35630d5eefe8597bf01648bb0c17332fdbb299a47928cc030e568b python-2.5.1.ebuild 10021
-MISC ChangeLog 42303 RMD160 76333c169a4b3cd42c1816a762bacb079c687fe0 SHA1 cc9001a3a2d5190c52ec7c86312f5a645bdb9d2b SHA256 9e714975ceb65be8676f62f44e5bc51f2a3001a06d2c83b6cd5a3e4faf783f24
-MD5 20a5cc6451006ca8e587d5c062d9ee5f ChangeLog 42303
-RMD160 76333c169a4b3cd42c1816a762bacb079c687fe0 ChangeLog 42303
-SHA256 9e714975ceb65be8676f62f44e5bc51f2a3001a06d2c83b6cd5a3e4faf783f24 ChangeLog 42303
+MISC ChangeLog 42630 RMD160 62ed11eb605b5c380ccb9ea038471df94d5e94c9 SHA1 aaddebcfac39ed4a238e533c227701a022e85e60 SHA256 1a8143db160bf506def081203bebe5a94f97d5b49a89d75016e3630a1051ab56
+MD5 c3f0765ad0a951f2617594b85807d055 ChangeLog 42630
+RMD160 62ed11eb605b5c380ccb9ea038471df94d5e94c9 ChangeLog 42630
+SHA256 1a8143db160bf506def081203bebe5a94f97d5b49a89d75016e3630a1051ab56 ChangeLog 42630
 MISC metadata.xml 221 RMD160 dd50f32b16d6c15330ae1ee711d8a6cf8f6e3bed SHA1 85903c4affc3a23dd37e4910eb9b198cd02b242e SHA256 c14b93d19008cbeeb3312ec60b97513eef18ccfe82b8e2303cb44977ca13e3bd
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 RMD160 dd50f32b16d6c15330ae1ee711d8a6cf8f6e3bed metadata.xml 221
@@ -177,6 +186,9 @@ SHA256 6c9d6488dde7d93177ddacfa9cfcf4def0714e374e00141457be5c707c6485ec files/di
 MD5 862bd49bdc56c2b616ca263f7e3bbe91 files/digest-python-2.4.4-r3 533
 RMD160 fc24077405cd9d2a9190463f60df76ff24935104 files/digest-python-2.4.4-r3 533
 SHA256 6c9d6488dde7d93177ddacfa9cfcf4def0714e374e00141457be5c707c6485ec files/digest-python-2.4.4-r3 533
+MD5 bee33863e49d046cbe199a9e5d8f7dba files/digest-python-2.4.4-r4 533
+RMD160 bb38a0bcdb4e3a9849883271a58461cb3cdeaf3c files/digest-python-2.4.4-r4 533
+SHA256 7adcb37e259cb269f5000934c41ed8a355157bb5a70fbe26f8899dae8a4892a4 files/digest-python-2.4.4-r4 533
 MD5 f9b5c964d826b43c4c4e46c70c8be212 files/digest-python-2.5-r1 521
 RMD160 2d3bf90259ffdc91332550713cabf9a36b686aba files/digest-python-2.5-r1 521
 SHA256 dbc6e2a658c38209466d2a2cf898d619ffd50edbeabc749863af334397b8fe93 files/digest-python-2.5-r1 521
@@ -189,10 +201,13 @@ SHA256 a45e1cf55eda4d760225944ed0f598d594b573174479651cfa8a78ca9ca4db3c files/di
 MD5 324d60a42f00557119aa50958d0ee6fd files/digest-python-2.5.1-r1 524
 RMD160 d49c6128cbed41384a15cacfd1c728a1b2bc9f8d files/digest-python-2.5.1-r1 524
 SHA256 a45e1cf55eda4d760225944ed0f598d594b573174479651cfa8a78ca9ca4db3c files/digest-python-2.5.1-r1 524
+MD5 324d60a42f00557119aa50958d0ee6fd files/digest-python-2.5.1-r2 524
+RMD160 d49c6128cbed41384a15cacfd1c728a1b2bc9f8d files/digest-python-2.5.1-r2 524
+SHA256 a45e1cf55eda4d760225944ed0f598d594b573174479651cfa8a78ca9ca4db3c files/digest-python-2.5.1-r2 524
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGQyVhugEuf3OQ0akRAhh2AJ0XbP34s44c0i0U7PFN5ukDBSoHUgCdGo/I
-l0RsvkwXjt0Psj8//Qpf23E=
-=y5sA
+iD8DBQFGRHOZugEuf3OQ0akRAn40AKCBA17J3ldUJQn9KQutL1muf9E6iwCgiVEv
+uz59xhQs/XjNbVoJbhlJ78g=
+=xFwG
 -----END PGP SIGNATURE-----