renamed patches to have short names and version numbers to indicate when they were introduced. patches tarballs are now generated from gentoo-svn. cleaned up older unstable versions of python leaving the latest version for each major release. fixed some installed file collisions between the two version.

(Portage version: 2.1-r2)
 (Signed Manifest commit)

9 files changed, 38 insertions, 1288 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 6eec636493d7..0c95570f2f34 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX depreorder-topsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d
 MD5 7e423c353b08a2c05693d13f21e067d0 files/depreorder-topsort.py 1958
 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 files/depreorder-topsort.py 1958
@@ -49,48 +52,30 @@ SHA256 d74f8dc8ed892285642acb3fa30b05187d136f8e8c56890982023193dc1fba27 files/py
 DIST Python-2.1.3.tgz 6194432 RMD160 d7216480cf884507d97bf7932767871977fc1ccc SHA1 7042a5c5fd60d334c0ac227885d68a4c305713b4 SHA256 1bcb5bb587948bc38f36db60e15c376009c56c66570e563a08a82bf7f227afb9
 DIST Python-2.2.3.tgz 6709556 RMD160 3590f813582d65194b467f4ab450e360e35eb40e SHA1 177d587e77e0eaa14131ab0d0d0b470777de4400 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188
 DIST Python-2.3.5.tar.bz2 7230000 RMD160 2b1fa90393f517fe02d546c037996754f65f8c89 SHA1 98bfa6257f73a3826b244047c183d933d26f4322 SHA256 1b81787c3dcae3752cadaa6be80c24e247c239ba93d91538af39b4b717e29bf4
-DIST Python-2.4.2.tar.bz2 7853169 RMD160 c511d2b76b5394742d285e71570a2bcd3c1fa871 SHA1 a1f1c466fb4a06f612faac75dbaa8bc81e609c2e SHA256 e163b95ee56819c0f3c58ef9278c30b9e49302c2f1a1917680ca894d33929f7e
 DIST Python-2.4.3.tar.bz2 8005915 RMD160 c86247554975e6c44f91d05e44e68e280d5244dc SHA1 d6b81e1aec0045b5acff99676f2abe303da1b384 SHA256 c9b3bbc52fa18c6dba7a8c3481fa7de98187c9978749241395305f252134ba2c
-DIST python-2.2-patches-1.tar.bz2 3127 RMD160 2874de5568776a0b195c6694e4af6769e08fc028 SHA1 e635a6744c94dd084051ab3c9591dacc027ab409 SHA256 1c638792add80a832d5b65c1473ccb056f3ebe2fe99d29a65e1a730ed8ab6218
-DIST python-2.3-patches-1.tar.bz2 8482 RMD160 a2fa53c2246864e0f7240132d7d9394dd630ff26 SHA1 2be225f8e21ffa88de8cadd186d4727d44bd5d7b SHA256 c3b766299b4a9363a63bc27983e7e82f19daa430a5f11d2ce29012a63229bf89
-DIST python-2.4-patches-1.tar.bz2 7820 RMD160 313c0f4f4dea59290c42a9b2c8de1db159f1ca1b SHA1 c965bc5a60c07b29743ab2763e5d0563e10ad9af SHA256 e22abe4394f1f0919aac429f155c00ec1b3fe94cdc302119059994d817cd30b5
-DIST python-2.4-patches-2.tar.bz2 9219 RMD160 bd4c3502b42f4f9a10f423c434f31ad370d9da4b SHA1 812f0796e348e1788ba56a851050932c0b69218d SHA256 e66ee41328999e89bea833ff3dc58b4691a6d16ada029e88a8ba9df35979352a
+DIST python-gentoo-patches-2.2.3.tar.bz2 3138 RMD160 0160617413b2ee4165eb0a7ceb68e95cb36e0f25 SHA1 19401f7f0e14ddd8c9f7f5f8e9e6acf0d1826027 SHA256 e85f6afba9d2cd23f39c46ed5e50d48b971615cd5dc5bc7af766b201a03b3893
+DIST python-gentoo-patches-2.3.5.tar.bz2 8489 RMD160 aa2860d06e0aa387c91419ed1a2bb33de14fd393 SHA1 32349bd5e0f6c3859414b4a03643dd89538792f9 SHA256 f144c5488a55599a0d0614f7c687e43106f8b6da51738296aadcec374d567237
+DIST python-gentoo-patches-2.4.3-r1.tar.bz2 8594 RMD160 0a93e8b315eefa832db92398b3f5e8da83fe3ea3 SHA1 7f20fffc6ec4273b898cda394c87929ddd939419 SHA256 295d8131b1f6c0622d92133f6e612821c2af6e1ebefe527aec8d42de49b0b1e9
 EBUILD python-2.1.3-r1.ebuild 2287 RMD160 8de40c8c4dcf46ab91458318eb347eb7a683062b SHA1 20928a32586d5aeac1b1c163a61b320c46c133ee SHA256 84381bce78263edac5a361f292ac6eca52c39752483a49beb40b033a0f9d322b
 MD5 0da2c091fdb69c2fc31c6ce46011e0f0 python-2.1.3-r1.ebuild 2287
 RMD160 8de40c8c4dcf46ab91458318eb347eb7a683062b python-2.1.3-r1.ebuild 2287
 SHA256 84381bce78263edac5a361f292ac6eca52c39752483a49beb40b033a0f9d322b python-2.1.3-r1.ebuild 2287
-EBUILD python-2.2.3-r6.ebuild 4550 RMD160 18f7b33bbd3de9461cf5a30ac044d9236ec4e905 SHA1 6fd0f00131252efcbc7d4da1984e8abe4c364f73 SHA256 661f92af5c22b8226f808e6b410dfc43554762b55eeb3ef0238e1dc5c57cf206
-MD5 dc3a9a60106e15c5821e91261354387a python-2.2.3-r6.ebuild 4550
-RMD160 18f7b33bbd3de9461cf5a30ac044d9236ec4e905 python-2.2.3-r6.ebuild 4550
-SHA256 661f92af5c22b8226f808e6b410dfc43554762b55eeb3ef0238e1dc5c57cf206 python-2.2.3-r6.ebuild 4550
-EBUILD python-2.3.5-r2.ebuild 8278 RMD160 942165348e9038bc470238a8d4abb8de3ad49d29 SHA1 5a6718f47cde38e4e8a857346879e3efcdd394ff SHA256 eaa74d312d3137827f6e2431e9dc707600a771c1e4d493930272c71f1fee7c88
-MD5 751b965b437937f213e02b7f0075682e python-2.3.5-r2.ebuild 8278
-RMD160 942165348e9038bc470238a8d4abb8de3ad49d29 python-2.3.5-r2.ebuild 8278
-SHA256 eaa74d312d3137827f6e2431e9dc707600a771c1e4d493930272c71f1fee7c88 python-2.3.5-r2.ebuild 8278
-EBUILD python-2.4.2-r1.ebuild 9959 RMD160 5a56e33190865507c44cf9c358d1110de36cec6d SHA1 425ac5acfa949f8d0ebf58f512f4f1a7a01417f8 SHA256 50d8867a5ca6401655d555b29ef4343ea1b72fad944f8e8f65338dc28cf5459d
-MD5 a774a66d07effcf88b6e28dbe8051305 python-2.4.2-r1.ebuild 9959
-RMD160 5a56e33190865507c44cf9c358d1110de36cec6d python-2.4.2-r1.ebuild 9959
-SHA256 50d8867a5ca6401655d555b29ef4343ea1b72fad944f8e8f65338dc28cf5459d python-2.4.2-r1.ebuild 9959
-EBUILD python-2.4.2-r2.ebuild 9962 RMD160 59380eed40068a00c025fbab4c81dd87a543bffd SHA1 67bcc0ef8d69e6470dcf080269fe93351533ce53 SHA256 0b099dd3f5c0b50c721a14e3aea6e1fa49c351f9ba758f9a85a4c48183aee20a
-MD5 ffb82dbcf64166de57b647e94dc717cb python-2.4.2-r2.ebuild 9962
-RMD160 59380eed40068a00c025fbab4c81dd87a543bffd python-2.4.2-r2.ebuild 9962
-SHA256 0b099dd3f5c0b50c721a14e3aea6e1fa49c351f9ba758f9a85a4c48183aee20a python-2.4.2-r2.ebuild 9962
-EBUILD python-2.4.2.ebuild 9504 RMD160 03fd859ea0e4eb3ee04e6294687d6a4e9de08401 SHA1 cd389e62b96e6c2fa7a4c914eaab4a3834e3832f SHA256 4edf86e3497db9fa5e442ce8c87121be3482ae11ae00537cda8fe4bc612c44cc
-MD5 4d56cc4e89c3a7c72ea247ed5eabda01 python-2.4.2.ebuild 9504
-RMD160 03fd859ea0e4eb3ee04e6294687d6a4e9de08401 python-2.4.2.ebuild 9504
-SHA256 4edf86e3497db9fa5e442ce8c87121be3482ae11ae00537cda8fe4bc612c44cc python-2.4.2.ebuild 9504
-EBUILD python-2.4.3-r1.ebuild 9728 RMD160 8f8ea39c12c6fe84d5f8c50b93e4308daeb90e36 SHA1 93834883845e712d4f5ca8d06597c329a31096b1 SHA256 83244978a51195de0ccb512d5ebf73d03575c187aba3f5f17690fd3e9aedc779
-MD5 4b70f8634b078b45391005ec50405934 python-2.4.3-r1.ebuild 9728
-RMD160 8f8ea39c12c6fe84d5f8c50b93e4308daeb90e36 python-2.4.3-r1.ebuild 9728
-SHA256 83244978a51195de0ccb512d5ebf73d03575c187aba3f5f17690fd3e9aedc779 python-2.4.3-r1.ebuild 9728
-EBUILD python-2.4.3.ebuild 9797 RMD160 2fb89c0a8fcfc9179ff6f59918a4ad95e7a81728 SHA1 88c56c4ba0a93a4af0a6365f55b973b3b3cc5c06 SHA256 4c2608469655465a692f7ed2e6f3a2f9eb3766ed98da70309243f2b9af026aa3
-MD5 8fd081c101dbc96849f26a2aaff7062f python-2.4.3.ebuild 9797
-RMD160 2fb89c0a8fcfc9179ff6f59918a4ad95e7a81728 python-2.4.3.ebuild 9797
-SHA256 4c2608469655465a692f7ed2e6f3a2f9eb3766ed98da70309243f2b9af026aa3 python-2.4.3.ebuild 9797
-MISC ChangeLog 34626 RMD160 3b23d9cc964acd8a40d4f4b45be74637d8d5aab4 SHA1 a42f4e449c6c0d8201b4dcf039b618494916acb4 SHA256 d043011a8cceb83c20c102a601e8fa2e7b25c50720bafb855e677450d128def1
-MD5 5036b7b54ccbaebf482b30247ac8d766 ChangeLog 34626
-RMD160 3b23d9cc964acd8a40d4f4b45be74637d8d5aab4 ChangeLog 34626
-SHA256 d043011a8cceb83c20c102a601e8fa2e7b25c50720bafb855e677450d128def1 ChangeLog 34626
+EBUILD python-2.2.3-r6.ebuild 4446 RMD160 9f824982ba59bf169649a35e71a33c4c15bf7072 SHA1 e6eca78e32237c1cc5c9d675ba86a713457e7ea3 SHA256 ce44a18afbf97d6750f1b8e2a87799e8d0079ffd77b1ea8247f6ee08b412b984
+MD5 7f4ca847271266b4287c409d19c24f71 python-2.2.3-r6.ebuild 4446
+RMD160 9f824982ba59bf169649a35e71a33c4c15bf7072 python-2.2.3-r6.ebuild 4446
+SHA256 ce44a18afbf97d6750f1b8e2a87799e8d0079ffd77b1ea8247f6ee08b412b984 python-2.2.3-r6.ebuild 4446
+EBUILD python-2.3.5-r2.ebuild 8147 RMD160 8ba2fa053bd3c8baf41da335d1edf473ea1e61b6 SHA1 e2cdaa1219dd99ee15ee059d0fca822d253b1ccd SHA256 65679eba03d04d6c5671c7f85ee1538c2bfa67596fbe4184d43c344e56473e85
+MD5 edebeae480d046189702d0fdd7f80108 python-2.3.5-r2.ebuild 8147
+RMD160 8ba2fa053bd3c8baf41da335d1edf473ea1e61b6 python-2.3.5-r2.ebuild 8147
+SHA256 65679eba03d04d6c5671c7f85ee1538c2bfa67596fbe4184d43c344e56473e85 python-2.3.5-r2.ebuild 8147
+EBUILD python-2.4.3-r1.ebuild 9605 RMD160 4f13c1093fae5226a58396ccc7ad61499661c806 SHA1 00b24ee80a66d091e2e7d4586a63d6aa3384b464 SHA256 2d8930b03179c4e04968d85397f14f67bb9338699a67a8f172c5e02cde43821f
+MD5 6921c681ff1bcf0d976d52cd003f8286 python-2.4.3-r1.ebuild 9605
+RMD160 4f13c1093fae5226a58396ccc7ad61499661c806 python-2.4.3-r1.ebuild 9605
+SHA256 2d8930b03179c4e04968d85397f14f67bb9338699a67a8f172c5e02cde43821f python-2.4.3-r1.ebuild 9605
+MISC ChangeLog 35163 RMD160 91c87baee359b3a3eed93e2d346503f7f2b635e1 SHA1 4a784966afd6d34ccacb0b525b0f785624c18106 SHA256 7c2d64d6323dd7f442c84f5732649e9fd454dc553c2117ab07bcf9431ef13f37
+MD5 f82e330a6a16e77bcb4be5df97e10472 ChangeLog 35163
+RMD160 91c87baee359b3a3eed93e2d346503f7f2b635e1 ChangeLog 35163
+SHA256 7c2d64d6323dd7f442c84f5732649e9fd454dc553c2117ab07bcf9431ef13f37 ChangeLog 35163
 MISC metadata.xml 221 RMD160 dd50f32b16d6c15330ae1ee711d8a6cf8f6e3bed SHA1 85903c4affc3a23dd37e4910eb9b198cd02b242e SHA256 c14b93d19008cbeeb3312ec60b97513eef18ccfe82b8e2303cb44977ca13e3bd
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 RMD160 dd50f32b16d6c15330ae1ee711d8a6cf8f6e3bed metadata.xml 221
@@ -98,24 +83,19 @@ SHA256 c14b93d19008cbeeb3312ec60b97513eef18ccfe82b8e2303cb44977ca13e3bd metadata
 MD5 e8f5d051347769b7c295ba16f9e21bc3 files/digest-python-2.1.3-r1 232
 RMD160 2b6919fc1178b46b033af3efd7d3ac599e6a4253 files/digest-python-2.1.3-r1 232
 SHA256 15f71d85b7e47553ba5d5d3283eebda6945cd3f198ed0c6e691f9e7d8f4837f9 files/digest-python-2.1.3-r1 232
-MD5 3827d36e14c76ea54c2d4a123a15ea9b files/digest-python-2.2.3-r6 491
-RMD160 9ee70289595ad803dfbc9b3b90a32b2cb30ebc82 files/digest-python-2.2.3-r6 491
-SHA256 bbe3bb0e3c5d2be49d880eda8baa041e12b2bcdad2e03b41aad7584dbc092e26 files/digest-python-2.2.3-r6 491
-MD5 7d0ed808841926682f3f351132a67a04 files/digest-python-2.3.5-r2 503
-RMD160 4ad16ba3348e8137d38c1009f793dc2c1cbcd500 files/digest-python-2.3.5-r2 503
-SHA256 048c51c0f6dcfe14a6e458e3d4759da65c35420fece3a532f824e197111ef0df files/digest-python-2.3.5-r2 503
-MD5 290e8976104d28b7cc4665a80e14570d files/digest-python-2.4.2 503
-RMD160 bcd448c9448252abb052e0740cfbd5fe5e5761e6 files/digest-python-2.4.2 503
-SHA256 658b4179d7a458cd6b66da19ded28480b1b29ac756c54fde2dd2548873a73c2d files/digest-python-2.4.2 503
-MD5 f55531f44d89bb3f76edaf14a712f05e files/digest-python-2.4.2-r1 503
-RMD160 6f80e9f5b67531c690b91b4c2141b8a3b1c4d23a files/digest-python-2.4.2-r1 503
-SHA256 b03fa519be2724978f4a43a2807c46c846321d8459f3400f5efc88af30350416 files/digest-python-2.4.2-r1 503
-MD5 f55531f44d89bb3f76edaf14a712f05e files/digest-python-2.4.2-r2 503
-RMD160 6f80e9f5b67531c690b91b4c2141b8a3b1c4d23a files/digest-python-2.4.2-r2 503
-SHA256 b03fa519be2724978f4a43a2807c46c846321d8459f3400f5efc88af30350416 files/digest-python-2.4.2-r2 503
-MD5 074466092860a2451d114cf7fad357f2 files/digest-python-2.4.3 503
-RMD160 71a7eceb40337728f36e0d2970e1fb3956b7496a files/digest-python-2.4.3 503
-SHA256 3f77c805317ac37a5bbe788bc0ad4b723c3584c0d676d6ee4e2040291cb4177d files/digest-python-2.4.3 503
-MD5 074466092860a2451d114cf7fad357f2 files/digest-python-2.4.3-r1 503
-RMD160 71a7eceb40337728f36e0d2970e1fb3956b7496a files/digest-python-2.4.3-r1 503
-SHA256 3f77c805317ac37a5bbe788bc0ad4b723c3584c0d676d6ee4e2040291cb4177d files/digest-python-2.4.3-r1 503
+MD5 d3c0e382565a66a4dce0c51e98270a94 files/digest-python-2.2.3-r6 512
+RMD160 ba72a4adf7b394624c3b85fc740a31a6c75a8e53 files/digest-python-2.2.3-r6 512
+SHA256 5c12b881f71c5bb813d7c9bd659b76974926d251f8825ee133e8e535c2893b3c files/digest-python-2.2.3-r6 512
+MD5 6c7e0d09e93664bfdcb6250ad7b21aec files/digest-python-2.3.5-r2 524
+RMD160 35678793ab5fc998abd792a88fb53b5a0a587a3a files/digest-python-2.3.5-r2 524
+SHA256 ccd2adf40bb4b0ccc3e7822fbecf6e424c9a7e5f207654ff807ad94fe2e9d888 files/digest-python-2.3.5-r2 524
+MD5 663468af5f8542bf2da855f7b1440b57 files/digest-python-2.4.3-r1 533
+RMD160 83a784ec07529078f043e42567d6abd582c90ce1 files/digest-python-2.4.3-r1 533
+SHA256 accb145bcb3a651a5d68653dc2becc523343c152d45d66622a3ff6f62c1b26a8 files/digest-python-2.4.3-r1 533
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFE64S2uB6ZT1m7QRERAk/4AJ9RJ56xVr4QFyX3Vus13xP5VxbB+QCgzgr1
+2DEx5YuHr4mB2nZXvNdhIfo=
+=Igs7
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/digest-python-2.4.2 b/dev-lang/python/files/digest-python-2.4.2
deleted file mode 100644
index 07e5ccde542c..000000000000
--- a/dev-lang/python/files/digest-python-2.4.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 98db1465629693fc434d4dc52db93838 Python-2.4.2.tar.bz2 7853169
-RMD160 c511d2b76b5394742d285e71570a2bcd3c1fa871 Python-2.4.2.tar.bz2 7853169
-SHA256 e163b95ee56819c0f3c58ef9278c30b9e49302c2f1a1917680ca894d33929f7e Python-2.4.2.tar.bz2 7853169
-MD5 2fa54dd51b6a8f1c46e5baf741e90f7e python-2.4-patches-1.tar.bz2 7820
-RMD160 313c0f4f4dea59290c42a9b2c8de1db159f1ca1b python-2.4-patches-1.tar.bz2 7820
-SHA256 e22abe4394f1f0919aac429f155c00ec1b3fe94cdc302119059994d817cd30b5 python-2.4-patches-1.tar.bz2 7820
diff --git a/dev-lang/python/files/digest-python-2.4.2-r1 b/dev-lang/python/files/digest-python-2.4.2-r1
deleted file mode 100644
index 42c48d4debcd..000000000000
--- a/dev-lang/python/files/digest-python-2.4.2-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 98db1465629693fc434d4dc52db93838 Python-2.4.2.tar.bz2 7853169
-RMD160 c511d2b76b5394742d285e71570a2bcd3c1fa871 Python-2.4.2.tar.bz2 7853169
-SHA256 e163b95ee56819c0f3c58ef9278c30b9e49302c2f1a1917680ca894d33929f7e Python-2.4.2.tar.bz2 7853169
-MD5 c98f93a5700138836154d7c8009f1fbf python-2.4-patches-2.tar.bz2 9219
-RMD160 bd4c3502b42f4f9a10f423c434f31ad370d9da4b python-2.4-patches-2.tar.bz2 9219
-SHA256 e66ee41328999e89bea833ff3dc58b4691a6d16ada029e88a8ba9df35979352a python-2.4-patches-2.tar.bz2 9219
diff --git a/dev-lang/python/files/digest-python-2.4.2-r2 b/dev-lang/python/files/digest-python-2.4.2-r2
deleted file mode 100644
index 42c48d4debcd..000000000000
--- a/dev-lang/python/files/digest-python-2.4.2-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 98db1465629693fc434d4dc52db93838 Python-2.4.2.tar.bz2 7853169
-RMD160 c511d2b76b5394742d285e71570a2bcd3c1fa871 Python-2.4.2.tar.bz2 7853169
-SHA256 e163b95ee56819c0f3c58ef9278c30b9e49302c2f1a1917680ca894d33929f7e Python-2.4.2.tar.bz2 7853169
-MD5 c98f93a5700138836154d7c8009f1fbf python-2.4-patches-2.tar.bz2 9219
-RMD160 bd4c3502b42f4f9a10f423c434f31ad370d9da4b python-2.4-patches-2.tar.bz2 9219
-SHA256 e66ee41328999e89bea833ff3dc58b4691a6d16ada029e88a8ba9df35979352a python-2.4-patches-2.tar.bz2 9219
diff --git a/dev-lang/python/files/digest-python-2.4.3 b/dev-lang/python/files/digest-python-2.4.3
deleted file mode 100644
index 3a51751627fb..000000000000
--- a/dev-lang/python/files/digest-python-2.4.3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 141c683447d5e76be1d2bd4829574f02 Python-2.4.3.tar.bz2 8005915
-RMD160 c86247554975e6c44f91d05e44e68e280d5244dc Python-2.4.3.tar.bz2 8005915
-SHA256 c9b3bbc52fa18c6dba7a8c3481fa7de98187c9978749241395305f252134ba2c Python-2.4.3.tar.bz2 8005915
-MD5 c98f93a5700138836154d7c8009f1fbf python-2.4-patches-2.tar.bz2 9219
-RMD160 bd4c3502b42f4f9a10f423c434f31ad370d9da4b python-2.4-patches-2.tar.bz2 9219
-SHA256 e66ee41328999e89bea833ff3dc58b4691a6d16ada029e88a8ba9df35979352a python-2.4-patches-2.tar.bz2 9219
diff --git a/dev-lang/python/python-2.4.2-r1.ebuild b/dev-lang/python/python-2.4.2-r1.ebuild
deleted file mode 100644
index d8f8990bc7ef..000000000000
--- a/dev-lang/python/python-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.2-r1.ebuild,v 1.8 2006/07/11 15:55:17 liquidx Exp $
-
-# NOTE about python-portage interactions :
-# - Do not add a pkg_setup() check for a certain version of portage
-#   in dev-lang/python. It _WILL_ stop people installing from
-#   Gentoo 1.4 images.
-
-inherit eutils flag-o-matic python multilib versionator toolchain-funcs
-
-# we need this so that we don't depends on python.eclass
-PYVER_MAJOR=$(get_major_version)
-PYVER_MINOR=$(get_version_component_range 2)
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-PATCHTAR="${PN}-${PYVER}-patches-2"
-
-MY_P="Python-${PV}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
-	mirror://gentoo/${PATCHTAR}.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 doc nocxx"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	!dev-python/cjkcodecs
-	!build? (
-		tk? ( >=dev-lang/tk-8.0 )
-		ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
-		berkdb? ( >=sys-libs/db-3.1 )
-		gdbm? ( sys-libs/gdbm )
-		ssl? ( dev-libs/openssl )
-		doc? ( =dev-python/python-docs-${PV}* )
-		dev-libs/expat
-	)"
-
-# NOTE: The dev-python/python-fchksum RDEPEND is needed so that this python 
-#       provides the functionality expected from previous pythons.
-
-# NOTE: python-fchksum is only a RDEPEND and not a DEPEND since we don't need
-#       it to compile python. We just need to ensure that when we install
-#       python, we definitely have fchksum support. - liquidx
-
-# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
-
-PDEPEND="${DEPEND} 	dev-python/python-fchksum"
-
-PROVIDE="virtual/python"
-
-# confcache breaks a dlopen check, causing python to not support
-# loading .so files - marienz
-RESTRICT="confcache"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# unnecessary termcap dep in readline (#79013)
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.4.2-readline.patch
-	# db4.2 support
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.4.1-db4.patch
-
-	# Upstream fix when building w/out thread support
-	epatch ${WORKDIR}/${PATCHTAR}/${P}-no-threads.patch
-
-	# adds support for PYTHON_DONTCOMPILE shell environment to
-	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-gentoo_py_dontcompile.patch
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-disable_modules_and_ssl.patch
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-mimetypes_apache.patch
-
-	# prepends /usr/lib/portage/pym to sys.path
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-add_portage_search_path.patch
-
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.4.1-libdir.patch
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die
-
-	# add support for struct stat st_flags attribute (bug 94637)
-	epatch ${WORKDIR}/${PATCHTAR}/python-2.4.1-st_flags.patch
-
-	# fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
-	# PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!!
-	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure
-
-	# fix mmap and fd leak problems (bugs 113439 + 118575)
-	epatch ${WORKDIR}/${PATCHTAR}/${P}-mmap+fd.patch
-
-	if tc-is-cross-compiler ; then
-		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-bindir-libdir.patch
-		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-crosscompile.patch
-	fi
-
-	# fix gentoo/obsd problems (bug 117261)
-	epatch "${FILESDIR}/python-2.4.2-gentoo_obsd.patch"
-}
-
-src_configure() {
-	# disable extraneous modules with extra dependencies
-	if use build; then
-		export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter"
-		export PYTHON_DISABLE_SSL=1
-	else
-		use gdbm \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm"
-		use berkdb \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm bsddb"
-		use readline \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline"
-		use tk \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter"
-		use ncurses \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _curses _curses_panel"
-		use ssl \
-			|| export PYTHON_DISABLE_SSL=1
-		export PYTHON_DISABLE_MODULES
-		echo $PYTHON_DISABLE_MODULES
-	fi
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	# Seems to no longer be necessary
-	#[ "${ARCH}" = "amd64" ] && append-flags -fPIC
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-
-	# http://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flag -O3; then
-	   is-flag -fstack-protector-all && replace-flags -O3 -O2
-	   use hardened && replace-flags -O3 -O2
-	fi
-
-	export OPT="${CFLAGS}"
-
-	local myconf
-	#if we are creating a new build image, we remove the dependency on g++
-	if use build && ! use bootstrap || use nocxx ; then
-		myconf="--with-cxx=no"
-	fi
-
-	# super-secret switch. don't use this unless you know what you're
-	# doing. enabling UCS2 support will break your existing python
-	# modules
-	use ucs2 \
-		&& myconf="${myconf} --enable-unicode=ucs2" \
-		|| myconf="${myconf} --enable-unicode=ucs4"
-
-	src_configure
-
-	if tc-is-cross-compiler ; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" \
-		./configure --with-cxx=no || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e '/^HOSTPYTHON/s:=.*:=./hostpython:' \
-			-e '/^HOSTPGEN/s:=.*:=./Parser/hostpgen:' \
-			Makefile.pre.in || die
-	fi
-
-	# export CXX so it ends up in /usr/lib/python2.x/config/Makefile
-	tc-export CXX
-	# set LINKCC to prevent python from being linked to libstdc++.so
-	export LINKCC="\$(PURIFY) \$(CC)"
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		`use_enable ipv6` \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man \
-		--with-threads \
-		--with-libc='' \
-		${myconf} || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	src_configure
-	make DESTDIR="${D}" altinstall  || die
-
-	# install our own custom python-config
-	exeinto /usr/bin
-	newexe ${FILESDIR}/python-config-${PYVER} python-config
-
-	# Use correct libdir in python-config
-	dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config
-
-	# The stuff below this line extends from 2.1, and should be deprecated
-	# in 2.3, or possibly can wait till 2.4
-
-	# seems like the build do not install Makefile.pre.in anymore
-	# it probably shouldn't - use DistUtils, people!
-	insinto /usr/$(get_libdir)/python${PYVER}/config
-	doins ${S}/Makefile.pre.in
-
-	# While we're working on the config stuff... Let's fix the OPT var
-	# so that it doesn't have any opts listed in it. Prevents the problem
-	# with compiling things with conflicting opts later.
-	dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' \
-			/usr/$(get_libdir)/python${PYVER}/config/Makefile
-
-	# install python-updater in /usr/sbin
-	#dosbin ${FILESDIR}/python-updater
-	newsbin ${FILESDIR}/python-updater-r1 python-updater
-
-	if use build ; then
-		rm -rf ${D}/usr/lib/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use elibc_uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test}
-		use berkdb || rm -rf ${D}/usr/lib/python${PYVER}/bsddb
-		use tk || rm -rf ${D}/usr/lib/python${PYVER}/lib-tk
-	fi
-
-	prep_ml_includes usr/include/python${PYVER}
-}
-
-pkg_postrm() {
-	python_makesym
-	python_mod_cleanup /usr/lib/python${PYVER}
-	[[ "$(get_libdir)" == "lib" ]] || python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
-}
-
-pkg_postinst() {
-	local myroot
-	myroot=$(echo $ROOT | sed 's:/$::')
-
-	python_makesym
-	python_mod_optimize
-	python_mod_optimize -x site-packages -x test ${myroot}/usr/lib/python${PYVER}
-	[[ "$(get_libdir)" == "lib" ]] || python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER}
-
-
-	# workaround possible python-upgrade-breaks-portage situation
-	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
-		if [ -f ${myroot}/usr/lib/python2.3/site-packages/portage.py ]; then
-			einfo "Working around possible python-portage upgrade breakage"
-			mkdir -p ${myroot}/usr/lib/portage/pym
-			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
-		fi
-	fi
-
-	# try to upgrade to new python automatically - something to think about
-	#if [ "${ROOT}" = "/" ]; then
-	#	/usr/sbin/python-updater
-	#fi
-
-	echo
-	ewarn
-	ewarn "If you have just upgraded from an older version of python you will need to run:"
-	ewarn
-	ewarn "/usr/sbin/python-updater"
-	ewarn
-	ewarn "This will automatically rebuild all the python dependent modules"
-	ewarn "to run with python-${PYVER}."
-	ewarn
-	ewarn "Your original Python is still installed and can be accessed via"
-	ewarn "/usr/bin/python2.x."
-	ewarn
-	ebeep 5
-}
-
-src_test() {
-	# PYTHON_DONTCOMPILE=1 breaks test_import
-	unset PYTHON_DONTCOMPILE
-
-	#skip all tests that fail during emerge but pass without emerge:
-	#(See bug# 67970)
-	local skip_tests="distutils global mimetools minidom mmap strptime subprocess syntax tcl time urllib urllib2"
-
-	for test in ${skip_tests} ; do
-		mv ${S}/Lib/test/test_${test}.py ${T}
-	done
-
-	make test || die "make test failed"
-
-	for test in ${skip_tests} ; do
-		mv ${T}/test_${test}.py ${S}/Lib/test/test_${test}.py
-	done
-
-	einfo "Portage skipped the following tests which aren't able to run from emerge:"
-	for test in ${skip_tests} ; do
-		einfo "test_${test}.py"
-	done
-
-	einfo "If you'd like to run them, you may:"
-	einfo "cd /usr/lib/python${PYVER}/test"
-	einfo "and run the tests separately."
-}
diff --git a/dev-lang/python/python-2.4.2-r2.ebuild b/dev-lang/python/python-2.4.2-r2.ebuild
deleted file mode 100644
index 20fa3fcbab5c..000000000000
--- a/dev-lang/python/python-2.4.2-r2.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.2-r2.ebuild,v 1.3 2006/07/11 15:55:17 liquidx Exp $
-
-# NOTE about python-portage interactions :
-# - Do not add a pkg_setup() check for a certain version of portage
-#   in dev-lang/python. It _WILL_ stop people installing from
-#   Gentoo 1.4 images.
-
-inherit eutils flag-o-matic python multilib versionator toolchain-funcs
-
-# we need this so that we don't depends on python.eclass
-PYVER_MAJOR=$(get_major_version)
-PYVER_MINOR=$(get_version_component_range 2)
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-PATCHTAR="${PN}-${PYVER}-patches-2"
-
-MY_P="Python-${PV}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
-	mirror://gentoo/${PATCHTAR}.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 doc nocxx"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	!dev-python/cjkcodecs
-	!build? (
-		tk? ( >=dev-lang/tk-8.0 )
-		ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
-		berkdb? ( >=sys-libs/db-3.1 )
-		gdbm? ( sys-libs/gdbm )
-		ssl? ( dev-libs/openssl )
-		doc? ( =dev-python/python-docs-${PV}* )
-		dev-libs/expat
-	)"
-
-# NOTE: The dev-python/python-fchksum RDEPEND is needed so that this python 
-#       provides the functionality expected from previous pythons.
-
-# NOTE: python-fchksum is only a RDEPEND and not a DEPEND since we don't need
-#       it to compile python. We just need to ensure that when we install
-#       python, we definitely have fchksum support. - liquidx
-
-# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
-
-PDEPEND="${DEPEND} 	dev-python/python-fchksum"
-
-PROVIDE="virtual/python"
-
-# confcache breaks a dlopen check, causing python to not support
-# loading .so files - marienz
-RESTRICT="confcache"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# unnecessary termcap dep in readline (#79013)
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.4.2-readline.patch
-	# db4.2 support
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.4.1-db4.patch
-
-	# Upstream fix when building w/out thread support
-	epatch ${WORKDIR}/${PATCHTAR}/${P}-no-threads.patch
-
-	# adds support for PYTHON_DONTCOMPILE shell environment to
-	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-gentoo_py_dontcompile.patch
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-disable_modules_and_ssl.patch
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-mimetypes_apache.patch
-
-	# prepends /usr/lib/portage/pym to sys.path
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-add_portage_search_path.patch
-
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.4.1-libdir.patch
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die
-
-	# add support for struct stat st_flags attribute (bug 94637)
-	epatch ${WORKDIR}/${PATCHTAR}/python-2.4.1-st_flags.patch
-
-	# fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
-	# PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!!
-	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure
-
-	# fix mmap and fd leak problems (bugs 113439 + 118575)
-	epatch ${WORKDIR}/${PATCHTAR}/${P}-mmap+fd.patch
-
-	if tc-is-cross-compiler ; then
-		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-bindir-libdir.patch
-		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-crosscompile.patch
-	fi
-
-	# fix gentoo/obsd problems (bug 117261)
-	epatch "${FILESDIR}/python-2.4.2-gentoo_obsd-r1.patch"
-}
-
-src_configure() {
-	# disable extraneous modules with extra dependencies
-	if use build; then
-		export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter"
-		export PYTHON_DISABLE_SSL=1
-	else
-		use gdbm \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm"
-		use berkdb \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm bsddb"
-		use readline \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline"
-		use tk \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter"
-		use ncurses \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _curses _curses_panel"
-		use ssl \
-			|| export PYTHON_DISABLE_SSL=1
-		export PYTHON_DISABLE_MODULES
-		echo $PYTHON_DISABLE_MODULES
-	fi
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	# Seems to no longer be necessary
-	#[ "${ARCH}" = "amd64" ] && append-flags -fPIC
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-
-	# http://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flag -O3; then
-	   is-flag -fstack-protector-all && replace-flags -O3 -O2
-	   use hardened && replace-flags -O3 -O2
-	fi
-
-	export OPT="${CFLAGS}"
-
-	local myconf
-	#if we are creating a new build image, we remove the dependency on g++
-	if use build && ! use bootstrap || use nocxx ; then
-		myconf="--with-cxx=no"
-	fi
-
-	# super-secret switch. don't use this unless you know what you're
-	# doing. enabling UCS2 support will break your existing python
-	# modules
-	use ucs2 \
-		&& myconf="${myconf} --enable-unicode=ucs2" \
-		|| myconf="${myconf} --enable-unicode=ucs4"
-
-	src_configure
-
-	if tc-is-cross-compiler ; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" \
-		./configure --with-cxx=no || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e '/^HOSTPYTHON/s:=.*:=./hostpython:' \
-			-e '/^HOSTPGEN/s:=.*:=./Parser/hostpgen:' \
-			Makefile.pre.in || die
-	fi
-
-	# export CXX so it ends up in /usr/lib/python2.x/config/Makefile
-	tc-export CXX
-	# set LINKCC to prevent python from being linked to libstdc++.so
-	export LINKCC="\$(PURIFY) \$(CC)"
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		`use_enable ipv6` \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man \
-		--with-threads \
-		--with-libc='' \
-		${myconf} || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	src_configure
-	make DESTDIR="${D}" altinstall  || die
-
-	# install our own custom python-config
-	exeinto /usr/bin
-	newexe ${FILESDIR}/python-config-${PYVER} python-config
-
-	# Use correct libdir in python-config
-	dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config
-
-	# The stuff below this line extends from 2.1, and should be deprecated
-	# in 2.3, or possibly can wait till 2.4
-
-	# seems like the build do not install Makefile.pre.in anymore
-	# it probably shouldn't - use DistUtils, people!
-	insinto /usr/$(get_libdir)/python${PYVER}/config
-	doins ${S}/Makefile.pre.in
-
-	# While we're working on the config stuff... Let's fix the OPT var
-	# so that it doesn't have any opts listed in it. Prevents the problem
-	# with compiling things with conflicting opts later.
-	dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' \
-			/usr/$(get_libdir)/python${PYVER}/config/Makefile
-
-	# install python-updater in /usr/sbin
-	#dosbin ${FILESDIR}/python-updater
-	newsbin ${FILESDIR}/python-updater-r1 python-updater
-
-	if use build ; then
-		rm -rf ${D}/usr/lib/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use elibc_uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test}
-		use berkdb || rm -rf ${D}/usr/lib/python${PYVER}/bsddb
-		use tk || rm -rf ${D}/usr/lib/python${PYVER}/lib-tk
-	fi
-
-	prep_ml_includes usr/include/python${PYVER}
-}
-
-pkg_postrm() {
-	python_makesym
-	python_mod_cleanup /usr/lib/python${PYVER}
-	[[ "$(get_libdir)" == "lib" ]] || python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
-}
-
-pkg_postinst() {
-	local myroot
-	myroot=$(echo $ROOT | sed 's:/$::')
-
-	python_makesym
-	python_mod_optimize
-	python_mod_optimize -x site-packages -x test ${myroot}/usr/lib/python${PYVER}
-	[[ "$(get_libdir)" == "lib" ]] || python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER}
-
-
-	# workaround possible python-upgrade-breaks-portage situation
-	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
-		if [ -f ${myroot}/usr/lib/python2.3/site-packages/portage.py ]; then
-			einfo "Working around possible python-portage upgrade breakage"
-			mkdir -p ${myroot}/usr/lib/portage/pym
-			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
-		fi
-	fi
-
-	# try to upgrade to new python automatically - something to think about
-	#if [ "${ROOT}" = "/" ]; then
-	#	/usr/sbin/python-updater
-	#fi
-
-	echo
-	ewarn
-	ewarn "If you have just upgraded from an older version of python you will need to run:"
-	ewarn
-	ewarn "/usr/sbin/python-updater"
-	ewarn
-	ewarn "This will automatically rebuild all the python dependent modules"
-	ewarn "to run with python-${PYVER}."
-	ewarn
-	ewarn "Your original Python is still installed and can be accessed via"
-	ewarn "/usr/bin/python2.x."
-	ewarn
-	ebeep 5
-}
-
-src_test() {
-	# PYTHON_DONTCOMPILE=1 breaks test_import
-	unset PYTHON_DONTCOMPILE
-
-	#skip all tests that fail during emerge but pass without emerge:
-	#(See bug# 67970)
-	local skip_tests="distutils global mimetools minidom mmap strptime subprocess syntax tcl time urllib urllib2"
-
-	for test in ${skip_tests} ; do
-		mv ${S}/Lib/test/test_${test}.py ${T}
-	done
-
-	make test || die "make test failed"
-
-	for test in ${skip_tests} ; do
-		mv ${T}/test_${test}.py ${S}/Lib/test/test_${test}.py
-	done
-
-	einfo "Portage skipped the following tests which aren't able to run from emerge:"
-	for test in ${skip_tests} ; do
-		einfo "test_${test}.py"
-	done
-
-	einfo "If you'd like to run them, you may:"
-	einfo "cd /usr/lib/python${PYVER}/test"
-	einfo "and run the tests separately."
-}
diff --git a/dev-lang/python/python-2.4.2.ebuild b/dev-lang/python/python-2.4.2.ebuild
deleted file mode 100644
index 49d5b6fca0ba..000000000000
--- a/dev-lang/python/python-2.4.2.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.2.ebuild,v 1.20 2006/07/11 15:55:17 liquidx Exp $
-
-# NOTE about python-portage interactions :
-# - Do not add a pkg_setup() check for a certain version of portage
-#   in dev-lang/python. It _WILL_ stop people installing from
-#   Gentoo 1.4 images.
-
-inherit eutils flag-o-matic python multilib versionator toolchain-funcs
-
-# we need this so that we don't depends on python.eclass
-PYVER_MAJOR=$(get_major_version)
-PYVER_MINOR=$(get_version_component_range 2)
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-PATCHTAR="${PN}-${PYVER}-patches-1"
-
-MY_P="Python-${PV}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
-	mirror://gentoo/${PATCHTAR}.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.4"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 doc nocxx"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	!dev-python/cjkcodecs
-	!build? (
-		tk? ( >=dev-lang/tk-8.0 )
-		ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
-		berkdb? ( >=sys-libs/db-3.1 )
-		gdbm? ( sys-libs/gdbm )
-		ssl? ( dev-libs/openssl )
-		doc? ( =dev-python/python-docs-${PV}* )
-		dev-libs/expat
-	)"
-
-# NOTE: The dev-python/python-fchksum RDEPEND is needed so that this python 
-#       provides the functionality expected from previous pythons.
-
-# NOTE: python-fchksum is only a RDEPEND and not a DEPEND since we don't need
-#       it to compile python. We just need to ensure that when we install
-#       python, we definitely have fchksum support. - liquidx
-
-# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
-
-PDEPEND="${DEPEND} 	dev-python/python-fchksum"
-
-PROVIDE="virtual/python"
-
-# confcache breaks a dlopen check, causing python to not support
-# loading .so files - marienz
-RESTRICT="confcache"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# unnecessary termcap dep in readline (#79013)
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.4.2-readline.patch
-	# db4.2 support
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.4.1-db4.patch
-
-	# Upstream fix when building w/out thread support
-	epatch ${WORKDIR}/${PATCHTAR}/${P}-no-threads.patch
-
-	# adds support for PYTHON_DONTCOMPILE shell environment to
-	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-gentoo_py_dontcompile.patch
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-disable_modules_and_ssl.patch
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-mimetypes_apache.patch
-
-	# prepends /usr/lib/portage/pym to sys.path
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-add_portage_search_path.patch
-
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.4.1-libdir.patch
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die
-
-	# add support for struct stat st_flags attribute (bug 94637)
-	epatch ${WORKDIR}/${PATCHTAR}/python-2.4.1-st_flags.patch
-
-	# fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
-	# PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!!
-	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure
-
-
-	if tc-is-cross-compiler ; then
-		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-bindir-libdir.patch
-		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-crosscompile.patch
-	fi
-}
-
-src_configure() {
-	# disable extraneous modules with extra dependencies
-	if use build; then
-		export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter"
-		export PYTHON_DISABLE_SSL=1
-	else
-		use gdbm \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm"
-		use berkdb \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm bsddb"
-		use readline \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline"
-		use tk \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter"
-		use ncurses \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _curses _curses_panel"
-		use ssl \
-			|| export PYTHON_DISABLE_SSL=1
-		export PYTHON_DISABLE_MODULES
-		echo $PYTHON_DISABLE_MODULES
-	fi
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	# Seems to no longer be necessary
-	#[ "${ARCH}" = "amd64" ] && append-flags -fPIC
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-
-	# http://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flag -O3; then
-	   is-flag -fstack-protector-all && replace-flags -O3 -O2
-	   use hardened && replace-flags -O3 -O2
-	fi
-
-	export OPT="${CFLAGS}"
-
-	local myconf
-	#if we are creating a new build image, we remove the dependency on g++
-	if use build && ! use bootstrap || use nocxx ; then
-		myconf="--with-cxx=no"
-	fi
-
-	# super-secret switch. don't use this unless you know what you're
-	# doing. enabling UCS2 support will break your existing python
-	# modules
-	use ucs2 \
-		&& myconf="${myconf} --enable-unicode=ucs2" \
-		|| myconf="${myconf} --enable-unicode=ucs4"
-
-	src_configure
-
-	if tc-is-cross-compiler ; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" \
-		./configure --with-cxx=no || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e '/^HOSTPYTHON/s:=.*:=./hostpython:' \
-			-e '/^HOSTPGEN/s:=.*:=./Parser/hostpgen:' \
-			Makefile.pre.in || die
-	fi
-
-	tc-export CXX
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		`use_enable ipv6` \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man \
-		--with-threads \
-		--with-libc='' \
-		${myconf} || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	src_configure
-	make DESTDIR="${D}" altinstall  || die
-
-	# install our own custom python-config
-	exeinto /usr/bin
-	newexe ${FILESDIR}/python-config-${PYVER} python-config
-
-	# Use correct libdir in python-config
-	dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config
-
-	# The stuff below this line extends from 2.1, and should be deprecated
-	# in 2.3, or possibly can wait till 2.4
-
-	# seems like the build do not install Makefile.pre.in anymore
-	# it probably shouldn't - use DistUtils, people!
-	insinto /usr/$(get_libdir)/python${PYVER}/config
-	doins ${S}/Makefile.pre.in
-
-	# While we're working on the config stuff... Let's fix the OPT var
-	# so that it doesn't have any opts listed in it. Prevents the problem
-	# with compiling things with conflicting opts later.
-	dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' \
-			/usr/$(get_libdir)/python${PYVER}/config/Makefile
-
-	# install python-updater in /usr/sbin
-	dosbin ${FILESDIR}/python-updater
-
-	if use build ; then
-		rm -rf ${D}/usr/lib/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use elibc_uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test}
-		use berkdb || rm -rf ${D}/usr/lib/python${PYVER}/bsddb
-		use tk || rm -rf ${D}/usr/lib/python${PYVER}/lib-tk
-	fi
-
-	prep_ml_includes usr/include/python${PYVER}
-}
-
-pkg_postrm() {
-	python_makesym
-	python_mod_cleanup /usr/lib/python${PYVER}
-	[[ "$(get_libdir)" == "lib" ]] || python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
-}
-
-pkg_postinst() {
-	local myroot
-	myroot=$(echo $ROOT | sed 's:/$::')
-
-	python_makesym
-	python_mod_optimize
-	python_mod_optimize -x site-packages -x test ${myroot}/usr/lib/python${PYVER}
-	[[ "$(get_libdir)" == "lib" ]] || python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER}
-
-
-	# workaround possible python-upgrade-breaks-portage situation
-	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
-		if [ -f ${myroot}/usr/lib/python2.3/site-packages/portage.py ]; then
-			einfo "Working around possible python-portage upgrade breakage"
-			mkdir -p ${myroot}/usr/lib/portage/pym
-			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
-		fi
-	fi
-
-	# try to upgrade to new python automatically - something to think about
-	#if [ "${ROOT}" = "/" ]; then
-	#	/usr/sbin/python-updater
-	#fi
-
-	echo
-	ewarn
-	ewarn "If you have just upgraded from an older version of python you will need to run:"
-	ewarn
-	ewarn "/usr/sbin/python-updater"
-	ewarn
-	ewarn "This will automatically rebuild all the python dependent modules"
-	ewarn "to run with python-${PYVER}."
-	ewarn
-	ewarn "Your original Python is still installed and can be accessed via"
-	ewarn "/usr/bin/python2.x."
-	ewarn
-	ebeep 5
-}
-
-src_test() {
-	# PYTHON_DONTCOMPILE=1 breaks test_import
-	unset PYTHON_DONTCOMPILE
-
-	#skip all tests that fail during emerge but pass without emerge:
-	#(See bug# 67970)
-	local skip_tests="distutils global mimetools minidom mmap strptime subprocess tcl time urllib urllib2"
-
-	for test in ${skip_tests} ; do
-		mv ${S}/Lib/test/test_${test}.py ${T}
-	done
-
-	make test || die "make test failed"
-
-	for test in ${skip_tests} ; do
-		mv ${T}/test_${test}.py ${S}/Lib/test/test_${test}.py
-	done
-
-	einfo "Portage skipped the following tests which aren't able to run from emerge:"
-	for test in ${skip_tests} ; do
-		einfo "test_${test}.py"
-	done
-
-	einfo "If you'd like to run them, you may:"
-	einfo "cd /usr/lib/python${PYVER}/test"
-	einfo "and run the tests separately."
-}
diff --git a/dev-lang/python/python-2.4.3.ebuild b/dev-lang/python/python-2.4.3.ebuild
deleted file mode 100644
index 3e4471db5114..000000000000
--- a/dev-lang/python/python-2.4.3.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.3.ebuild,v 1.5 2006/07/11 15:55:17 liquidx Exp $
-
-# NOTE about python-portage interactions :
-# - Do not add a pkg_setup() check for a certain version of portage
-#   in dev-lang/python. It _WILL_ stop people installing from
-#   Gentoo 1.4 images.
-
-inherit eutils flag-o-matic python multilib versionator toolchain-funcs
-
-# we need this so that we don't depends on python.eclass
-PYVER_MAJOR=$(get_major_version)
-PYVER_MINOR=$(get_version_component_range 2)
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-PATCHTAR="${PN}-${PYVER}-patches-2"
-
-MY_P="Python-${PV}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
-	mirror://gentoo/${PATCHTAR}.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 doc nocxx"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	!dev-python/cjkcodecs
-	!build? (
-		tk? ( >=dev-lang/tk-8.0 )
-		ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
-		berkdb? ( >=sys-libs/db-3.1 )
-		gdbm? ( sys-libs/gdbm )
-		ssl? ( dev-libs/openssl )
-		doc? ( =dev-python/python-docs-${PV}* )
-		dev-libs/expat
-	)"
-
-# NOTE: The dev-python/python-fchksum RDEPEND is needed so that this python 
-#       provides the functionality expected from previous pythons.
-
-# NOTE: python-fchksum is only a RDEPEND and not a DEPEND since we don't need
-#       it to compile python. We just need to ensure that when we install
-#       python, we definitely have fchksum support. - liquidx
-
-# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
-
-PDEPEND="${DEPEND} 	dev-python/python-fchksum"
-
-PROVIDE="virtual/python"
-
-# confcache breaks a dlopen check, causing python to not support
-# loading .so files - marienz
-RESTRICT="confcache"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# unnecessary termcap dep in readline (#79013)
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.4.2-readline.patch
-	# db4.2 support
-	epatch ${FILESDIR}/${P}-db4.patch
-
-	# adds support for PYTHON_DONTCOMPILE shell environment to
-	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-gentoo_py_dontcompile.patch
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-disable_modules_and_ssl.patch
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-mimetypes_apache.patch
-
-	# prepends /usr/lib/portage/pym to sys.path
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-add_portage_search_path.patch
-
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.4.1-libdir.patch
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die
-
-	# add support for struct stat st_flags attribute (bug 94637)
-	epatch ${WORKDIR}/${PATCHTAR}/python-2.4.1-st_flags.patch
-
-	# fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
-	# PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!!
-	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure
-
-	if tc-is-cross-compiler ; then
-		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-bindir-libdir.patch
-		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-crosscompile.patch
-	fi
-
-	# fix gentoo/obsd problems (bug 117261)
-	epatch "${FILESDIR}/python-2.4.3-gentoo_obsd.patch"
-}
-
-src_configure() {
-	# disable extraneous modules with extra dependencies
-	if use build; then
-		export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter"
-		export PYTHON_DISABLE_SSL=1
-	else
-		use gdbm \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm"
-		use berkdb \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm bsddb"
-		use readline \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline"
-		use tk \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter"
-		use ncurses \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _curses _curses_panel"
-		use ssl \
-			|| export PYTHON_DISABLE_SSL=1
-		export PYTHON_DISABLE_MODULES
-		echo $PYTHON_DISABLE_MODULES
-	fi
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	# Seems to no longer be necessary
-	#[ "${ARCH}" = "amd64" ] && append-flags -fPIC
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-
-	# http://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flag -O3; then
-	   is-flag -fstack-protector-all && replace-flags -O3 -O2
-	   use hardened && replace-flags -O3 -O2
-	fi
-
-	export OPT="${CFLAGS}"
-
-	local myconf
-	#if we are creating a new build image, we remove the dependency on g++
-	if use build && ! use bootstrap || use nocxx ; then
-		myconf="--with-cxx=no"
-	fi
-
-	# super-secret switch. don't use this unless you know what you're
-	# doing. enabling UCS2 support will break your existing python
-	# modules
-	use ucs2 \
-		&& myconf="${myconf} --enable-unicode=ucs2" \
-		|| myconf="${myconf} --enable-unicode=ucs4"
-
-	src_configure
-
-	if tc-is-cross-compiler ; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" \
-		./configure --with-cxx=no || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e '/^HOSTPYTHON/s:=.*:=./hostpython:' \
-			-e '/^HOSTPGEN/s:=.*:=./Parser/hostpgen:' \
-			Makefile.pre.in || die
-	fi
-
-	# export CXX so it ends up in /usr/lib/python2.x/config/Makefile
-	tc-export CXX
-	# set LINKCC to prevent python from being linked to libstdc++.so
-	export LINKCC="\$(PURIFY) \$(CC)"
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		`use_enable ipv6` \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man \
-		--with-threads \
-		--with-libc='' \
-		${myconf} || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	src_configure
-	make DESTDIR="${D}" altinstall  || die
-
-	# install our own custom python-config
-	exeinto /usr/bin
-	newexe ${FILESDIR}/python-config-${PYVER} python-config
-
-	# Use correct libdir in python-config
-	dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config
-
-	# The stuff below this line extends from 2.1, and should be deprecated
-	# in 2.3, or possibly can wait till 2.4
-
-	# seems like the build do not install Makefile.pre.in anymore
-	# it probably shouldn't - use DistUtils, people!
-	insinto /usr/$(get_libdir)/python${PYVER}/config
-	doins ${S}/Makefile.pre.in
-
-	# While we're working on the config stuff... Let's fix the OPT var
-	# so that it doesn't have any opts listed in it. Prevents the problem
-	# with compiling things with conflicting opts later.
-	dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' \
-			/usr/$(get_libdir)/python${PYVER}/config/Makefile
-
-	# install python-updater in /usr/sbin
-	#dosbin ${FILESDIR}/python-updater
-	newsbin ${FILESDIR}/python-updater-r1 python-updater
-
-	if use build ; then
-		rm -rf ${D}/usr/lib/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use elibc_uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test}
-		use berkdb || rm -rf ${D}/usr/lib/python${PYVER}/bsddb
-		use tk || rm -rf ${D}/usr/lib/python${PYVER}/lib-tk
-	fi
-
-	prep_ml_includes usr/include/python${PYVER}
-}
-
-pkg_postrm() {
-	python_makesym
-	python_mod_cleanup /usr/lib/python${PYVER}
-	[[ "$(get_libdir)" == "lib" ]] || python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
-}
-
-pkg_postinst() {
-	local myroot
-	myroot=$(echo $ROOT | sed 's:/$::')
-
-	python_makesym
-	python_mod_optimize
-	python_mod_optimize -x site-packages -x test ${myroot}/usr/lib/python${PYVER}
-	[[ "$(get_libdir)" == "lib" ]] || python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER}
-
-
-	# workaround possible python-upgrade-breaks-portage situation
-	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
-		if [ -f ${myroot}/usr/lib/python2.3/site-packages/portage.py ]; then
-			einfo "Working around possible python-portage upgrade breakage"
-			mkdir -p ${myroot}/usr/lib/portage/pym
-			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
-		fi
-	fi
-
-	# try to upgrade to new python automatically - something to think about
-	#if [ "${ROOT}" = "/" ]; then
-	#	/usr/sbin/python-updater
-	#fi
-
-	echo
-	ewarn
-	ewarn "If you have just upgraded from an older version of python you will need to run:"
-	ewarn
-	ewarn "/usr/sbin/python-updater"
-	ewarn
-	ewarn "This will automatically rebuild all the python dependent modules"
-	ewarn "to run with python-${PYVER}."
-	ewarn
-	ewarn "Your original Python is still installed and can be accessed via"
-	ewarn "/usr/bin/python2.x."
-	ewarn
-	ebeep 5
-}
-
-src_test() {
-	# PYTHON_DONTCOMPILE=1 breaks test_import
-	unset PYTHON_DONTCOMPILE
-
-	#skip all tests that fail during emerge but pass without emerge:
-	#(See bug# 67970)
-	local skip_tests="distutils global mimetools minidom mmap strptime subprocess syntax tcl time urllib urllib2"
-
-	for test in ${skip_tests} ; do
-		mv ${S}/Lib/test/test_${test}.py ${T}
-	done
-
-	# rerun failed tests in verbose mode (regrtest -w)
-	EXTRATESTOPTS="-w" make test || die "make test failed"
-
-	for test in ${skip_tests} ; do
-		mv ${T}/test_${test}.py ${S}/Lib/test/test_${test}.py
-	done
-
-	einfo "Portage skipped the following tests which aren't able to run from emerge:"
-	for test in ${skip_tests} ; do
-		einfo "test_${test}.py"
-	done
-
-	einfo "If you'd like to run them, you may:"
-	einfo "cd /usr/lib/python${PYVER}/test"
-	einfo "and run the tests separately."
-}