Drop python-2.3, drop old 2.4, 2.5 ebuilds. Add local use flag descriptions to metadata.xml.

Package-Manager: portage--svn.wrabbit

13 files changed, 26 insertions, 1939 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index c4e93db594ba..66e153060a55 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.337 2008/07/31 14:18:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.338 2008/08/19 09:11:59 hawking Exp $
+
+  19 Aug 2008; Ali Polatel <hawking@gentoo.org> -files/python-config-2.2,
+  -files/python-config-2.3, -files/python-2.3.6-disable-failing-tests.patch,
+  metadata.xml, -python-2.3.5-r2.ebuild, -python-2.3.5-r3.ebuild,
+  -python-2.3.6.ebuild, -python-2.3.6-r3.ebuild, -python-2.3.6-r6.ebuild,
+  -python-2.4.4-r13.ebuild, -python-2.5.2-r5.ebuild:
+  Drop python-2.3, drop old 2.4, 2.5 ebuilds. Add local use flag
+  descriptions to metadata.xml.
 
   31 Jul 2008; Raúl Porcel <armin76@gentoo.org> python-2.5.2-r6.ebuild:
   sparc stable
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 3dd6dcf3455f..40f3d76a4123 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,44 +1,35 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX depreorder-topsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d
 AUX depreorder.py 2235 RMD160 a6da5f336bdf8c370861c7922a5fa79ce4ab89cb SHA1 3b8590d7fbece2367088c646a792a9618d786dec SHA256 93920120e596f34e4222e8686e6283b03cdd517f89f2dba3eda90d79fa016aba
 AUX pydoc.conf 330 RMD160 0cd619ec251597e0fcadc05bfd249915e73baa17 SHA1 a56100d45378c554b9822f6ed512a6cb7841ef50 SHA256 a45ebba2de5f2b0e963db4101507203d095c5ff667ae5002c4897a9c87786fa1
 AUX pydoc.init 666 RMD160 11caf3a78bce4cdaebacaf21eaf26cc1ce30282e SHA1 88c5cb6d5bf737c74e1be93118cf157630af9ad7 SHA256 0d25c71232b74adb87dc709cc7cd8f8b13c452c0fe82fa33808f907f7a96d628
-AUX python-2.3.6-disable-failing-tests.patch 782 RMD160 490409cb9c4ae88cbec553380904a0f071018b9c SHA1 c046b25069d016734f571dd56f86377891abdd05 SHA256 e2d8ece0d6dbfcd0dc7fcbe1093a8ce51916268a5f1e6c9535304b0eda07fd73
 AUX python-2.4.2-gentoo_obsd-r1.patch 1630 RMD160 77c7c13be17f7dcf1abccab2a0fb5818f4f7c261 SHA1 ba795d0aeba9986ed6077217848fd8ba1eb0d39c SHA256 b96f687a18cdfd75090a7401298568ee5819046a54eb58c1527126dd36596d47
 AUX python-2.4.2-gentoo_obsd.patch 1554 RMD160 c93e34df155440e68e7db283d709c3ef301933d2 SHA1 83ef3e0f43f2d6100d2416f5c47776af5f643fab SHA256 89a870d045246c66a67e7931afd38260c8b1e3d0c8f2db9b73e36cf014e98dee
 AUX python-2.4.4-test-cross.patch 977 RMD160 8fdcd45dc202993988f7a1c2b3d918068883b99e SHA1 96f25777150ba05765282a43f08da6b6fab3cb73 SHA256 ff2a131776d560d188ec5069e17fea3eb09c26fdd02124ae5ff34d791c9fd9f6
-AUX python-config-2.2 178 RMD160 3e69689ed295971149007f5db27b1fbd345d6d60 SHA1 84a0e29327758c9fc53fe84bdddcdfaef61a758f SHA256 77a801661f573c04b0afe36bb94a7deb0885c90b69872a9825f2a2e2ba0e1141
-AUX python-config-2.3 178 RMD160 9dcfd961c13bd1217ffa5eedf911d4105caa05a5 SHA1 5ea1cce4e960abd79b9dd40affa3138bb0b47e85 SHA256 187842d5d403184871db0acf18058ed017418499ee689eee0c4eb40b5d921fa8
 AUX python-config-2.4 179 RMD160 087417fb7080be00cf62381d5e16fb4e4cb4538f SHA1 3ffffc6e4f4c7b774135f2635601b92a5b13e259 SHA256 86b87546be79ee6027df70046b33808b64921eea71618c81810e6b1280604221
 AUX python-config-2.4-r1 1624 RMD160 e4e6893c9e8414289c0c70c0f4be58835911e376 SHA1 addf9a6eb81e636364264a6abb3d96f01ea0cf90 SHA256 923a9e896f99cca5aa4ccbb02f981c6e26a2b1aa42326de2359d3c884bde2a9f
 AUX python-updater 8777 RMD160 f177c5ae1f1d5dabffd9c52da10704999284af0c SHA1 91719ec53bd5e128042fedaed68d40fcb4abd65b SHA256 25d24778518f33e24e735e2319b1f6aa6a94137afe30b55cfeb974a74cf3873a
 AUX python-updater-r1 8785 RMD160 a395283fc17565fc9bc68e59928c74aafe3f19e5 SHA1 6d6f2d44bf20a528693d017b99f45541ae535bf5 SHA256 850bce6c25b33fbc05da98387bf7bd8652d4d6af4c8a7c11b4956e26a84a86b6
-DIST Python-2.3.5.tar.bz2 7230000 RMD160 2b1fa90393f517fe02d546c037996754f65f8c89 SHA1 98bfa6257f73a3826b244047c183d933d26f4322 SHA256 1b81787c3dcae3752cadaa6be80c24e247c239ba93d91538af39b4b717e29bf4
-DIST Python-2.3.6.tar.bz2 7350182 RMD160 db7a2ebff31e86bc99d45062fc77e4194399cc8d SHA1 11ae8960fb4a5a57be0f57bdc86d901fedc92f66 SHA256 120b6babcc29dfd0ba31ad1b1db587fbceee9705a569727c80d18292ba675da4
 DIST Python-2.4.4.tar.bz2 8158073 RMD160 4c7b5b70178fe69881b62201ef0bab55037d8708 SHA1 9e0971f93df8acbd947378d0d16a32fcc8897ba2 SHA256 325fdc7351a08bd8d811e7fb53c41bff11764648ab1a671abd910afec946b38a
 DIST Python-2.5.2.tar.bz2 9807597 RMD160 b23b02739833e6730799c5866e2b77aae884b63f SHA1 4755d212f50af704c20224a6966e23acc5aea60f SHA256 f2f80e2a62a039e9a1ffa0fdf58707b2d12b3ff33c56472b46bb6d53f45e083e
-DIST python-gentoo-patches-2.3.5-r1.tar.bz2 9239 RMD160 0afe928728c2cb5c306bff261e2fbe485a554c71 SHA1 1bfc2b79fe69bed59705b5c734fe8c4af264bf7e SHA256 35e1139aa91f0ac026017928df71b21da68d8470278852e700f0b32d6c638dbf
-DIST python-gentoo-patches-2.3.5.tar.bz2 8489 RMD160 aa2860d06e0aa387c91419ed1a2bb33de14fd393 SHA1 32349bd5e0f6c3859414b4a03643dd89538792f9 SHA256 f144c5488a55599a0d0614f7c687e43106f8b6da51738296aadcec374d567237
-DIST python-gentoo-patches-2.3.6-r1.tar.bz2 8483 RMD160 20a7e020f4cecb849af1d611eb3b159440915de1 SHA1 bf8c2f4512aacf70f78dd1d04e6f5a19cd73cec3 SHA256 995c356c6e5481299b9cedd56a510cfed59dffe50f8932192ae8343a1ad1e416
-DIST python-gentoo-patches-2.3.6-r4.tar.bz2 10161 RMD160 61b9f9b7f16e0d17db1a135dc3a0e9c12ceb6534 SHA1 714159683adb86e0b8cb9c16073e9bdfc399ea60 SHA256 96a235e7e23b4b2767b001738fbf66f31f16ebf5e106c18aa636857e62f1585c
-DIST python-gentoo-patches-2.3.6-r7.tar.bz2 11466 RMD160 d3b2fd502a1c934d22f9bf5a9aaae10f017766f1 SHA1 075511a29c33b4d8d4136da65a5638e86ea63b1f SHA256 a949779a23c40c71b5c040129e01c562324b87e3745613302902009431e87e11
-DIST python-gentoo-patches-2.4.4-r10.tar.bz2 11488 RMD160 bce809baf3bd7b1de390707c866a9cc187744bfb SHA1 a1498054a6ff9a62907b5833893ce34e83e95df4 SHA256 e3578ae10702ef3e3107736d212fc92e06bcb541cd756ed656db3171b9d1d5c0
 DIST python-gentoo-patches-2.4.4-r11.tar.bz2 22397 RMD160 d805a16f1e719c06f0d9b81482e126a4e266fbc5 SHA1 3270e797c8dfb84aa5bf564de63523552e14f821 SHA256 84ea076ad06e20578e1c97337d98afe3abb0e69518a7cc814841fd34f29ec71c
 DIST python-gentoo-patches-2.4.4-r3.tar.bz2 8348 RMD160 e9b59a7cd1469668d43a41d396d7a275bef78270 SHA1 16373b922895d1c14ccfa9d6b39079f2d5a2bcb6 SHA256 1c81397312136625fc220db660f701d4eccbde75e74bb40a0d77015b4d5d4f9f
 DIST python-gentoo-patches-2.4.4-r4.tar.bz2 9569 RMD160 2e618e2bf8d0d9d1e722f60b6b781af8906b1750 SHA1 f2253df5b52350fdfbd06054597814d705c088c5 SHA256 a5e9783a4ad57c60f91e3f943f4ff60dcb9b2eb64aa9226598bff9658473781e
-DIST python-gentoo-patches-2.5.2-r5.tar.bz2 19575 RMD160 74b8c1650c51690c14d444356b3c25974f85b5a8 SHA1 df649d76b6006b318ecd59fe66b44624d855ff4a SHA256 3bc0dfdac3df524c68d841bca34b9391aa84c1dcf1d43febc3d6aef47658f3f4
 DIST python-gentoo-patches-2.5.2-r6.tar.bz2 27737 RMD160 1b2a6bb3e913941dec3c5d9e3af0b1a8ffe29ac5 SHA1 5888108a36ea55e911486a8407c26e61c12b0ec8 SHA256 d86531a671a41a65663f8b26c2cd2f8757badd365ecbac9836bb2a6022b546d3
 DIST python-gentoo-patches-2.5.2-r7.tar.bz2 28160 RMD160 c2a8c71f464f1cf0cd8e3d142a3f3454de46bc55 SHA1 b64fc90f331e42ea2c364fd61d13b515300fdcbf SHA256 8afff4ed12c3c5ca4418da657617317a8c646a69ae341a3d494747659825355f
-EBUILD python-2.3.5-r2.ebuild 8061 RMD160 acf517bdbf123794b14deb3ee3b31aad3a8087e5 SHA1 3828e01a5a133005ea0952bca6a0a8b56a91f07d SHA256 cb8d3bb7cb2ddeea916e945d3dca985ceaab66d654523dab0a96a93396ddc67a
-EBUILD python-2.3.5-r3.ebuild 8119 RMD160 9e85d5759d06f33810d3c9f044b787742381be28 SHA1 719f6316d24a8ff41a01664ab772bc2ab53b17c2 SHA256 5d76928f6db17de76535e98deb9edf0354601ac4e0ae2fcd64cdf2a2e0a42188
-EBUILD python-2.3.6-r3.ebuild 7603 RMD160 fed52d6d5c4500173717e09be17bb010c90c6f7a SHA1 d5c4fa22ccfe9b41dca0c254134cd5fb1b000c56 SHA256 4a1170ec4b62eadb182824ddd78316991394d6fd0619e48141bcf3bf68685cc2
-EBUILD python-2.3.6-r6.ebuild 7955 RMD160 bc401bc43838c44e51f6ceb70a3112be2fe9f7bd SHA1 a019cbd9d53d8c4941c4a641301dc04083d956a8 SHA256 d5409cd2d89c6e14ca5d2de7e5eb8590b17c7a77241967ba51d8824ed728a03e
-EBUILD python-2.3.6.ebuild 8164 RMD160 acda677d82daf3458567c315bc0e9681d65fb271 SHA1 c9043a343addae774686791cbdca401d35ddab62 SHA256 d3cad7bac5d3ac4797489483c0914a49c1b022e5e4af9133eee80cf1df4e0736
-EBUILD python-2.4.4-r13.ebuild 10535 RMD160 9e20a3b3209dd4a5be03690524b1d6364a9cd65d SHA1 b516fdf878bd8ba3bde7d9aaaee382add4b83cd7 SHA256 fb5baf2769c426142c342b8b0c1c558db855cbc22914e58e01207d884e1bd781
 EBUILD python-2.4.4-r14.ebuild 10535 RMD160 2ffd582459366ed94366ee2398f03482082d1f1b SHA1 2a02a4188ea4afd2b64a365446b15456219f18f9 SHA256 924509ba7408b306d4b97b5285f5be27e5748197e3d05fb3fe306e93f4aa300a
 EBUILD python-2.4.4-r5.ebuild 10353 RMD160 2e84fa53221be1417bcbfac063fadb8177f7997f SHA1 457badd502adf3e2e82454dde04902e9f930829e SHA256 c2fd3fb136d0855ebf4e92fec8487770b4d1ee1c1f9a93c7a59e012487d45ea4
 EBUILD python-2.4.4-r6.ebuild 10354 RMD160 4237041263cf6516bb1d62b070d92d47dc53fd87 SHA1 392f2af04382fe8db2ea674d54f40a3e5703c48d SHA256 dfae0111133299b0ad1665aeeb9d1b59ef72ad0ba38c1242b600cf709cbea9b6
-EBUILD python-2.5.2-r5.ebuild 10393 RMD160 3f30f15c1e57f6d4f94bbd17ea7b677ef48008f2 SHA1 6a679fae2e8dd011050664b2ed441c749e33b07d SHA256 32e6e432aa851bd92450593547e20aae04dfefc4af4f422ca6e40fcc4882d881
 EBUILD python-2.5.2-r6.ebuild 10394 RMD160 d9e86da6ceb765326ca0963eb5188d66d24541d4 SHA1 bffe6cf4475664546aaf9cdf434572f12c24b336 SHA256 96c7630fdc9ec893e94cf81ab3c8cf824e7fc13e7d8ccedfb7c598891a846b63
 EBUILD python-2.5.2-r7.ebuild 10403 RMD160 d6957668a00bdd185b8eb926d0ebb3c89ddafa1d SHA1 5a04f887875927ae70cf35f0eee0bfafe2bfd008 SHA256 9f81ee73c5dd45588c46aab28608230736128c7e2ebcbf930ca3ac12e57259b8
-MISC ChangeLog 59391 RMD160 9cf3e2483f82eee7f410bfb4a98eebf38f3169ff SHA1 5b563a3218678d2593754efc05df22e7c40d2cc9 SHA256 c43d070c1485312a92736a18b7c16bce888b814079e0c8da4c5af954493584df
-MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+MISC ChangeLog 59833 RMD160 37135adf7ef96ffa53aadf633ebe8d7701bfa625 SHA1 48d363dd559d3a7a86975f00a40790f994df295a SHA256 8b7741ae4cb3dfc6ce76ca8c6a47c75abaa59f26a2fda26a295f99421edd5663
+MISC metadata.xml 490 RMD160 b919b92704616b974d1da46bfea1f03c7ea50330 SHA1 d1901bc18d0aa431b05fccfe13f2f87ab2aa9e18 SHA256 765be0142679faeeaf01cfa489424c3af08ad38ed627e6a7246b4a6f96f2dffa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiqjnAACgkQQU4yORhF8iDhlgCfTDHZwIcSum4bw9nQyQgJcc4+
+ZP0An3xHg4/eoIsgvD6fw5iEjuZ1HArH
+=a3Vp
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/python-2.3.6-disable-failing-tests.patch b/dev-lang/python/files/python-2.3.6-disable-failing-tests.patch
deleted file mode 100644
index 5f71f4f2afaa..000000000000
--- a/dev-lang/python/files/python-2.3.6-disable-failing-tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Lib/test/test_bsddb.py	2008-05-24 16:56:28.000000000 +0300
-+++ Lib/test/test_bsddb.py	2008-05-24 18:16:12.000000000 +0300
-@@ -70,11 +70,11 @@
-             items.append(self.f.next())
-         self.assertSetEquals(items, self.d.items())
- 
--    def test_previous_last_looping(self):
--        items = [self.f.last()]
--        for i in xrange(1, len(self.f)):
--            items.append(self.f.previous())
--        self.assertSetEquals(items, self.d.items())
-+    #def test_previous_last_looping(self):
-+    #    items = [self.f.last()]
-+    #    for i in xrange(1, len(self.f)):
-+    #        items.append(self.f.previous())
-+    #    self.assertSetEquals(items, d.items())
- 
-     def test_set_location(self):
-         self.assertEqual(self.f.set_location('e'), ('e', self.d['e']))
diff --git a/dev-lang/python/files/python-config-2.2 b/dev-lang/python/files/python-config-2.2
deleted file mode 100644
index 056b27125ae9..000000000000
--- a/dev-lang/python/files/python-config-2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/python
-import distutils.sysconfig, string
-print "-lpython2.2 -lm -L/usr/lib/python2.2/config",string.join(string.split(distutils.sysconfig.get_config_var("MODLIBS")))
diff --git a/dev-lang/python/files/python-config-2.3 b/dev-lang/python/files/python-config-2.3
deleted file mode 100644
index abd5a360b797..000000000000
--- a/dev-lang/python/files/python-config-2.3
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/python
-import distutils.sysconfig, string
-print "-lpython2.3 -lm -L/usr/lib/python2.3/config",string.join(string.split(distutils.sysconfig.get_config_var("MODLIBS")))
diff --git a/dev-lang/python/metadata.xml b/dev-lang/python/metadata.xml
index de483c53568f..512ee1105a4e 100644
--- a/dev-lang/python/metadata.xml
+++ b/dev-lang/python/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<use>
+	<flag name="nothreads">Disable threads (DON'T USE THIS UNLESS YOU KNOW WHAT YOU'RE DOING)</flag>
+	<flag name="ucs2">Enable byte size 2 unicode (DON'T USE THIS UNLESS YOU KNOW WHAT YOU'RE DOING)</flag>
+	<flag name="wininst">Install required Windows executables to create an executable installer for MS Windows.</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-lang/python/python-2.3.5-r2.ebuild b/dev-lang/python/python-2.3.5-r2.ebuild
deleted file mode 100644
index 03151bec9052..000000000000
--- a/dev-lang/python/python-2.3.5-r2.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r2.ebuild,v 1.22 2008/05/29 21:29:02 hawking 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 versionator
-
-PYVER_MAJOR=$(get_major_version)
-PYVER_MINOR=$(get_version_component_range 2)
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-S="${WORKDIR}/Python-${PV}"
-DESCRIPTION="A really great language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tar.bz2
-	mirror://gentoo/python-gentoo-patches-${PV}.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.3"
-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 elibc_uclibc"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	!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"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix readline detection problems due to missing termcap (#79013)
-	epatch "${WORKDIR}"/${PV}/2.3-readline.patch
-
-	sed -ie 's/OpenBSD\/3.\[01234/OpenBSD\/3.\[012345/' configure || die "OpenBSD sed failed"
-	# adds /usr/lib/portage/pym to sys.path - liquidx (08 Oct 03)
-	# prepends /usr/lib/portage/pym to sys.path - liquidx (12 Apr 04)
-	epatch "${WORKDIR}"/${PV}/2.3-add_portage_search_path.patch
-	# adds support for PYTHON_DONTCOMPILE shell environment to
-	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch "${WORKDIR}"/${PV}/2.4-gentoo_py_dontcompile.patch
-	epatch "${WORKDIR}"/${PV}/2.4-disable_modules_and_ssl.patch
-	epatch "${WORKDIR}"/${PV}/2.4-mimetypes_apache.patch
-	epatch "${WORKDIR}"/${PV}/2.3-db4.2.patch
-
-	# installs to lib64
-	[ "$(get_libdir)" == "lib64" ] && \
-		epatch "${WORKDIR}"/${PV}/2.3.4-lib64.patch
-
-	# fix os.utime() on hppa. utimes it not supported but unfortunately
-	# reported as working - gmsoft (22 May 04)
-	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i "${S}"/configure
-
-	# add support for struct stat st_flags attribute (bug 94637)
-	epatch "${WORKDIR}"/${PV}/2.3.5-st_flags.patch
-
-	# Fix pcre security bug (bug 104009)
-	epatch "${WORKDIR}"/${PV}/2.3-pcre.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
-
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-	[ "${ARCH}" = "amd64" ] && 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
-
-	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
-
-	# 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/$(get_libdir)/python2.3/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use elibc_uclibc && rm -rf "${D}"/usr/$(get_libdir)/python2.3/{test,bsddb/test}
-		use berkdb || rm -rf "${D}"/usr/$(get_libdir)/python2.3/bsddb
-		use tk || rm -rf "${D}"/usr/$(get_libdir)/python2.3/lib-tk
-	fi
-}
-
-pkg_postrm() {
-	python_makesym
-	python_mod_cleanup /usr/$(get_libdir)/python2.3
-}
-
-pkg_postinst() {
-	local myroot
-	myroot=$(echo $ROOT | sed 's:/$::')
-
-	python_makesym
-	python_mod_optimize
-	python_mod_optimize -x "(site-packages|test)" /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.2/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.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize /usr/lib/portage/pym
-		fi
-	fi
-
-	echo
-	ewarn
-	ewarn "If you have just upgraded from python-2.2.x 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-2.3."
-	ewarn
-	ewarn "Python 2.2 is still installed and can be accessed via /usr/bin/python2.2."
-	ewarn "Portage-2.0.49-r8 and below will continue to use python-2.2.x, so"
-	ewarn "think twice about uninstalling it, otherwise your system will break."
-	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="global mimetools mmap strptime subprocess tcl time urllib urllib2 zipimport"
-
-	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
-
-	elog "Portage skipped the following tests which aren't able to run from emerge:"
-	for test in ${skip_tests} ; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you'd like to run them, you may:"
-	elog "cd /usr/lib/python${PYVER}/test"
-	elog "and run the tests separately."
-}
diff --git a/dev-lang/python/python-2.3.5-r3.ebuild b/dev-lang/python/python-2.3.5-r3.ebuild
deleted file mode 100644
index ecb5e972467d..000000000000
--- a/dev-lang/python/python-2.3.5-r3.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r3.ebuild,v 1.18 2008/05/29 21:29:02 hawking 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 versionator
-
-PYVER_MAJOR=$(get_major_version)
-PYVER_MINOR=$(get_version_component_range 2)
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-S="${WORKDIR}/Python-${PV}"
-DESCRIPTION="A really great language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tar.bz2
-	mirror://gentoo/python-gentoo-patches-${PV}-r1.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.3"
-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 elibc_uclibc"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	!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"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix readline detection problems due to missing termcap (#79013)
-	epatch "${WORKDIR}"/${PV}/2.3-readline.patch
-
-	sed -ie 's/OpenBSD\/3.\[01234/OpenBSD\/3.\[012345/' configure || die "OpenBSD sed failed"
-	# adds /usr/lib/portage/pym to sys.path - liquidx (08 Oct 03)
-	# prepends /usr/lib/portage/pym to sys.path - liquidx (12 Apr 04)
-	epatch "${WORKDIR}"/${PV}/2.3-add_portage_search_path.patch
-	# adds support for PYTHON_DONTCOMPILE shell environment to
-	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch "${WORKDIR}"/${PV}/2.4-gentoo_py_dontcompile.patch
-	epatch "${WORKDIR}"/${PV}/2.4-disable_modules_and_ssl.patch
-	epatch "${WORKDIR}"/${PV}/2.4-mimetypes_apache.patch
-	epatch "${WORKDIR}"/${PV}/2.3-db4.2.patch
-
-	# installs to lib64
-	[ "$(get_libdir)" == "lib64" ] && \
-		epatch "${WORKDIR}"/${PV}/2.3.4-lib64.patch
-
-	# fix os.utime() on hppa. utimes it not supported but unfortunately
-	# reported as working - gmsoft (22 May 04)
-	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i "${S}"/configure
-
-	# add support for struct stat st_flags attribute (bug 94637)
-	epatch "${WORKDIR}"/${PV}/2.3.5-st_flags.patch
-
-	# Fix pcre security bug (bug 104009)
-	epatch "${WORKDIR}"/${PV}/2.3-pcre.patch
-
-	epatch "${WORKDIR}"/${PV}/2.3.5-unicodeobject.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
-
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-	[ "${ARCH}" = "amd64" ] && 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
-
-	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
-
-	# 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/$(get_libdir)/python2.3/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use elibc_uclibc && rm -rf "${D}"/usr/$(get_libdir)/python2.3/{test,bsddb/test}
-		use berkdb || rm -rf "${D}"/usr/$(get_libdir)/python2.3/bsddb
-		use tk || rm -rf "${D}"/usr/$(get_libdir)/python2.3/lib-tk
-	fi
-}
-
-pkg_postrm() {
-	python_makesym
-	python_mod_cleanup /usr/$(get_libdir)/python2.3
-}
-
-pkg_postinst() {
-	local myroot
-	myroot=$(echo $ROOT | sed 's:/$::')
-
-	python_makesym
-	python_mod_optimize
-	python_mod_optimize -x "(site-packages|test)" /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.2/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.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize /usr/lib/portage/pym
-		fi
-	fi
-
-	echo
-	ewarn
-	ewarn "If you have just upgraded from python-2.2.x 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-2.3."
-	ewarn
-	ewarn "Python 2.2 is still installed and can be accessed via /usr/bin/python2.2."
-	ewarn "Portage-2.0.49-r8 and below will continue to use python-2.2.x, so"
-	ewarn "think twice about uninstalling it, otherwise your system will break."
-	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="global mimetools mmap strptime subprocess tcl time urllib urllib2 zipimport"
-
-	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
-
-	elog "Portage skipped the following tests which aren't able to run from emerge:"
-	for test in ${skip_tests} ; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you'd like to run them, you may:"
-	elog "cd /usr/lib/python${PYVER}/test"
-	elog "and run the tests separately."
-}
diff --git a/dev-lang/python/python-2.3.6-r3.ebuild b/dev-lang/python/python-2.3.6-r3.ebuild
deleted file mode 100644
index 22c92930769c..000000000000
--- a/dev-lang/python/python-2.3.6-r3.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r3.ebuild,v 1.12 2008/05/29 21:29:02 hawking 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 autotools eutils flag-o-matic python versionator
-
-PYVER_MAJOR=$(get_major_version)
-PYVER_MINOR=$(get_version_component_range 2)
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-S="${WORKDIR}/Python-${PV}"
-DESCRIPTION="A really great language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tar.bz2
-	mirror://gentoo/python-gentoo-patches-${PV}-r4.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
-IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 doc nocxx nothreads examples elibc_uclibc"
-
-# INFO: 2.3.5 docs are used for python-2.3.6 as upstream writes in their release
-# notes.
-DEPEND=">=sys-libs/zlib-1.1.3
-	!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-2.3.5* )
-		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 app-admin/python-updater"
-
-PROVIDE="virtual/python"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -ie 's/OpenBSD\/3.\[01234/OpenBSD\/3.\[012345/' configure || die "OpenBSD sed failed"
-
-	# fix os.utime() on hppa. utimes it not supported but unfortunately
-	# reported as working - gmsoft (22 May 04)
-	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i "${S}"/configure
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
-	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
-
-	eautoreconf
-}
-
-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
-	filter-ldflags -Wl,--as-needed --as-needed
-
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-	[ "${ARCH}" = "amd64" ] && 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"
-
-	use nothreads \
-		&& myconf="${myconf} --without-threads" \
-		|| myconf="${myconf} --with-threads"
-
-	src_configure
-
-	econf --with-fpectl \
-		--enable-shared \
-		`use_enable ipv6` \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man \
-		--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
-
-	# 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
-
-	if use build ; then
-		rm -rf "${D}"/usr/$(get_libdir)/python2.3/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use elibc_uclibc && rm -rf "${D}"/usr/$(get_libdir)/python2.3/{test,bsddb/test}
-		use berkdb || rm -rf "${D}"/usr/$(get_libdir)/python2.3/bsddb
-		use tk || rm -rf "${D}"/usr/$(get_libdir)/python2.3/lib-tk
-	fi
-
-	if use examples ; then
-		mkdir -p "${D}"/usr/share/doc/${P}/examples
-		cp -r "${S}"/Tools "${D}"/usr/share/doc/${P}/examples
-	fi
-}
-
-pkg_postrm() {
-	python_makesym
-	python_mod_cleanup /usr/$(get_libdir)/python2.3
-}
-
-pkg_postinst() {
-	local myroot
-	myroot=$(echo $ROOT | sed 's:/$::')
-
-	python_makesym
-	python_mod_optimize
-	python_mod_optimize -x "(site-packages|test)" /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.2/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.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize /usr/lib/portage/pym
-		fi
-	fi
-
-	echo
-	ewarn
-	ewarn "If you have just upgraded from an older version of python you"
-	ewarn "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="global mimetools mmap strptime subprocess tcl time urllib urllib2 zipimport"
-
-	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
-
-	elog "Portage skipped the following tests which aren't able to run from emerge:"
-	for test in ${skip_tests} ; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you'd like to run them, you may:"
-	elog "cd /usr/lib/python${PYVER}/test"
-	elog "and run the tests separately."
-}
diff --git a/dev-lang/python/python-2.3.6-r6.ebuild b/dev-lang/python/python-2.3.6-r6.ebuild
deleted file mode 100644
index 3551415e653f..000000000000
--- a/dev-lang/python/python-2.3.6-r6.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r6.ebuild,v 1.12 2008/05/29 21:29:02 hawking 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.
-
-EAPI=1
-
-inherit autotools eutils flag-o-matic python versionator
-
-PYVER_MAJOR=$(get_major_version)
-PYVER_MINOR=$(get_version_component_range 2)
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-S="${WORKDIR}/Python-${PV}"
-DESCRIPTION="A really great language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tar.bz2
-	mirror://gentoo/python-gentoo-patches-${PV}-r7.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.3"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 doc +cxx +threads examples elibc_uclibc"
-
-# INFO: 2.3.5 docs are used for python-2.3.6 as upstream writes in their release
-# notes.
-DEPEND=">=sys-libs/zlib-1.1.3
-	!build? (
-		tk? ( >=dev-lang/tk-8.0 )
-		ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
-		berkdb? ( sys-libs/db:3 )
-		gdbm? ( sys-libs/gdbm )
-		ssl? ( dev-libs/openssl )
-		doc? ( dev-python/python-docs:2.3 )
-		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 app-admin/python-updater"
-
-PROVIDE="virtual/python"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -ie 's/OpenBSD\/3.\[01234/OpenBSD\/3.\[012345/' configure || die "OpenBSD sed failed"
-
-	# fix os.utime() on hppa. utimes it not supported but unfortunately
-	# reported as working - gmsoft (22 May 04)
-	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i "${S}"/configure
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
-	epatch "${FILESDIR}"/${P}-disable-failing-tests.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
-
-	eautoreconf
-}
-
-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
-		# dbm module can link to berkdb or gdbm -- defaults to gdbm when
-		# both are enabled, see #204343
-		use berkdb || use gdbm \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm"
-		use gdbm \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm"
-		use berkdb \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} 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
-	filter-ldflags -Wl,--as-needed --as-needed
-
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-	[ "${ARCH}" = "amd64" ] && 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 cxx ; 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"
-
-	use threads \
-		&& myconf="${myconf} --with-threads" \
-		&& myconf="${myconf} --without-threads"
-
-	src_configure
-
-	econf --with-fpectl \
-		--enable-shared \
-		`use_enable ipv6` \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man \
-		--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
-
-	# 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
-
-	if use build ; then
-		rm -rf "${D}"/usr/$(get_libdir)/python2.3/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use elibc_uclibc && rm -rf "${D}"/usr/$(get_libdir)/python2.3/{test,bsddb/test}
-		use berkdb || rm -rf "${D}"/usr/$(get_libdir)/python2.3/bsddb
-		use tk || rm -rf "${D}"/usr/$(get_libdir)/python2.3/lib-tk
-	fi
-
-	if use examples ; then
-		mkdir -p "${D}"/usr/share/doc/${P}/examples
-		cp -r "${S}"/Tools "${D}"/usr/share/doc/${P}/examples
-	fi
-}
-
-pkg_postrm() {
-	python_makesym
-	python_mod_cleanup /usr/$(get_libdir)/python2.3
-}
-
-pkg_postinst() {
-	local myroot
-	myroot=$(echo $ROOT | sed 's:/$::')
-
-	python_makesym
-	python_mod_optimize
-	python_mod_optimize -x "(site-packages|test)" /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.2/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.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize /usr/lib/portage/pym
-		fi
-	fi
-
-	echo
-	ewarn
-	ewarn "If you have just upgraded from an older version of python you"
-	ewarn "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="global mimetools mmap strptime time urllib urllib2 zipimport"
-
-	# test_pow fails on alpha.
-	# http://bugs.python.org/issue756093
-	[[ ${ARCH} == "alpha" ]] && skip_tests="${skip_tests} pow"
-
-	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
-
-	elog "Portage skipped the following tests which aren't able to run from emerge:"
-	for test in ${skip_tests} ; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you'd like to run them, you may:"
-	elog "cd /usr/lib/python${PYVER}/test"
-	elog "and run the tests separately."
-}
diff --git a/dev-lang/python/python-2.3.6.ebuild b/dev-lang/python/python-2.3.6.ebuild
deleted file mode 100644
index d8058d31dadd..000000000000
--- a/dev-lang/python/python-2.3.6.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6.ebuild,v 1.10 2008/05/29 21:29:02 hawking 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 versionator
-
-PYVER_MAJOR=$(get_major_version)
-PYVER_MINOR=$(get_version_component_range 2)
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-S="${WORKDIR}/Python-${PV}"
-DESCRIPTION="A really great language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tar.bz2
-	mirror://gentoo/python-gentoo-patches-${PV}-r1.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.3"
-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 elibc_uclibc"
-
-# INFO: 2.3.5 docs are used for python-2.3.6 as upstream writes in their release
-# notes.
-DEPEND=">=sys-libs/zlib-1.1.3
-	!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-2.3.5* )
-		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"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix readline detection problems due to missing termcap (#79013)
-	epatch "${WORKDIR}"/${PV}/2.3-readline.patch
-
-	sed -ie 's/OpenBSD\/3.\[01234/OpenBSD\/3.\[012345/' configure || die "OpenBSD sed failed"
-	# adds /usr/lib/portage/pym to sys.path - liquidx (08 Oct 03)
-	# prepends /usr/lib/portage/pym to sys.path - liquidx (12 Apr 04)
-	epatch "${WORKDIR}"/${PV}/2.3-add_portage_search_path.patch
-	# adds support for PYTHON_DONTCOMPILE shell environment to
-	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch "${WORKDIR}"/${PV}/2.4-gentoo_py_dontcompile.patch
-	epatch "${WORKDIR}"/${PV}/2.4-disable_modules_and_ssl.patch
-	epatch "${WORKDIR}"/${PV}/2.4-mimetypes_apache.patch
-	epatch "${WORKDIR}"/${PV}/2.3-db4.2.patch
-
-	# installs to lib64
-	[ "$(get_libdir)" == "lib64" ] && \
-		epatch "${WORKDIR}"/${PV}/2.3.4-lib64.patch
-
-	# fix os.utime() on hppa. utimes it not supported but unfortunately
-	# reported as working - gmsoft (22 May 04)
-	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i "${S}"/configure
-
-	# add support for struct stat st_flags attribute (bug 94637)
-	epatch "${WORKDIR}"/${PV}/2.3.5-st_flags.patch
-
-	# Fix pcre security bug (bug 104009)
-	epatch "${WORKDIR}"/${PV}/2.3-pcre.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
-
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-	[ "${ARCH}" = "amd64" ] && 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
-
-	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
-
-	# 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/$(get_libdir)/python2.3/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use elibc_uclibc && rm -rf "${D}"/usr/$(get_libdir)/python2.3/{test,bsddb/test}
-		use berkdb || rm -rf "${D}"/usr/$(get_libdir)/python2.3/bsddb
-		use tk || rm -rf "${D}"/usr/$(get_libdir)/python2.3/lib-tk
-	fi
-}
-
-pkg_postrm() {
-	python_makesym
-	python_mod_cleanup /usr/$(get_libdir)/python2.3
-}
-
-pkg_postinst() {
-	local myroot
-	myroot=$(echo $ROOT | sed 's:/$::')
-
-	python_makesym
-	python_mod_optimize
-	python_mod_optimize -x "(site-packages|test)" /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.2/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.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize /usr/lib/portage/pym
-		fi
-	fi
-
-	echo
-	ewarn
-	ewarn "If you have just upgraded from python-2.2.x 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-2.3."
-	ewarn
-	ewarn "Python 2.2 is still installed and can be accessed via /usr/bin/python2.2."
-	ewarn "Portage-2.0.49-r8 and below will continue to use python-2.2.x, so"
-	ewarn "think twice about uninstalling it, otherwise your system will break."
-	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="global mimetools mmap strptime subprocess tcl time urllib urllib2 zipimport"
-
-	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
-
-	elog "Portage skipped the following tests which aren't able to run from emerge:"
-	for test in ${skip_tests} ; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you'd like to run them, you may:"
-	elog "cd /usr/lib/python${PYVER}/test"
-	elog "and run the tests separately."
-}
diff --git a/dev-lang/python/python-2.4.4-r13.ebuild b/dev-lang/python/python-2.4.4-r13.ebuild
deleted file mode 100644
index f166f4245b56..000000000000
--- a/dev-lang/python/python-2.4.4-r13.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r13.ebuild,v 1.10 2008/05/29 21:29:02 hawking 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.
-
-EAPI=1
-
-inherit autotools eutils flag-o-matic python multilib versionator toolchain-funcs alternatives
-
-# 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}"
-
-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/python-gentoo-patches-${PV}-r10.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.4"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 doc +cxx +threads examples elibc_uclibc wininst"
-
-# Can't be compiled against db-4.5 Bug #179377
-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:4.4  sys-libs/db:4.3 ) )
-		gdbm? ( sys-libs/gdbm )
-		ssl? ( dev-libs/openssl )
-		doc? ( dev-python/python-docs:2.4 )
-		dev-libs/expat
-	)"
-
-# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
-# NOTE: added blocker to enforce correct merge order for bug 88777. - zmedico
-
-RDEPEND="${DEPEND} build? ( !dev-python/pycrypto )"
-PDEPEND="${DEPEND} app-admin/python-updater"
-
-PROVIDE="virtual/python"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if tc-is-cross-compiler ; then
-		[[ $(python -V 2>&1) != "Python ${PV}" ]] && \
-			die "Crosscompiling requires the same host and build versions."
-		epatch "${FILESDIR}"/python-2.4.4-test-cross.patch
-	else
-		rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
-	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
-
-	# 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 ! use wininst; then
-		# remove microsoft windows executables
-		rm Lib/distutils/command/wininst-*.exe
-	fi
-
-	eautoreconf
-}
-
-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
-		# dbm module can link to berkdb or gdbm -- defaults to gdbm when
-		# both are enabled, see #204343
-		use berkdb || use gdbm \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm"
-		use gdbm \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm"
-		use berkdb \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} 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 cxx ; 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"
-
-	use threads \
-		&& myconf="${myconf} --with-threads" \
-		|| myconf="${myconf} --without-threads"
-
-	src_configure
-
-	if tc-is-cross-compiler ; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-			./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-libc='' \
-		${myconf} || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	src_configure
-	make DESTDIR="${D}" altinstall maninstall || die
-
-	# install our own custom python-config
-	exeinto /usr/bin
-	newexe "${FILESDIR}"/python-config-${PYVER}-r1 python-config-${PYVER}
-
-	# Use correct libdir in python-config
-	dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config-${PYVER}
-
-	if use build ; then
-		rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use elibc_uclibc && rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/{test,bsddb/test}
-		use berkdb || rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/bsddb
-		use tk || rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/lib-tk
-	fi
-
-	# Fix slotted collisions
-	mv "${D}"/usr/bin/pydoc "${D}"/usr/bin/pydoc${PYVER}
-	mv "${D}"/usr/bin/idle "${D}"/usr/bin/idle${PYVER}
-	mv "${D}"/usr/share/man/man1/python.1 \
-		"${D}"/usr/share/man/man1/python${PYVER}.1
-	rm -f "${D}"/usr/bin/smtpd.py
-
-	prep_ml_includes usr/include/python${PYVER}
-
-	# 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
-
-	if use examples ; then
-		mkdir -p "${D}"/usr/share/doc/${P}/examples
-		cp -r "${S}"/Tools "${D}"/usr/share/doc/${P}/examples
-	fi
-
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-}
-
-pkg_postrm() {
-	local mansuffix=$(ecompress --suffix)
-	python_makesym
-	alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/pydoc" "pydoc[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/python-config" \
-								"python-config-[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/share/man/man1/python.1${mansuffix}" \
-								"python[0-9].[0-9].1${mansuffix}"
-
-	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:/$::')
-	local mansuffix=$(ecompress --suffix)
-
-	python_makesym
-	alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/pydoc" "pydoc[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/python-config" \
-								"python-config-[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/share/man/man1/python.1${mansuffix}" \
-								"python[0-9].[0-9].1${mansuffix}"
-
-	python_mod_optimize
-	python_mod_optimize -x "(site-packages|test)" \
-						/usr/lib/python${PYVER}
-	[[ "$(get_libdir)" == "lib" ]] || \
-		python_mod_optimize -x "(site-packages|test)" \
-							/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 /usr/lib/portage/pym
-		fi
-	fi
-
-	echo
-	ewarn
-	ewarn "If you have just upgraded from an older version of python you"
-	ewarn "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() {
-	# Tests won't work when cross compiling
-	if tc-is-cross-compiler ; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# 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="cookielib distutils global hotshot mimetools minidom mmap posix sax strptime subprocess syntax tcl time urllib urllib2"
-
-	# test_pow fails on alpha.
-	# http://bugs.python.org/issue756093
-	[[ ${ARCH} == "alpha" ]] && skip_tests="${skip_tests} pow"
-
-	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
-
-	elog "Portage skipped the following tests which aren't able to run from emerge:"
-	for test in ${skip_tests} ; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you'd like to run them, you may:"
-	elog "cd /usr/lib/python${PYVER}/test"
-	elog "and run the tests separately."
-}
diff --git a/dev-lang/python/python-2.5.2-r5.ebuild b/dev-lang/python/python-2.5.2-r5.ebuild
deleted file mode 100644
index 8e559821d0be..000000000000
--- a/dev-lang/python/python-2.5.2-r5.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r5.ebuild,v 1.8 2008/07/18 13:37:47 tester 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.
-
-EAPI=1
-
-inherit eutils autotools flag-o-matic python multilib versionator toolchain-funcs alternatives libtool
-
-# 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}"
-
-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/python-gentoo-patches-${PV}-r5.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.5"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 sqlite doc +threads examples elibc_uclibc wininst"
-
-# NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes,cjkcodecs}
-#       do not conflict with the ones in python proper. - liquidx
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	!build? (
-		sqlite? ( >=dev-db/sqlite-3 )
-		tk? ( >=dev-lang/tk-8.0 )
-		ncurses? ( >=sys-libs/ncurses-5.2
-					readline? ( >=sys-libs/readline-4.1 ) )
-		berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3
-					sys-libs/db:4.2 ) )
-		gdbm? ( sys-libs/gdbm )
-		ssl? ( dev-libs/openssl )
-		doc? ( dev-python/python-docs:2.5 )
-		dev-libs/expat
-	)"
-
-# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
-# NOTE: added blocker to enforce correct merge order for bug 88777. - zmedico
-
-PDEPEND="${DEPEND} app-admin/python-updater"
-PROVIDE="virtual/python"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if tc-is-cross-compiler ; then
-		[[ $(python -V 2>&1) != "Python ${PV}" ]] && \
-			die "Crosscompiling requires the same host and build versions."
-		epatch "${FILESDIR}"/python-2.4.4-test-cross.patch
-	else
-		rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
-	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
-
-	# 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 ! use wininst; then
-		# remove microsoft windows executables
-		rm Lib/distutils/command/wininst-*.exe
-	fi
-
-	eautoreconf
-}
-
-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 _sqlite3"
-		export PYTHON_DISABLE_SSL=1
-	else
-		# dbm module can link to berkdb or gdbm
-		# defaults to gdbm when both are enabled, #204343
-		local disable
-		use berkdb   || use gdbm || disable="${disable} dbm"
-		use berkdb   || disable="${disable} bsddb"
-		use gdbm     || disable="${disable} gdbm"
-		use ncurses  || disable="${disable} _curses _curses_panel"
-		use readline || disable="${disable} readline"
-		use sqlite   || disable="${disable} sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL=1
-		use tk       || disable="${disable} _tkinter"
-		export PYTHON_DISABLE_MODULES="${disable}"
-	fi
-	einfo "Disabled modules: $PYTHON_DISABLE_MODULES"
-}
-
-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
-
-	# See #228905
-	if [[ $(gcc-major-version) -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	export OPT="${CFLAGS}"
-
-	local myconf
-
-	# 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"
-
-	use threads \
-		&& myconf="${myconf} --with-threads" \
-		|| myconf="${myconf} --without-threads"
-
-	src_configure
-
-	if tc-is-cross-compiler ; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-		./configure || 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 LDFLAGS so we link modules with -lpython2.5 correctly.
-	# Needed on FreeBSD unless python2.5 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		`use_enable ipv6` \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man \
-		--with-libc='' \
-		${myconf} || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	src_configure
-	make DESTDIR="${D}" altinstall maninstall || die
-
-	mv "${D}"/usr/bin/python${PYVER}-config "${D}"/usr/bin/python-config-${PYVER}
-
-	# Fix slotted collisions
-	mv "${D}"/usr/bin/pydoc "${D}"/usr/bin/pydoc${PYVER}
-	mv "${D}"/usr/bin/idle "${D}"/usr/bin/idle${PYVER}
-	mv "${D}"/usr/share/man/man1/python.1 \
-		"${D}"/usr/share/man/man1/python${PYVER}.1
-	rm -f "${D}"/usr/bin/smtpd.py
-
-	# 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
-
-	if use build ; then
-		rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use elibc_uclibc && rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/{test,bsddb/test}
-		use berkdb || rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/bsddb
-		use tk || rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/lib-tk
-	fi
-
-	prep_ml_includes usr/include/python${PYVER}
-
-	# 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
-
-	if use examples ; then
-		mkdir -p "${D}"/usr/share/doc/${P}/examples
-		cp -r "${S}"/Tools "${D}"/usr/share/doc/${P}/examples
-	fi
-
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-}
-
-pkg_postrm() {
-	local mansuffix=$(ecompress --suffix)
-	python_makesym
-	alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/pydoc" "pydoc[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/python-config" \
-								"python-config-[0-9].[0-9]"
-
-	alternatives_auto_makesym "/usr/share/man/man1/python.1${mansuffix}" \
-								"python[0-9].[0-9].1${mansuffix}"
-
-	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:/$::')
-	local mansuffix=$(ecompress --suffix)
-
-	python_makesym
-	alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/pydoc" "pydoc[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/python-config" \
-								"python-config-[0-9].[0-9]"
-
-	alternatives_auto_makesym "/usr/share/man/man1/python.1${mansuffix}" \
-								"python[0-9].[0-9].1${mansuffix}"
-
-	python_mod_optimize
-	python_mod_optimize -x "(site-packages|test)" \
-						/usr/lib/python${PYVER}
-	[[ "$(get_libdir)" == "lib" ]] || \
-		python_mod_optimize -x "(site-packages|test)" \
-							/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 /usr/lib/portage/pym
-		fi
-	fi
-
-	echo
-	ewarn
-	ewarn "If you have just upgraded from an older version of python you will"
-	ewarn "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() {
-	# Tests won't work when cross compiling
-	if tc-is-cross-compiler ; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# 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 posix pyexpat sax strptime subprocess syntax tcl time urllib urllib2 webbrowser xml_etree"
-
-	# test_pow fails on alpha.
-	# http://bugs.python.org/issue756093
-	[[ ${ARCH} == "alpha" ]] && skip_tests="${skip_tests} pow"
-
-	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
-
-	elog "Portage skipped the following tests which aren't able to run from emerge:"
-	for test in ${skip_tests} ; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you'd like to run them, you may:"
-	elog "cd /usr/lib/python${PYVER}/test"
-	elog "and run the tests separately."
-}