Fix obsd patch (thanks reb) fixing bugs 117261 and 130140.

Package-Manager: portage-2.0.54

8 files changed, 712 insertions, 94 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 352065a93c6d..4756275ac771 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.194 2006/04/27 15:47:54 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.195 2006/05/04 14:35:10 kloeri Exp $
+
+*python-2.4.3-r1 (04 May 2006)
+*python-2.4.2-r2 (04 May 2006)
+
+  04 May 2006; Bryan Østergaard <kloeri@gentoo.org>
+  +files/python-2.4.2-gentoo_obsd-r1.patch,
+  +files/python-2.4.3-gentoo_obsd-r1.patch, +python-2.4.2-r2.ebuild,
+  +python-2.4.3-r1.ebuild:
+  Fix obsd patch (thanks reb) fixing bugs 117261 and 130140.
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org>
   files/digest-python-2.1.3-r1, files/digest-python-2.2.3-r6, Manifest:
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index beb4956dd498..e3989e5b59e1 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,109 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX depreorder-topsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d size 1958
+MD5 9d9fb2d40aea43acb339d3d6770180aa ChangeLog 33023
 MD5 7e423c353b08a2c05693d13f21e067d0 files/depreorder-topsort.py 1958
-RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 files/depreorder-topsort.py 1958
-SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d files/depreorder-topsort.py 1958
-AUX depreorder.py 2235 RMD160 a6da5f336bdf8c370861c7922a5fa79ce4ab89cb SHA1 3b8590d7fbece2367088c646a792a9618d786dec SHA256 93920120e596f34e4222e8686e6283b03cdd517f89f2dba3eda90d79fa016aba size 2235
 MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235
-RMD160 a6da5f336bdf8c370861c7922a5fa79ce4ab89cb files/depreorder.py 2235
-SHA256 93920120e596f34e4222e8686e6283b03cdd517f89f2dba3eda90d79fa016aba files/depreorder.py 2235
-AUX python-2.4.2-gentoo_obsd.patch 1554 RMD160 c93e34df155440e68e7db283d709c3ef301933d2 SHA1 83ef3e0f43f2d6100d2416f5c47776af5f643fab SHA256 89a870d045246c66a67e7931afd38260c8b1e3d0c8f2db9b73e36cf014e98dee size 1554
+MD5 e8f5d051347769b7c295ba16f9e21bc3 files/digest-python-2.1.3-r1 232
+MD5 3827d36e14c76ea54c2d4a123a15ea9b files/digest-python-2.2.3-r6 491
+MD5 7d0ed808841926682f3f351132a67a04 files/digest-python-2.3.5-r2 503
+MD5 290e8976104d28b7cc4665a80e14570d files/digest-python-2.4.2 503
+MD5 f55531f44d89bb3f76edaf14a712f05e files/digest-python-2.4.2-r1 503
+MD5 bc141515fe3e361450d4c2084d90993c files/digest-python-2.4.2-r2 137
+MD5 074466092860a2451d114cf7fad357f2 files/digest-python-2.4.3 503
+MD5 1b6f28749daec76b885d1020cd2c2cdb files/digest-python-2.4.3-r1 137
+MD5 de6852d5cad70e98da4f586fe5989e6c files/python-2.4.2-gentoo_obsd-r1.patch 1630
 MD5 28820c76c538a4a9d3fb4ef860ac3370 files/python-2.4.2-gentoo_obsd.patch 1554
-RMD160 c93e34df155440e68e7db283d709c3ef301933d2 files/python-2.4.2-gentoo_obsd.patch 1554
-SHA256 89a870d045246c66a67e7931afd38260c8b1e3d0c8f2db9b73e36cf014e98dee files/python-2.4.2-gentoo_obsd.patch 1554
-AUX python-2.4.3-db4.patch 1602 RMD160 59a533ba6dc0ee4702c22ecd1b28c1b95a54e4c7 SHA1 c7eb00c0e3ee215bf76cc80ec629ae22a8a0c197 SHA256 6366623ed12d682210931211d8dc0edb78c4ea9256fd2357661762864f5a7611 size 1602
 MD5 99edd492f449d6b61456ea8d5fd71ee9 files/python-2.4.3-db4.patch 1602
-RMD160 59a533ba6dc0ee4702c22ecd1b28c1b95a54e4c7 files/python-2.4.3-db4.patch 1602
-SHA256 6366623ed12d682210931211d8dc0edb78c4ea9256fd2357661762864f5a7611 files/python-2.4.3-db4.patch 1602
-AUX python-2.4.3-gentoo_obsd.patch 1023 RMD160 8d467ff543a86ad6fd554071e502f6f73dc806d9 SHA1 df41bae9d3c2428ffc3e17e961086693e74669a5 SHA256 fe23caefc82bf813481839fb87df7c0bdb28f67897daddaeebfa8fd1b94c980f size 1023
+MD5 6990e6f24bbdd37fb4f4a8b7bbb16928 files/python-2.4.3-gentoo_obsd-r1.patch 1162
 MD5 bc6e04d48b56dad72d894d0c143371df files/python-2.4.3-gentoo_obsd.patch 1023
-RMD160 8d467ff543a86ad6fd554071e502f6f73dc806d9 files/python-2.4.3-gentoo_obsd.patch 1023
-SHA256 fe23caefc82bf813481839fb87df7c0bdb28f67897daddaeebfa8fd1b94c980f files/python-2.4.3-gentoo_obsd.patch 1023
-AUX python-config-2.2 178 RMD160 3e69689ed295971149007f5db27b1fbd345d6d60 SHA1 84a0e29327758c9fc53fe84bdddcdfaef61a758f SHA256 77a801661f573c04b0afe36bb94a7deb0885c90b69872a9825f2a2e2ba0e1141 size 178
 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
-RMD160 3e69689ed295971149007f5db27b1fbd345d6d60 files/python-config-2.2 178
-SHA256 77a801661f573c04b0afe36bb94a7deb0885c90b69872a9825f2a2e2ba0e1141 files/python-config-2.2 178
-AUX python-config-2.3 178 RMD160 9dcfd961c13bd1217ffa5eedf911d4105caa05a5 SHA1 5ea1cce4e960abd79b9dd40affa3138bb0b47e85 SHA256 187842d5d403184871db0acf18058ed017418499ee689eee0c4eb40b5d921fa8 size 178
 MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178
-RMD160 9dcfd961c13bd1217ffa5eedf911d4105caa05a5 files/python-config-2.3 178
-SHA256 187842d5d403184871db0acf18058ed017418499ee689eee0c4eb40b5d921fa8 files/python-config-2.3 178
-AUX python-config-2.4 179 RMD160 087417fb7080be00cf62381d5e16fb4e4cb4538f SHA1 3ffffc6e4f4c7b774135f2635601b92a5b13e259 SHA256 86b87546be79ee6027df70046b33808b64921eea71618c81810e6b1280604221 size 179
 MD5 d74e7f0fd47f00e8b3fe7ca36b7eb629 files/python-config-2.4 179
-RMD160 087417fb7080be00cf62381d5e16fb4e4cb4538f files/python-config-2.4 179
-SHA256 86b87546be79ee6027df70046b33808b64921eea71618c81810e6b1280604221 files/python-config-2.4 179
-AUX python-updater 8761 RMD160 d1e6fbe1bc26dd3d0d0970f888d9e2b2ac7289b3 SHA1 beb0cecae93a4e466335fd6e23c0545ee245b79b SHA256 66332efe4c0e95468b25c4c11e689e6c14b6e7fabc16b4fa2aab975d9df02317 size 8761
 MD5 1cf4c21ad3b0aafc571b05b9a9e54594 files/python-updater 8761
-RMD160 d1e6fbe1bc26dd3d0d0970f888d9e2b2ac7289b3 files/python-updater 8761
-SHA256 66332efe4c0e95468b25c4c11e689e6c14b6e7fabc16b4fa2aab975d9df02317 files/python-updater 8761
-AUX python-updater-r1 8769 RMD160 4c1222cfde4e2e13ef75eb6656ff80c43a9cf69f SHA1 c0170d2e07d86dbc050eb21c679048554981c600 SHA256 d74f8dc8ed892285642acb3fa30b05187d136f8e8c56890982023193dc1fba27 size 8769
 MD5 4b6d43b5e4510d6dc29be97c6aef21ca files/python-updater-r1 8769
-RMD160 4c1222cfde4e2e13ef75eb6656ff80c43a9cf69f files/python-updater-r1 8769
-SHA256 d74f8dc8ed892285642acb3fa30b05187d136f8e8c56890982023193dc1fba27 files/python-updater-r1 8769
-DIST Python-2.1.3.tgz 6194432 RMD160 d7216480cf884507d97bf7932767871977fc1ccc SHA256 1bcb5bb587948bc38f36db60e15c376009c56c66570e563a08a82bf7f227afb9 size 6194432
-DIST Python-2.2.3.tgz 6709556 RMD160 3590f813582d65194b467f4ab450e360e35eb40e SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188 size 6709556
-DIST Python-2.3.5.tar.bz2 7230000 RMD160 2b1fa90393f517fe02d546c037996754f65f8c89 SHA256 1b81787c3dcae3752cadaa6be80c24e247c239ba93d91538af39b4b717e29bf4 size 7230000
-DIST Python-2.4.2.tar.bz2 7853169 RMD160 c511d2b76b5394742d285e71570a2bcd3c1fa871 SHA256 e163b95ee56819c0f3c58ef9278c30b9e49302c2f1a1917680ca894d33929f7e size 7853169
-DIST Python-2.4.3.tar.bz2 8005915 RMD160 c86247554975e6c44f91d05e44e68e280d5244dc SHA256 c9b3bbc52fa18c6dba7a8c3481fa7de98187c9978749241395305f252134ba2c size 8005915
-DIST python-2.2-patches-1.tar.bz2 3127 RMD160 2874de5568776a0b195c6694e4af6769e08fc028 SHA256 1c638792add80a832d5b65c1473ccb056f3ebe2fe99d29a65e1a730ed8ab6218 size 3127
-DIST python-2.3-patches-1.tar.bz2 8482 RMD160 a2fa53c2246864e0f7240132d7d9394dd630ff26 SHA256 c3b766299b4a9363a63bc27983e7e82f19daa430a5f11d2ce29012a63229bf89 size 8482
-DIST python-2.4-patches-1.tar.bz2 7820 RMD160 313c0f4f4dea59290c42a9b2c8de1db159f1ca1b SHA256 e22abe4394f1f0919aac429f155c00ec1b3fe94cdc302119059994d817cd30b5 size 7820
-DIST python-2.4-patches-2.tar.bz2 9219 RMD160 bd4c3502b42f4f9a10f423c434f31ad370d9da4b SHA256 e66ee41328999e89bea833ff3dc58b4691a6d16ada029e88a8ba9df35979352a size 9219
-EBUILD python-2.1.3-r1.ebuild 2299 RMD160 c34187e843cbc93f9d675e77eaf1c8008c60c986 SHA1 c9ceb6f3763ac0b4542d9a9efe3f7cf013985807 SHA256 5aff296d1e28d87f2ce6dfd4929dffb009a2f541dd3628dc8683fe9034ded1ed size 2299
+MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 MD5 2632d539cd0ab18b40f9510118ed3099 python-2.1.3-r1.ebuild 2299
-RMD160 c34187e843cbc93f9d675e77eaf1c8008c60c986 python-2.1.3-r1.ebuild 2299
-SHA256 5aff296d1e28d87f2ce6dfd4929dffb009a2f541dd3628dc8683fe9034ded1ed python-2.1.3-r1.ebuild 2299
-EBUILD python-2.2.3-r6.ebuild 4566 RMD160 bb7fc0525ec403957f96da8e4eec3ee5bb71380e SHA1 3a52ec7b355951db9e21d648bdd0b8db066d06a1 SHA256 c7a10e8195449160f2c19a74d66e4a367107e2f197571b8b052f01d33f162174 size 4566
 MD5 b5c28696cbcdc2c5f5ea9d32f93268ea python-2.2.3-r6.ebuild 4566
-RMD160 bb7fc0525ec403957f96da8e4eec3ee5bb71380e python-2.2.3-r6.ebuild 4566
-SHA256 c7a10e8195449160f2c19a74d66e4a367107e2f197571b8b052f01d33f162174 python-2.2.3-r6.ebuild 4566
-EBUILD python-2.3.5-r2.ebuild 8330 RMD160 300ba245465531193a8f5cd23f2025a5ddcc4d37 SHA1 185a44938e81dd11bbee2aaa6bbb87c5a0f007b9 SHA256 ad899576c9160ee0fdf519c41fc3c25dbc32ccbb7efa3d9b46434cd760f8eb26 size 8330
 MD5 111d0fe04be52386fcc80b7bab28e003 python-2.3.5-r2.ebuild 8330
-RMD160 300ba245465531193a8f5cd23f2025a5ddcc4d37 python-2.3.5-r2.ebuild 8330
-SHA256 ad899576c9160ee0fdf519c41fc3c25dbc32ccbb7efa3d9b46434cd760f8eb26 python-2.3.5-r2.ebuild 8330
-EBUILD python-2.4.2-r1.ebuild 10011 RMD160 05fb3104b5fa0ccd06be2379534fa1d5004b9aac SHA1 959e8eaef317739001f7edb7da5192e9351b5b60 SHA256 12c6fc1a403be155da2c0b0373f245dc4fbc306cf627ecbfca46a52d21ff094f size 10011
 MD5 a0102280e6f5fb53bf7e16af352da167 python-2.4.2-r1.ebuild 10011
-RMD160 05fb3104b5fa0ccd06be2379534fa1d5004b9aac python-2.4.2-r1.ebuild 10011
-SHA256 12c6fc1a403be155da2c0b0373f245dc4fbc306cf627ecbfca46a52d21ff094f python-2.4.2-r1.ebuild 10011
-EBUILD python-2.4.2.ebuild 9556 RMD160 8d1307a81c6d18e3eb57d47ba86b0960795f7d37 SHA1 2a80c236331f5112b5fc4c93fd6ad4a13fe5929a SHA256 b1131f1f803bec3d22e55aa97a89f2bb72fa87e694a55ffb71ce23488ec6cf7b size 9556
+MD5 885554f50a9aae11e97385b4ac5529d1 python-2.4.2-r2.ebuild 10014
 MD5 01db2bd229ee8711bc212ecd3498849d python-2.4.2.ebuild 9556
-RMD160 8d1307a81c6d18e3eb57d47ba86b0960795f7d37 python-2.4.2.ebuild 9556
-SHA256 b1131f1f803bec3d22e55aa97a89f2bb72fa87e694a55ffb71ce23488ec6cf7b python-2.4.2.ebuild 9556
-EBUILD python-2.4.3.ebuild 9849 RMD160 d088659d8cd2727730ed48a039e1c1592c59c1d6 SHA1 00f1d5dfeaa35d7acb5573cf053986598a35cd1b SHA256 cd7ba514782f1320582d1611f162a3bef1ab9b3f39d64156d7b093838044d4c2 size 9849
+MD5 e831703ab55a47d3f9889335b52f9da6 python-2.4.3-r1.ebuild 9855
 MD5 e7dc812d3078ca6a3fd4aa8335644a88 python-2.4.3.ebuild 9849
-RMD160 d088659d8cd2727730ed48a039e1c1592c59c1d6 python-2.4.3.ebuild 9849
-SHA256 cd7ba514782f1320582d1611f162a3bef1ab9b3f39d64156d7b093838044d4c2 python-2.4.3.ebuild 9849
-MISC ChangeLog 32706 RMD160 09644fc3d5ee9af512988d75b9036e6dd650d6cb SHA1 f7c314992c7a7d8d0bb09703f62a0e3b131c688d SHA256 76c29ef6bdb05d2ddc276d861f869b01ca7f160b2c5354cdf692e35e68424ce7 size 32706
-MD5 3343ed95467a4d68e14fb03a87ad259a ChangeLog 32706
-RMD160 09644fc3d5ee9af512988d75b9036e6dd650d6cb ChangeLog 32706
-SHA256 76c29ef6bdb05d2ddc276d861f869b01ca7f160b2c5354cdf692e35e68424ce7 ChangeLog 32706
-MISC metadata.xml 221 RMD160 dd50f32b16d6c15330ae1ee711d8a6cf8f6e3bed SHA1 85903c4affc3a23dd37e4910eb9b198cd02b242e SHA256 c14b93d19008cbeeb3312ec60b97513eef18ccfe82b8e2303cb44977ca13e3bd size 221
-MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
-RMD160 dd50f32b16d6c15330ae1ee711d8a6cf8f6e3bed metadata.xml 221
-SHA256 c14b93d19008cbeeb3312ec60b97513eef18ccfe82b8e2303cb44977ca13e3bd metadata.xml 221
-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 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEUOhvW78445TWHXcRAjq2AKCT/qbIEEmMZd83ViE166dyWvsfBwCgiVYs
-iSFIDEj38G/fNTkCaXEbU8o=
-=oAxv
------END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/digest-python-2.4.2-r2 b/dev-lang/python/files/digest-python-2.4.2-r2
new file mode 100644
index 000000000000..b93384115a79
--- /dev/null
+++ b/dev-lang/python/files/digest-python-2.4.2-r2
@@ -0,0 +1,2 @@
+MD5 98db1465629693fc434d4dc52db93838 Python-2.4.2.tar.bz2 7853169
+MD5 c98f93a5700138836154d7c8009f1fbf python-2.4-patches-2.tar.bz2 9219
diff --git a/dev-lang/python/files/digest-python-2.4.3-r1 b/dev-lang/python/files/digest-python-2.4.3-r1
new file mode 100644
index 000000000000..320f967b4710
--- /dev/null
+++ b/dev-lang/python/files/digest-python-2.4.3-r1
@@ -0,0 +1,2 @@
+MD5 141c683447d5e76be1d2bd4829574f02 Python-2.4.3.tar.bz2 8005915
+MD5 c98f93a5700138836154d7c8009f1fbf python-2.4-patches-2.tar.bz2 9219
diff --git a/dev-lang/python/files/python-2.4.2-gentoo_obsd-r1.patch b/dev-lang/python/files/python-2.4.2-gentoo_obsd-r1.patch
new file mode 100644
index 000000000000..1c3a4899fc60
--- /dev/null
+++ b/dev-lang/python/files/python-2.4.2-gentoo_obsd-r1.patch
@@ -0,0 +1,44 @@
+diff -ruN Python-2.4.2.orig/configure.in Python-2.4.2/configure.in
+--- Python-2.4.2.orig/configure.in	2005-08-07 23:08:53.000000000 +0200
++++ Python-2.4.2/configure.in	2006-04-26 16:25:03.241669250 +0200
+@@ -140,7 +140,7 @@
+   # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
+   # even though select is a POSIX function. Reported by J. Ribbens.
+   # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
+-  OpenBSD/2.* | OpenBSD/3.@<:@0123456@:>@) 
++  OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@) 
+     define_xopen_source=no;;
+   # On Solaris 2.6, sys/wait.h is inconsistent in the usage
+   # of union __?sigval. Reported by Stuart Bishop.
+@@ -1517,9 +1517,16 @@
+ 
+ # only check for sem_ini if thread support is requested
+ if test "$with_threads" = "yes" -o -z "$with_threads"; then
++  case "$ac_sys_system" in
++  OpenBSD*)
++    LIBS="-pthread ${LIBS}"
++    ;;
++  *)
+     AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
+ 						# posix4 on Solaris 2.6
+ 						# pthread (first!) on Linux
++    ;;
++  esac
+ fi
+ 
+ # check if we need libintl for locale functions
+diff -ruN Python-2.4.2.orig/Include/Python.h Python-2.4.2/Include/Python.h
+--- Python-2.4.2.orig/Include/Python.h	2004-07-27 17:57:23.000000000 +0200
++++ Python-2.4.2/Include/Python.h	2006-04-26 16:24:15.274671500 +0200
+@@ -2,6 +2,11 @@
+ #define Py_PYTHON_H
+ /* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */
+ 
++/* Required on Gentoo/OpenBSD */
++#if defined(__OpenBSD__)
++#include <sys/types.h>
++#endif
++
+ /* Include nearly all Python header files */
+ 
+ #include "patchlevel.h"
diff --git a/dev-lang/python/files/python-2.4.3-gentoo_obsd-r1.patch b/dev-lang/python/files/python-2.4.3-gentoo_obsd-r1.patch
new file mode 100644
index 000000000000..ed2e3c8e4c0d
--- /dev/null
+++ b/dev-lang/python/files/python-2.4.3-gentoo_obsd-r1.patch
@@ -0,0 +1,35 @@
+diff -Naur Python-2.4.3.orig/Include/Python.h Python-2.4.3/Include/Python.h
+--- Python-2.4.3.orig/Include/Python.h	2006-05-04 14:20:30.000000000 +0000
++++ Python-2.4.3/Include/Python.h	2006-05-04 14:21:26.000000000 +0000
+@@ -2,6 +2,11 @@
+ #define Py_PYTHON_H
+ /* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */
+ 
++/* Required on Gentoo/OpenBSD */
++#if defined(__OpenBSD__)
++#include <sys/types.h>
++#endif
++
+ /* Include nearly all Python header files */
+ 
+ #include "patchlevel.h"
+diff -Naur Python-2.4.3.orig/configure.in Python-2.4.3/configure.in
+--- Python-2.4.3.orig/configure.in	2006-05-04 14:20:30.000000000 +0000
++++ Python-2.4.3/configure.in	2006-05-04 14:23:22.000000000 +0000
+@@ -1528,9 +1528,16 @@
+ 
+ # only check for sem_ini if thread support is requested
+ if test "$with_threads" = "yes" -o -z "$with_threads"; then
++  case "$ac_sys_system" in
++  OpenBSD*)
++    LIBS="-pthread ${LIBS}"
++    ;;
++  *)
+     AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
+ 						# posix4 on Solaris 2.6
+ 						# pthread (first!) on Linux
++    ;;
++  esac
+ fi
+ 
+ # check if we need libintl for locale functions
diff --git a/dev-lang/python/python-2.4.2-r2.ebuild b/dev-lang/python/python-2.4.2-r2.ebuild
new file mode 100644
index 000000000000..b56ee392f581
--- /dev/null
+++ b/dev-lang/python/python-2.4.2-r2.ebuild
@@ -0,0 +1,305 @@
+# 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.1 2006/05/04 14:35:10 kloeri 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-orientated 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 tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx"
+
+DEPEND=">=sys-libs/zlib-1.1.3
+	!dev-python/cjkcodecs
+	!build? (
+		X? ( tcltk? ( >=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 !X || use !tcltk ) \
+			&& 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 !X || use !tcltk ) && 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.3-r1.ebuild b/dev-lang/python/python-2.4.3-r1.ebuild
new file mode 100644
index 000000000000..573a388407f7
--- /dev/null
+++ b/dev-lang/python/python-2.4.3-r1.ebuild
@@ -0,0 +1,300 @@
+# 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-r1.ebuild,v 1.1 2006/05/04 14:35:10 kloeri 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-orientated 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 tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx"
+
+DEPEND=">=sys-libs/zlib-1.1.3
+	!dev-python/cjkcodecs
+	!build? (
+		X? ( tcltk? ( >=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-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 !X || use !tcltk ) \
+			&& 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 !X || use !tcltk ) && 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."
+}