Remove old versions.

(Portage version: 2660-svn)

24 files changed, 11 insertions, 2923 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 1a51956806d6..b5ff428ecada 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,16 @@
 # 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.188 2006/02/08 12:11:29 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.189 2006/02/16 18:15:04 marienz Exp $
+
+  16 Feb 2006; Marien Zwart <marienz@gentoo.org> -files/python-config-2.2.1,
+  -files/python-2.2.1-r5-gentoo.diff, -files/python-config-2.2.2,
+  -files/python-2.2.2-tk-8.4.x.patch, -files/python-2.3-xmlrpc.patch,
+  -files/python-2.4-db4.2.patch, -files/python-2.4-lib64.patch,
+  -files/python-2.4.1-readline.patch, -files/python-2.4-libdir.patch,
+  -files/python-2.4-readline.patch, -files/python-2.4-xmlrpc.patch,
+  -python-2.3.4-r1.ebuild, -python-2.3.5.ebuild, -python-2.3.5-r1.ebuild,
+  -python-2.4-r3.ebuild, -python-2.4.1.ebuild, -python-2.4.1-r1.ebuild:
+  Remove old versions.
 
   08 Feb 2006; Marien Zwart <marienz@gentoo.org> python-2.3.5-r2.ebuild,
   python-2.4.2.ebuild, python-2.4.2-r1.ebuild:
diff --git a/dev-lang/python/files/digest-python-2.3.4-r1 b/dev-lang/python/files/digest-python-2.3.4-r1
deleted file mode 100644
index b7cd9dae4d5c..000000000000
--- a/dev-lang/python/files/digest-python-2.3.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a2c089faa2726c142419c03472fc4063 Python-2.3.4.tar.bz2 7189129
diff --git a/dev-lang/python/files/digest-python-2.3.5 b/dev-lang/python/files/digest-python-2.3.5
deleted file mode 100644
index aa7299a5af82..000000000000
--- a/dev-lang/python/files/digest-python-2.3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c12b57c6e0cf8bc676fd9444d71c9e18 Python-2.3.5.tar.bz2 7230000
diff --git a/dev-lang/python/files/digest-python-2.3.5-r1 b/dev-lang/python/files/digest-python-2.3.5-r1
deleted file mode 100644
index aa7299a5af82..000000000000
--- a/dev-lang/python/files/digest-python-2.3.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c12b57c6e0cf8bc676fd9444d71c9e18 Python-2.3.5.tar.bz2 7230000
diff --git a/dev-lang/python/files/digest-python-2.4-r3 b/dev-lang/python/files/digest-python-2.4-r3
deleted file mode 100644
index f096fae6214a..000000000000
--- a/dev-lang/python/files/digest-python-2.4-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 44c2226eff0f3fc1f2fedaa1ce596533 Python-2.4.tar.bz2 7840762
diff --git a/dev-lang/python/files/digest-python-2.4.1 b/dev-lang/python/files/digest-python-2.4.1
deleted file mode 100644
index a3486637687c..000000000000
--- a/dev-lang/python/files/digest-python-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 de3e9a8836fab6df7c7ce545331afeb3 Python-2.4.1.tar.bz2 7847025
diff --git a/dev-lang/python/files/digest-python-2.4.1-r1 b/dev-lang/python/files/digest-python-2.4.1-r1
deleted file mode 100644
index a3486637687c..000000000000
--- a/dev-lang/python/files/digest-python-2.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 de3e9a8836fab6df7c7ce545331afeb3 Python-2.4.1.tar.bz2 7847025
diff --git a/dev-lang/python/files/python-2.2.1-r5-gentoo.diff b/dev-lang/python/files/python-2.2.1-r5-gentoo.diff
deleted file mode 100644
index 7dd90f72f209..000000000000
--- a/dev-lang/python/files/python-2.2.1-r5-gentoo.diff
+++ /dev/null
@@ -1,117 +0,0 @@
-===================================================================
-RCS file: /cvsroot/python/python/dist/src/Lib/os.py,v
-retrieving revision 1.50.8.2
-retrieving revision 1.50.8.4
-diff -u -r1.50.8.2 -r1.50.8.4
---- python/python/dist/src/Lib/os.py	2002/03/16 18:02:20	1.50.8.2
-+++ python/python/dist/src/Lib/os.py	2002/09/03 16:36:59	1.50.8.4
-@@ -298,7 +298,7 @@
-     _execvpe(file, args)
- 
- def execvpe(file, args, env):
--    """execv(file, args, env)
-+    """execvpe(file, args, env)
- 
-     Execute the executable file (which is searched for along $PATH)
-     with argument list args and environment env , replacing the
-@@ -308,8 +308,9 @@
- 
- __all__.extend(["execl","execle","execlp","execlpe","execvp","execvpe"])
- 
--_notfound = None
- def _execvpe(file, args, env=None):
-+    from errno import ENOENT, ENOTDIR
-+
-     if env is not None:
-         func = execve
-         argrest = (args, env)
-@@ -317,7 +318,7 @@
-         func = execv
-         argrest = (args,)
-         env = environ
--    global _notfound
-+
-     head, tail = path.split(file)
-     if head:
-         apply(func, (file,) + argrest)
-@@ -327,30 +328,21 @@
-     else:
-         envpath = defpath
-     PATH = envpath.split(pathsep)
--    if not _notfound:
--        if sys.platform[:4] == 'beos':
--            #  Process handling (fork, wait) under BeOS (up to 5.0)
--            #  doesn't interoperate reliably with the thread interlocking
--            #  that happens during an import.  The actual error we need
--            #  is the same on BeOS for posix.open() et al., ENOENT.
--            try: unlink('/_#.# ## #.#')
--            except error, _notfound: pass
--        else:
--            import tempfile
--            t = tempfile.mktemp()
--            # Exec a file that is guaranteed not to exist
--            try: execv(t, ('blah',))
--            except error, _notfound: pass
--    exc, arg = error, _notfound
-+    saved_exc = None
-+    saved_tb = None
-     for dir in PATH:
-         fullname = path.join(dir, file)
-         try:
-             apply(func, (fullname,) + argrest)
--        except error, (errno, msg):
--            if errno != arg[0]:
--                exc, arg = error, (errno, msg)
--    raise exc, arg
--
-+        except error, e:
-+            tb = sys.exc_info()[2]
-+            if (e.errno != ENOENT and e.errno != ENOTDIR
-+                and saved_exc is None):
-+                saved_exc = e
-+                saved_tb = tb
-+    if saved_exc:
-+        raise error, saved_exc, saved_tb
-+    raise error, e, tb
- 
- # Change environ to automatically call putenv() if it exists
- try:
-
-===================================================================
-RCS file: /cvsroot/python/python/dist/src/setup.py,v
-retrieving revision 1.73.4.4
-retrieving revision 1.73.4.7
-diff -u -r1.73.4.4 -r1.73.4.7
---- python/python/dist/src/setup.py	2002/03/26 13:43:04	1.73.4.4
-+++ python/python/dist/src/setup.py	2002/08/08 19:52:42	1.73.4.7
-@@ -273,8 +273,6 @@
-         exts.append( Extension('pwd', ['pwdmodule.c']) )
-         # grp(3)
-         exts.append( Extension('grp', ['grpmodule.c']) )
--        # posix (UNIX) errno values
--        exts.append( Extension('errno', ['errnomodule.c']) )
-         # select(2); not on ancient System V
-         exts.append( Extension('select', ['selectmodule.c']) )
-
-===================================================================
-RCS file: /cvsroot/python/python/dist/src/Modules/Setup.dist,v
-retrieving revision 1.24
-retrieving revision 1.24.10.2
-diff -u -r1.24 -r1.24.10.2
---- python/python/dist/src/Modules/Setup.dist	2001/10/17 13:46:28	1.24
-+++ python/python/dist/src/Modules/Setup.dist	2002/08/08 19:52:42	1.24.10.2
-@@ -97,6 +97,7 @@
- # setup.py script in the root of the Python source tree.
- 
- posix posixmodule.c		# posix (UNIX) system calls
-+errno errnomodule.c		# posix (UNIX) errno values
- _sre _sre.c			# Fredrik Lundh's new regular expressions
- new newmodule.c			# Tommy Burnette's 'new' module
- 
-@@ -166,7 +167,6 @@
- #fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
- #pwd pwdmodule.c		# pwd(3) 
- #grp grpmodule.c		# grp(3)
--#errno errnomodule.c	# posix (UNIX) errno values
- #select selectmodule.c	# select(2); not on ancient System V
-
diff --git a/dev-lang/python/files/python-2.2.2-tk-8.4.x.patch b/dev-lang/python/files/python-2.2.2-tk-8.4.x.patch
deleted file mode 100644
index 0dc581cb630b..000000000000
--- a/dev-lang/python/files/python-2.2.2-tk-8.4.x.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-===================================================================
-RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/Tkinter.py,v
-retrieving revision 1.160.10.2
-retrieving revision 1.160.10.3
-diff -u -r1.160.10.2 -r1.160.10.3
---- python/python/dist/src/Lib/lib-tk/Tkinter.py	2002/08/23 15:27:52	1.160.10.2
-+++ python/python/dist/src/Lib/lib-tk/Tkinter.py	2003/03/29 09:48:12	1.160.10.3
-@@ -1024,38 +1024,54 @@
-         """Internal function."""
-         if len(args) != len(self._subst_format): return args
-         getboolean = self.tk.getboolean
-+
-         getint = int
-+        def getint_event(s):
-+            """Tk changed behavior in 8.4.2, returning "??" rather more often."""
-+            try:
-+                return int(s)
-+            except ValueError:
-+                return s
-+
-         nsign, b, f, h, k, s, t, w, x, y, A, E, K, N, W, T, X, Y, D = args
-         # Missing: (a, c, d, m, o, v, B, R)
-         e = Event()
-+        # serial field: valid vor all events
-+        # number of button: ButtonPress and ButtonRelease events only
-+        # height field: Configure, ConfigureRequest, Create,
-+        # ResizeRequest, and Expose events only
-+        # keycode field: KeyPress and KeyRelease events only
-+        # time field: "valid for events that contain a time field"
-+        # width field: Configure, ConfigureRequest, Create, ResizeRequest,
-+        # and Expose events only
-+        # x field: "valid for events that contain a x field"
-+        # y field: "valid for events that contain a y field"
-+        # keysym as decimal: KeyPress and KeyRelease events only
-+        # x_root, y_root fields: ButtonPress, ButtonRelease, KeyPress,
-+        # KeyRelease,and Motion events
-         e.serial = getint(nsign)
--        e.num = getint(b)
-+        e.num = getint_event(b)
-         try: e.focus = getboolean(f)
-         except TclError: pass
--        e.height = getint(h)
--        e.keycode = getint(k)
--        # For Visibility events, event state is a string and
--        # not an integer:
--        try:
--            e.state = getint(s)
--        except ValueError:
--            e.state = s
--        e.time = getint(t)
--        e.width = getint(w)
--        e.x = getint(x)
--        e.y = getint(y)
-+        e.height = getint_event(h)
-+        e.keycode = getint_event(k)
-+        e.state = getint_event(s)
-+        e.time = getint_event(t)
-+        e.width = getint_event(w)
-+        e.x = getint_event(x)
-+        e.y = getint_event(y)
-         e.char = A
-         try: e.send_event = getboolean(E)
-         except TclError: pass
-         e.keysym = K
--        e.keysym_num = getint(N)
-+        e.keysym_num = getint_event(N)
-         e.type = T
-         try:
-             e.widget = self._nametowidget(W)
-         except KeyError:
-             e.widget = W
--        e.x_root = getint(X)
--        e.y_root = getint(Y)
-+        e.x_root = getint_event(X)
-+        e.y_root = getint_event(Y)
-         try:
-             e.delta = getint(D)
-         except ValueError:
diff --git a/dev-lang/python/files/python-2.3-xmlrpc.patch b/dev-lang/python/files/python-2.3-xmlrpc.patch
deleted file mode 100644
index 61f61f2d8391..000000000000
--- a/dev-lang/python/files/python-2.3-xmlrpc.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -c -r1.7.8.1 SimpleXMLRPCServer.py
-*** Lib/SimpleXMLRPCServer.py	3 Oct 2004 23:23:00 -0000	1.7.8.1
---- Lib/SimpleXMLRPCServer.py	3 Feb 2005 05:33:55 -0000
-***************
-*** 107,120 ****
-  import types
-  import os
-  
-! def resolve_dotted_attribute(obj, attr):
-      """resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
-  
-      Resolves a dotted attribute name to an object.  Raises
-      an AttributeError if any attribute in the chain starts with a '_'.
-      """
-  
-!     for i in attr.split('.'):
-          if i.startswith('_'):
-              raise AttributeError(
-                  'attempt to access private attribute "%s"' % i
---- 107,128 ----
-  import types
-  import os
-  
-! def resolve_dotted_attribute(obj, attr, allow_dotted_names=True):
-      """resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
-  
-      Resolves a dotted attribute name to an object.  Raises
-      an AttributeError if any attribute in the chain starts with a '_'.
-+ 
-+     If the optional allow_dotted_names argument is false, dots are not
-+     supported and this function operates similar to getattr(obj, attr).
-      """
-  
-!     if allow_dotted_names:
-!         attrs = attr.split('.')
-!     else:
-!         attrs = [attr]
-! 
-!     for i in attrs:
-          if i.startswith('_'):
-              raise AttributeError(
-                  'attempt to access private attribute "%s"' % i
-***************
-*** 156,162 ****
-          self.funcs = {}
-          self.instance = None
-  
-!     def register_instance(self, instance):
-          """Registers an instance to respond to XML-RPC requests.
-  
-          Only one instance can be installed at a time.
---- 164,170 ----
-          self.funcs = {}
-          self.instance = None
-  
-!     def register_instance(self, instance, allow_dotted_names=False):
-          """Registers an instance to respond to XML-RPC requests.
-  
-          Only one instance can be installed at a time.
-***************
-*** 174,182 ****
---- 182,204 ----
-  
-          If a registered function matches a XML-RPC request, then it
-          will be called instead of the registered instance.
-+ 
-+         If the optional allow_dotted_names argument is true and the
-+         instance does not have a _dispatch method, method names
-+         containing dots are supported and resolved, as long as none of
-+         the name segments start with an '_'.
-+ 
-+             *** SECURITY WARNING: ***
-+ 
-+             Enabling the allow_dotted_names options allows intruders
-+             to access your module's global variables and may allow
-+             intruders to execute arbitrary code on your machine.  Only
-+             use this option on a secure, closed network.
-+ 
-          """
-  
-          self.instance = instance
-+         self.allow_dotted_names = allow_dotted_names
-  
-      def register_function(self, function, name = None):
-          """Registers a function to respond to XML-RPC requests.
-***************
-*** 295,301 ****
-                  try:
-                      method = resolve_dotted_attribute(
-                                  self.instance,
-!                                 method_name
-                                  )
-                  except AttributeError:
-                      pass
---- 317,324 ----
-                  try:
-                      method = resolve_dotted_attribute(
-                                  self.instance,
-!                                 method_name,
-!                                 self.allow_dotted_names
-                                  )
-                  except AttributeError:
-                      pass
-***************
-*** 374,380 ****
-                      try:
-                          func = resolve_dotted_attribute(
-                              self.instance,
-!                             method
-                              )
-                      except AttributeError:
-                          pass
---- 397,404 ----
-                      try:
-                          func = resolve_dotted_attribute(
-                              self.instance,
-!                             method,
-!                             self.allow_dotted_names
-                              )
-                      except AttributeError:
-                          pass
diff --git a/dev-lang/python/files/python-2.4-db4.2.patch b/dev-lang/python/files/python-2.4-db4.2.patch
deleted file mode 100644
index fccbd5987751..000000000000
--- a/dev-lang/python/files/python-2.4-db4.2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- setup.py.old	2004-02-10 22:22:12.028012888 +0000
-+++ setup.py	2004-02-10 22:24:17.751899952 +0000
-@@ -497,14 +497,8 @@
-                                 '/opt/sfw',
-                                 '/sw/lib',
-                                 ),
--                    'incdirs': ('/usr/local/BerkeleyDB.4.2/include',
--                                '/usr/local/include/db42',
--                                '/usr/local/BerkeleyDB.4.1/include',
--                                '/usr/local/include/db41',
--                                '/usr/local/BerkeleyDB.4.0/include',
--                                '/usr/local/include/db4',
--                                '/opt/sfw/include/db4',
--                                '/sw/include/db4',
-+                    'incdirs': ('/usr/include/db4.2',
-+                                '/usr/include/db4.1',
-                                 '/usr/include/db4',
-                                 )},
-             'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db3',),
diff --git a/dev-lang/python/files/python-2.4-lib64.patch b/dev-lang/python/files/python-2.4-lib64.patch
deleted file mode 100644
index c3e2c4ffcca9..000000000000
--- a/dev-lang/python/files/python-2.4-lib64.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-diff -Nru Python-2.4.old/Lib/distutils/command/install.py Lib/distutils/command/install.py
---- Python-2.4.old/Lib/distutils/command/install.py	2004-08-14 21:38:57.318696000 -0400
-+++ Lib/distutils/command/install.py	2004-08-14 21:39:41.285012104 -0400
-@@ -39,14 +39,14 @@
- INSTALL_SCHEMES = {
-     'unix_prefix': {
-         'purelib': '$base/lib/python$py_version_short/site-packages',
--        'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
-         'headers': '$base/include/python$py_version_short/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-     'unix_home': {
-         'purelib': '$base/lib/python',
--        'platlib': '$base/lib/python',
-+        'platlib': '$base/lib64/python',
-         'headers': '$base/include/python/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
-diff -Nru Python-2.4.old/Lib/distutils/sysconfig.py Lib/distutils/sysconfig.py
---- Python-2.4.old/Lib/distutils/sysconfig.py	2004-08-14 21:38:57.367688552 -0400
-+++ Lib/distutils/sysconfig.py	2004-08-14 21:39:41.300009824 -0400
-@@ -99,8 +99,12 @@
-         prefix = plat_specific and EXEC_PREFIX or PREFIX
- 
-     if os.name == "posix":
-+        if plat_specific or standard_lib:
-+            lib = "lib64"
-+        else:
-+            lib = "lib"
-         libpython = os.path.join(prefix,
--                                 "lib", "python" + get_python_version())
-+                                 lib, "python" + get_python_version())
-         if standard_lib:
-             return libpython
-         else:
-diff -Nru Lib/site.py.old Lib/site.py
---- Lib/site.py.old     2005-01-05 10:50:32.642936080 -0800
-+++ Lib/site.py 2005-01-05 10:54:44.698617792 -0800
-@@ -179,9 +179,14 @@
-                 sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
-             elif os.sep == '/':
-                 sitedirs = [os.path.join(prefix,
-+                                         "lib64",
-+                                         "python" + sys.version[:3],
-+                                         "site-packages"),
-+                            os.path.join(prefix,
-                                          "lib",
-                                          "python" + sys.version[:3],
-                                          "site-packages"),
-+                                                       os.path.join(prefix, "lib64", "site-python"),
-                             os.path.join(prefix, "lib", "site-python")]
-                 sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs
-             else:
-diff -Nru Python-2.4.old/Makefile.pre.in Makefile.pre.in
---- Python-2.4.old/Makefile.pre.in	2004-08-14 21:39:00.506211424 -0400
-+++ Makefile.pre.in	2004-08-14 21:39:41.341003592 -0400
-@@ -79,11 +79,11 @@
- 
- # Expanded directories
- BINDIR=		$(exec_prefix)/bin
--LIBDIR=		$(exec_prefix)/lib
-+LIBDIR=		$(exec_prefix)/lib64
- MANDIR=		@mandir@
- INCLUDEDIR=	@includedir@
- CONFINCLUDEDIR=	$(exec_prefix)/include
--SCRIPTDIR=	$(prefix)/lib
-+SCRIPTDIR=	$(prefix)/lib64
- 
- # Detailed destination directories
- BINLIBDEST=	$(LIBDIR)/python$(VERSION)
-diff -Nru Python-2.4.old/Modules/getpath.c Modules/getpath.c
---- Modules/Setup.dist.old	2005-01-05 11:59:12.421634520 -0800
-+++ Modules/Setup.dist	2005-01-05 12:00:58.292539696 -0800
-@@ -325,7 +325,7 @@
- # *** Uncomment and edit to reflect your Tcl/Tk versions:
- #	-ltk8.2 -ltcl8.2 \
- # *** Uncomment and edit to reflect where your X11 libraries are:
--#	-L/usr/X11R6/lib \
-+ 	-L/usr/X11R6/lib64 \
- # *** Or uncomment this for Solaris:
- #	-L/usr/openwin/lib \
- # *** Uncomment these for TOGL extension only:
-@@ -396,7 +396,7 @@
- #DB=/usr/local/BerkeleyDB.4.0
- #DBLIBVER=4.0
- #DBINC=$(DB)/include
--#DBLIB=$(DB)/lib
-+DBLIB=$(DB)/lib64
- #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
- 
- # Historical Berkeley DB 1.85
-@@ -442,7 +442,7 @@
- # Andrew Kuchling's zlib module.
- # This require zlib 1.1.3 (or later).
- # See http://www.gzip.org/zlib/
--#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
- 
- # Interface to the Expat XML parser
- #
---- Python-2.4.old/Modules/getpath.c	2004-08-14 21:39:00.750174336 -0400
-+++ Modules/getpath.c	2004-08-14 21:39:41.319006936 -0400
-@@ -112,8 +112,8 @@
- #endif
- 
- #ifndef PYTHONPATH
--#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
--              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
-+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
-+              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
- #endif
- 
- #ifndef LANDMARK
-@@ -124,7 +124,7 @@
- static char exec_prefix[MAXPATHLEN+1];
- static char progpath[MAXPATHLEN+1];
- static char *module_search_path = NULL;
--static char lib_python[] = "lib/python" VERSION;
-+static char lib_python[] = "lib64/python" VERSION;
- 
- static void
- reduce(char *dir)
-@@ -492,7 +492,7 @@
-     }
-     else
-         strncpy(zip_path, PREFIX, MAXPATHLEN);
--    joinpath(zip_path, "lib/python00.zip");
-+    joinpath(zip_path, "lib64/python00.zip");
-     bufsz = strlen(zip_path);	/* Replace "00" with version */
-     zip_path[bufsz - 6] = VERSION[0];
-     zip_path[bufsz - 5] = VERSION[2];
-@@ -502,7 +502,7 @@
-             fprintf(stderr,
-                 "Could not find platform dependent libraries <exec_prefix>\n");
-         strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
--        joinpath(exec_prefix, "lib/lib-dynload");
-+        joinpath(exec_prefix, "lib64/lib-dynload");
-     }
-     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
-
-diff -Nru setup.py.old setup.py
---- setup.py.old	2005-01-05 12:05:34.809502728 -0800
-+++ setup.py	2005-01-05 12:14:29.522214040 -0800
-@@ -247,7 +247,7 @@
-     def detect_modules(self):
-         global disable_ssl
-         # Ensure that /usr/local is always used
--        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
-         add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- 
-         # Add paths to popular package managers on OS X/darwin
-@@ -437,11 +437,11 @@
-             elif self.compiler.find_library_file(lib_dirs, 'curses'):
-                 readline_libs.append('curses')
-             elif self.compiler.find_library_file(lib_dirs +
--                                               ['/usr/lib/termcap'],
-+                                               ['/usr/lib64/termcap'],
-                                                'termcap'):
-                 readline_libs.append('termcap')
-             exts.append( Extension('readline', ['readline.c'],
--                                   library_dirs=['/usr/lib/termcap'],
-+                                   library_dirs=['/usr/lib64/termcap'],
-                                    libraries=readline_libs) )
-         if platform not in ['mac']:
-             # crypt module.
-@@ -470,8 +470,8 @@
-             if krb5_h:
-                 ssl_incs += krb5_h
-         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
--                                     ['/usr/local/ssl/lib',
--                                      '/usr/contrib/ssl/lib/'
-+                                     ['/usr/local/ssl/lib64',
-+                                      '/usr/contrib/ssl/lib64/'
-                                      ] )
- 
-         if (ssl_incs is not None and
-@@ -502,23 +502,23 @@
-         # order you wish to search - e.g., search for db4 before db3
-         db_try_this = {
-             'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
--                    'libdirs': ('/usr/local/BerkeleyDB.4.2/lib',
--                                '/usr/local/BerkeleyDB.4.1/lib',
--                                '/usr/local/BerkeleyDB.4.0/lib',
--                                '/usr/local/lib',
-+                    'libdirs': ('/usr/local/BerkeleyDB.4.2/lib64',
-+                                '/usr/local/BerkeleyDB.4.1/lib64',
-+                                '/usr/local/BerkeleyDB.4.0/lib64',
-+                                '/usr/local/lib64',
-                                 '/opt/sfw',
--                                '/sw/lib',
-+                                '/sw/libi64',
-                                 ),
-                     'incdirs': ('/usr/include/db4.2',
-                                 '/usr/include/db4.1',
-                                 '/usr/include/db4',
-                                 )},
-             'db3': {'libs': ('db-3.3', 'db-3.2', 'db3',),
--                    'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
--                                '/usr/local/BerkeleyDB.3.2/lib',
--                                '/usr/local/lib',
--                                '/opt/sfw/lib',
--                                '/sw/lib',
-+                    'libdirs': ('/usr/local/BerkeleyDB.3.3/lib64',
-+                                '/usr/local/BerkeleyDB.3.2/lib64',
-+                                '/usr/local/lib64',
-+                                '/opt/sfw/lib64',
-+                                '/sw/lib64',
-                                 ),
-                     'incdirs': ('/usr/local/BerkeleyDB.3.3/include',
-                                 '/usr/local/BerkeleyDB.3.2/include',
-@@ -1000,11 +1000,11 @@
-             added_lib_dirs.append('/usr/X11R6/lib')
-         elif os.path.exists('/usr/X11R5/include'):
-             include_dirs.append('/usr/X11R5/include')
--            added_lib_dirs.append('/usr/X11R5/lib')
-+            added_lib_dirs.append('/usr/X11R5/lib64')
-         else:
-             # Assume default location for X11
-             include_dirs.append('/usr/X11/include')
--            added_lib_dirs.append('/usr/X11/lib')
-+            added_lib_dirs.append('/usr/X11/lib64')
- 
-         # If Cygwin, then verify that X is installed before proceeding
-         if platform == 'cygwin':
diff --git a/dev-lang/python/files/python-2.4-libdir.patch b/dev-lang/python/files/python-2.4-libdir.patch
deleted file mode 100644
index d60605c4416d..000000000000
--- a/dev-lang/python/files/python-2.4-libdir.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -Naurp Python-2.4.orig/Lib/distutils/command/install.py Python-2.4/Lib/distutils/command/install.py
---- Python-2.4.orig/Lib/distutils/command/install.py	2004-11-10 14:23:15.000000000 -0800
-+++ Python-2.4/Lib/distutils/command/install.py	2005-02-07 12:13:14.000000000 -0800
-@@ -39,14 +39,14 @@ else:
- INSTALL_SCHEMES = {
-     'unix_prefix': {
-         'purelib': '$base/lib/python$py_version_short/site-packages',
--        'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+        'platlib': '$platbase/@@GENTOO_LIBDIR@@/python$py_version_short/site-packages',
-         'headers': '$base/include/python$py_version_short/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-     'unix_home': {
-         'purelib': '$base/lib/python',
--        'platlib': '$base/lib/python',
-+        'platlib': '$base/@@GENTOO_LIBDIR@@/python',
-         'headers': '$base/include/python/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
-diff -Naurp Python-2.4.orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/sysconfig.py
---- Python-2.4.orig/Lib/distutils/sysconfig.py	2004-10-13 08:54:16.000000000 -0700
-+++ Python-2.4/Lib/distutils/sysconfig.py	2005-02-07 12:16:17.000000000 -0800
-@@ -99,8 +99,12 @@ def get_python_lib(plat_specific=0, stan
-         prefix = plat_specific and EXEC_PREFIX or PREFIX
- 
-     if os.name == "posix":
-+        if plat_specific:
-+            lib = "@@GENTOO_LIBDIR@@"
-+        else:
-+            lib = "lib"
-         libpython = os.path.join(prefix,
--                                 "lib", "python" + get_python_version())
-+                                 lib, "python" + get_python_version())
-         if standard_lib:
-             return libpython
-         else:
---- ./Lib/site.py	2005-03-17 09:55:19.295156312 -0800
-+++ ./orgLib/site.py	2005-03-17 09:59:42.009217704 -0800
-@@ -179,10 +179,20 @@
-                 sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
-             elif os.sep == '/':
-                 sitedirs = [os.path.join(prefix,
-+                                         "@@GENTOO_LIBDIR@@",
-+                                         "python" + sys.version[:3],
-+                                         "site-packages"),
-+                            os.path.join(prefix,
-                                          "lib",
-                                          "python" + sys.version[:3],
-                                          "site-packages"),
-+                            os.path.join(prefix, "lib64", "site-python"),
-                             os.path.join(prefix, "lib", "site-python")]
-+                tmp_sitedirs = []
-+                for sdir in sitedirs:
-+                    if sdir not in tmp_sitedirs:
-+                        tmp_sitedirs.append(sdir)
-+                sitedirs = tmp_sitedirs 
-                 sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs
-             else:
-                 sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
-diff -Naurp Python-2.4.orig/Makefile.pre.in Python-2.4/Makefile.pre.in
---- Python-2.4.orig/Makefile.pre.in	2004-09-26 10:26:55.000000000 -0700
-+++ Python-2.4/Makefile.pre.in	2005-02-07 12:18:39.000000000 -0800
-@@ -79,7 +79,7 @@ exec_prefix=	@exec_prefix@
- 
- # Expanded directories
- BINDIR=		$(exec_prefix)/bin
--LIBDIR=		$(exec_prefix)/lib
-+LIBDIR=		$(exec_prefix)/@@GENTOO_LIBDIR@@
- MANDIR=		@mandir@
- INCLUDEDIR=	@includedir@
- CONFINCLUDEDIR=	$(exec_prefix)/include
-diff -Naurp Python-2.4.orig/Modules/Setup.dist Python-2.4/Modules/Setup.dist
---- Python-2.4.orig/Modules/Setup.dist	2004-08-31 06:50:12.000000000 -0700
-+++ Python-2.4/Modules/Setup.dist	2005-02-07 12:19:48.000000000 -0800
-@@ -325,7 +325,7 @@ GLHACK=-Dclear=__GLclear
- # *** Uncomment and edit to reflect your Tcl/Tk versions:
- #	-ltk8.2 -ltcl8.2 \
- # *** Uncomment and edit to reflect where your X11 libraries are:
--#	-L/usr/X11R6/lib \
-+# 	-L/usr/X11R6/lib \
- # *** Or uncomment this for Solaris:
- #	-L/usr/openwin/lib \
- # *** Uncomment these for TOGL extension only:
-@@ -396,7 +396,7 @@ GLHACK=-Dclear=__GLclear
- #DB=/usr/local/BerkeleyDB.4.0
- #DBLIBVER=4.0
- #DBINC=$(DB)/include
--#DBLIB=$(DB)/lib
-+DBLIB=$(DB)/@@GENTOO_LIBDIR@@
- #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
- 
- # Historical Berkeley DB 1.85
-@@ -442,7 +442,7 @@ GLHACK=-Dclear=__GLclear
- # Andrew Kuchling's zlib module.
- # This require zlib 1.1.3 (or later).
- # See http://www.gzip.org/zlib/
--#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/@@GENTOO_LIBDIR@@ -lz
- 
- # Interface to the Expat XML parser
- #
-diff -Naurp Python-2.4.orig/Modules/getpath.c Python-2.4/Modules/getpath.c
---- Python-2.4.orig/Modules/getpath.c	2004-08-07 18:00:47.000000000 -0700
-+++ Python-2.4/Modules/getpath.c	2005-02-07 12:22:15.137580048 -0800
-@@ -113,7 +113,7 @@
- 
- #ifndef PYTHONPATH
- #define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
--              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
-+              EXEC_PREFIX "/@@GENTOO_LIBDIR@@/python" VERSION "/lib-dynload"
- #endif
- 
- #ifndef LANDMARK
-@@ -525,7 +525,7 @@ calculate_path(void)
-             fprintf(stderr,
-                 "Could not find platform dependent libraries <exec_prefix>\n");
-         strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
--        joinpath(exec_prefix, "lib/lib-dynload");
-+        joinpath(exec_prefix, "@@GENTOO_LIBDIR@@/lib-dynload");
-     }
-     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
- 
-diff -Naurp Python-2.4.orig/setup.py Python-2.4/setup.py
---- Python-2.4.orig/setup.py	2005-02-07 12:11:30.000000000 -0800
-+++ Python-2.4/setup.py	2005-02-07 12:25:21.746978894 -0800
-@@ -248,6 +248,7 @@ class PyBuildExt(build_ext):
-         global disable_ssl
-         # Ensure that /usr/local is always used
-         add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+        add_dir_to_list(self.compiler.library_dirs, '/usr/local/@@GENTOO_LIBDIR@@')
-         add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- 
-         # Add paths to popular package managers on OS X/darwin
-@@ -274,7 +275,7 @@ class PyBuildExt(build_ext):
-         # if a file is found in one of those directories, it can
-         # be assumed that no additional -I,-L directives are needed.
-         lib_dirs = self.compiler.library_dirs + [
--            '/lib64', '/usr/lib64',
-+            '/@@GENTOO_LIBDIR@@', '/usr/@@GENTOO_LIBDIR@@',
-             '/lib', '/usr/lib',
-             ]
-         inc_dirs = self.compiler.include_dirs + ['/usr/include']
-@@ -437,11 +438,11 @@ class PyBuildExt(build_ext):
-             elif self.compiler.find_library_file(lib_dirs, 'curses'):
-                 readline_libs.append('curses')
-             elif self.compiler.find_library_file(lib_dirs +
--                                               ['/usr/lib/termcap'],
-+                                               ['/usr/@@GENTOO_LIBDIR@@/termcap'],
-                                                'termcap'):
-                 readline_libs.append('termcap')
-             exts.append( Extension('readline', ['readline.c'],
--                                   library_dirs=['/usr/lib/termcap'],
-+                                   library_dirs=['/usr/@@GENTOO_LIBDIR@@/termcap'],
-                                    libraries=readline_libs) )
-         if platform not in ['mac']:
-             # crypt module.
-@@ -507,7 +508,7 @@ class PyBuildExt(build_ext):
-                                 '/usr/local/BerkeleyDB.4.0/lib',
-                                 '/usr/local/lib',
-                                 '/opt/sfw',
--                                '/sw/lib',
-+                                '/sw/libi64',
-                                 ),
-                     'incdirs': ('/usr/include/db4.2',
-                                 '/usr/include/db4.1',
-@@ -996,7 +997,7 @@ class PyBuildExt(build_ext):
-             added_lib_dirs.append('/usr/openwin/lib')
-         elif os.path.exists('/usr/X11R6/include'):
-             include_dirs.append('/usr/X11R6/include')
--            added_lib_dirs.append('/usr/X11R6/lib64')
-+            added_lib_dirs.append('/usr/X11R6/lib')
-             added_lib_dirs.append('/usr/X11R6/lib')
-         elif os.path.exists('/usr/X11R5/include'):
-             include_dirs.append('/usr/X11R5/include')
diff --git a/dev-lang/python/files/python-2.4-readline.patch b/dev-lang/python/files/python-2.4-readline.patch
deleted file mode 100644
index 7469b577979c..000000000000
--- a/dev-lang/python/files/python-2.4-readline.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-diff -up Python-2.4/configure Python-2.4.new/configure
---- Python-2.4/configure	2004-11-07 01:24:12.000000000 +0000
-+++ Python-2.4.new/configure	2005-04-20 17:35:32.380494843 +0100
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.474 .
-+# From configure.in Revision: 1.475 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.59 for python 2.4.
- #
-@@ -19268,6 +19268,217 @@ _ACEOF
- 
- fi
- 
-+# what library does readline need to be linked with
-+READLINE_SHARED_LIBADD=""
-+echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5
-+echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6
-+if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lncurses  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char tgetent ();
-+int
-+main ()
-+{
-+tgetent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_ncurses_tgetent=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_ncurses_tgetent=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5
-+echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6
-+if test $ac_cv_lib_ncurses_tgetent = yes; then
-+  READLINE_SHARED_LIBADD="-lncurses"
-+else
-+  echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5
-+echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6
-+if test "${ac_cv_lib_curses_tgetent+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcurses  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char tgetent ();
-+int
-+main ()
-+{
-+tgetent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_curses_tgetent=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_curses_tgetent=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5
-+echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6
-+if test $ac_cv_lib_curses_tgetent = yes; then
-+  READLINE_SHARED_LIBADD="-lcurses"
-+else
-+  echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
-+echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6
-+if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltermcap  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char tgetent ();
-+int
-+main ()
-+{
-+tgetent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_termcap_tgetent=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_termcap_tgetent=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
-+echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6
-+if test $ac_cv_lib_termcap_tgetent = yes; then
-+  READLINE_SHARED_LIBADD="-ltermcap"
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
- # check for readline 2.1
- echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
- echo $ECHO_N "checking for rl_callback_handler_install in -lreadline... $ECHO_C" >&6
-@@ -19275,7 +19486,7 @@ if test "${ac_cv_lib_readline_rl_callbac
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline -ltermcap $LIBS"
-+LIBS="-lreadline $READLINE_SHARED_LIBADD $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -19407,7 +19618,7 @@ if test "${ac_cv_lib_readline_rl_pre_inp
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline -ltermcap $LIBS"
-+LIBS="-lreadline $READLINE_SHARED_LIBADD $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -19481,7 +19692,7 @@ if test "${ac_cv_lib_readline_rl_complet
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline -ltermcap $LIBS"
-+LIBS="-lreadline $READLINE_SHARED_LIBADD $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-diff -up Python-2.4/configure.in Python-2.4.new/configure.in
---- Python-2.4/configure.in	2004-11-07 01:24:11.000000000 +0000
-+++ Python-2.4.new/configure.in	2005-04-20 17:35:27.295317599 +0100
-@@ -2822,10 +2822,18 @@ then
-   [Define this if you have flockfile(), getc_unlocked(), and funlockfile()])
- fi
- 
-+# what library does readline need to be linked with
-+READLINE_SHARED_LIBADD=""
-+AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"],
-+    AC_CHECK_LIB(curses, tgetent, [READLINE_SHARED_LIBADD="-lcurses"],
-+       AC_CHECK_LIB(termcap, tgetent, [READLINE_SHARED_LIBADD="-ltermcap"])
-+       )
-+    )
-+
- # check for readline 2.1
- AC_CHECK_LIB(readline, rl_callback_handler_install,
- 	AC_DEFINE(HAVE_RL_CALLBACK, 1,
--        [Define if you have readline 2.1]), , -ltermcap)
-+        [Define if you have readline 2.1]), , $READLINE_SHARED_LIBADD)
- 
- # check for readline 2.2
- AC_TRY_CPP([#include <readline/readline.h>],
-@@ -2841,12 +2849,12 @@ fi
- # check for readline 4.0
- AC_CHECK_LIB(readline, rl_pre_input_hook,
- 	AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK, 1,
--        [Define if you have readline 4.0]), , -ltermcap)
-+        [Define if you have readline 4.0]), , $READLINE_SHARED_LIBADD)
- 
- # check for readline 4.2
- AC_CHECK_LIB(readline, rl_completion_matches,
- 	AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1,
--        [Define if you have readline 4.2]), , -ltermcap)
-+        [Define if you have readline 4.2]), , $READLINE_SHARED_LIBADD)
- 
- # also in readline 4.2
- AC_TRY_CPP([#include <readline/readline.h>],
diff --git a/dev-lang/python/files/python-2.4-xmlrpc.patch b/dev-lang/python/files/python-2.4-xmlrpc.patch
deleted file mode 100644
index 61f61f2d8391..000000000000
--- a/dev-lang/python/files/python-2.4-xmlrpc.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -c -r1.7.8.1 SimpleXMLRPCServer.py
-*** Lib/SimpleXMLRPCServer.py	3 Oct 2004 23:23:00 -0000	1.7.8.1
---- Lib/SimpleXMLRPCServer.py	3 Feb 2005 05:33:55 -0000
-***************
-*** 107,120 ****
-  import types
-  import os
-  
-! def resolve_dotted_attribute(obj, attr):
-      """resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
-  
-      Resolves a dotted attribute name to an object.  Raises
-      an AttributeError if any attribute in the chain starts with a '_'.
-      """
-  
-!     for i in attr.split('.'):
-          if i.startswith('_'):
-              raise AttributeError(
-                  'attempt to access private attribute "%s"' % i
---- 107,128 ----
-  import types
-  import os
-  
-! def resolve_dotted_attribute(obj, attr, allow_dotted_names=True):
-      """resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
-  
-      Resolves a dotted attribute name to an object.  Raises
-      an AttributeError if any attribute in the chain starts with a '_'.
-+ 
-+     If the optional allow_dotted_names argument is false, dots are not
-+     supported and this function operates similar to getattr(obj, attr).
-      """
-  
-!     if allow_dotted_names:
-!         attrs = attr.split('.')
-!     else:
-!         attrs = [attr]
-! 
-!     for i in attrs:
-          if i.startswith('_'):
-              raise AttributeError(
-                  'attempt to access private attribute "%s"' % i
-***************
-*** 156,162 ****
-          self.funcs = {}
-          self.instance = None
-  
-!     def register_instance(self, instance):
-          """Registers an instance to respond to XML-RPC requests.
-  
-          Only one instance can be installed at a time.
---- 164,170 ----
-          self.funcs = {}
-          self.instance = None
-  
-!     def register_instance(self, instance, allow_dotted_names=False):
-          """Registers an instance to respond to XML-RPC requests.
-  
-          Only one instance can be installed at a time.
-***************
-*** 174,182 ****
---- 182,204 ----
-  
-          If a registered function matches a XML-RPC request, then it
-          will be called instead of the registered instance.
-+ 
-+         If the optional allow_dotted_names argument is true and the
-+         instance does not have a _dispatch method, method names
-+         containing dots are supported and resolved, as long as none of
-+         the name segments start with an '_'.
-+ 
-+             *** SECURITY WARNING: ***
-+ 
-+             Enabling the allow_dotted_names options allows intruders
-+             to access your module's global variables and may allow
-+             intruders to execute arbitrary code on your machine.  Only
-+             use this option on a secure, closed network.
-+ 
-          """
-  
-          self.instance = instance
-+         self.allow_dotted_names = allow_dotted_names
-  
-      def register_function(self, function, name = None):
-          """Registers a function to respond to XML-RPC requests.
-***************
-*** 295,301 ****
-                  try:
-                      method = resolve_dotted_attribute(
-                                  self.instance,
-!                                 method_name
-                                  )
-                  except AttributeError:
-                      pass
---- 317,324 ----
-                  try:
-                      method = resolve_dotted_attribute(
-                                  self.instance,
-!                                 method_name,
-!                                 self.allow_dotted_names
-                                  )
-                  except AttributeError:
-                      pass
-***************
-*** 374,380 ****
-                      try:
-                          func = resolve_dotted_attribute(
-                              self.instance,
-!                             method
-                              )
-                      except AttributeError:
-                          pass
---- 397,404 ----
-                      try:
-                          func = resolve_dotted_attribute(
-                              self.instance,
-!                             method,
-!                             self.allow_dotted_names
-                              )
-                      except AttributeError:
-                          pass
diff --git a/dev-lang/python/files/python-2.4.1-readline.patch b/dev-lang/python/files/python-2.4.1-readline.patch
deleted file mode 100644
index 2db5a82b4efa..000000000000
--- a/dev-lang/python/files/python-2.4.1-readline.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-diff -u Python-2.4.1/configure Python-2.4.1.new/configure
---- Python-2.4.1/configure	2005-03-29 00:23:02.000000000 +0100
-+++ Python-2.4.1.new/configure	2005-04-26 14:14:49.373258580 +0100
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.475.2.7 .
-+# From configure.in Revision: 1.475.2.8 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.59 for python 2.4.
- #
-@@ -19306,6 +19306,217 @@
- 
- fi
- 
-+# what library does readline need to be linked with
-+READLINE_SHARED_LIBADD=""
-+echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5
-+echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6
-+if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lncurses  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char tgetent ();
-+int
-+main ()
-+{
-+tgetent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_ncurses_tgetent=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_ncurses_tgetent=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5
-+echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6
-+if test $ac_cv_lib_ncurses_tgetent = yes; then
-+  READLINE_SHARED_LIBADD="-lncurses"
-+else
-+  echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5
-+echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6
-+if test "${ac_cv_lib_curses_tgetent+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcurses  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char tgetent ();
-+int
-+main ()
-+{
-+tgetent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_curses_tgetent=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_curses_tgetent=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5
-+echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6
-+if test $ac_cv_lib_curses_tgetent = yes; then
-+  READLINE_SHARED_LIBADD="-lcurses"
-+else
-+  echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
-+echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6
-+if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltermcap  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char tgetent ();
-+int
-+main ()
-+{
-+tgetent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_termcap_tgetent=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_termcap_tgetent=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
-+echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6
-+if test $ac_cv_lib_termcap_tgetent = yes; then
-+  READLINE_SHARED_LIBADD="-ltermcap"
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
- # check for readline 2.1
- echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
- echo $ECHO_N "checking for rl_callback_handler_install in -lreadline... $ECHO_C" >&6
-@@ -19313,7 +19524,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline -ltermcap $LIBS"
-+LIBS="-lreadline $READLINE_SHARED_LIBADD $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -19445,7 +19656,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline -ltermcap $LIBS"
-+LIBS="-lreadline $READLINE_SHARED_LIBADD $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -19519,7 +19730,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline -ltermcap $LIBS"
-+LIBS="-lreadline $READLINE_SHARED_LIBADD $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-diff -u Python-2.4.1/configure.in Python-2.4.1.new/configure.in
---- Python-2.4.1/configure.in	2005-03-29 00:23:34.000000000 +0100
-+++ Python-2.4.1.new/configure.in	2005-04-26 14:01:03.721206572 +0100
-@@ -2846,10 +2846,18 @@
-   [Define this if you have flockfile(), getc_unlocked(), and funlockfile()])
- fi
- 
-+# what library does readline need to be linked with
-+READLINE_SHARED_LIBADD=""
-+AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"],
-+    AC_CHECK_LIB(curses, tgetent, [READLINE_SHARED_LIBADD="-lcurses"],
-+       AC_CHECK_LIB(termcap, tgetent, [READLINE_SHARED_LIBADD="-ltermcap"])
-+       )
-+    )
-+
- # check for readline 2.1
- AC_CHECK_LIB(readline, rl_callback_handler_install,
- 	AC_DEFINE(HAVE_RL_CALLBACK, 1,
--        [Define if you have readline 2.1]), , -ltermcap)
-+        [Define if you have readline 2.1]), , $READLINE_SHARED_LIBADD)
- 
- # check for readline 2.2
- AC_TRY_CPP([#include <readline/readline.h>],
-@@ -2865,12 +2873,12 @@
- # check for readline 4.0
- AC_CHECK_LIB(readline, rl_pre_input_hook,
- 	AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK, 1,
--        [Define if you have readline 4.0]), , -ltermcap)
-+        [Define if you have readline 4.0]), , $READLINE_SHARED_LIBADD)
- 
- # check for readline 4.2
- AC_CHECK_LIB(readline, rl_completion_matches,
- 	AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1,
--        [Define if you have readline 4.2]), , -ltermcap)
-+        [Define if you have readline 4.2]), , $READLINE_SHARED_LIBADD)
- 
- # also in readline 4.2
- AC_TRY_CPP([#include <readline/readline.h>],
-
diff --git a/dev-lang/python/files/python-config-2.2.1 b/dev-lang/python/files/python-config-2.2.1
deleted file mode 100644
index 056b27125ae9..000000000000
--- a/dev-lang/python/files/python-config-2.2.1
+++ /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.2.2 b/dev-lang/python/files/python-config-2.2.2
deleted file mode 100644
index 056b27125ae9..000000000000
--- a/dev-lang/python/files/python-config-2.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/python-2.3.4-r1.ebuild b/dev-lang/python/python-2.3.4-r1.ebuild
deleted file mode 100644
index 2e957bc6903c..000000000000
--- a/dev-lang/python/python-2.3.4-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.4-r1.ebuild,v 1.10 2005/08/16 22:00:31 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 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"
-
-LICENSE="PSF-2.2"
-SLOT="2.3"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc s390 sh sparc x86 ppc64"
-IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	!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: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
-
-PDEPEND="${DEPEND} dev-python/python-fchksum"
-
-# The dev-python/python-fchksum RDEPEND is needed to that this python provides
-# the functionality expected from previous pythons.
-
-PROVIDE="virtual/python"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -ie 's/OpenBSD\/3.\[01234/OpenBSD\/3.\[012345/' configure || die "OpenBSD sed failed"
-	#Fixes security vulnerability in XML-RPC server - pythonhead (06 Feb 05)
-	#http://www.python.org/security/PSF-2005-001/
-	epatch ${FILESDIR}/${PN}-2.3-xmlrpc.patch
-	# 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 ${FILESDIR}/${PN}-2.3-add_portage_search_path_take_2.patch
-	# adds support for PYTHON_DONTCOMPILE shell environment to
-	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch ${FILESDIR}/${PN}-2.3-gentoo_py_dontcompile.patch
-	epatch ${FILESDIR}/${PN}-2.3.2-disable_modules_and_ssl.patch
-	epatch ${FILESDIR}/${PN}-2.3-mimetypes_apache.patch
-	epatch ${FILESDIR}/${PN}-2.3-db4.2.patch
-	# installs to lib64
-	[ "${CONF_LIBDIR}" == "lib64" ] && epatch ${FILESDIR}/python-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
-}
-
-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
-
-	[ "${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!
-	if [ "${CONF_LIBDIR}" == "lib64" ] ;then
-		insinto /usr/lib64/python${PYVER}/config
-	else
-		insinto /usr/lib/python${PYVER}/config
-	fi
-	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.
-	if [ "${CONF_LIBDIR}" == "lib64" ] ;then
-		dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib64/python${PYVER}/config/Makefile
-	else
-		dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib/python${PYVER}/config/Makefile
-	fi
-
-	# install python-updater in /usr/sbin
-	dosbin ${FILESDIR}/python-updater
-
-	if use build ; then
-		rm -rf ${D}/usr/lib/python2.3/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use elibc_uclibc && rm -rf ${D}/usr/lib/python2.3/{test,bsddb/test}
-		use berkdb || rm -rf ${D}/usr/lib/python2.3/bsddb
-		( use !X || use !tcltk ) && rm -rf ${D}/usr/lib/python2.3/lib-tk
-	fi
-}
-
-pkg_postrm() {
-	python_makesym
-	python_mod_cleanup /usr/lib/python2.3
-	[ "${CONF_LIBDIR}" == "lib64" ] && python_mod_cleanup /usr/lib64/python2.3
-}
-
-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}
-	[ "${CONF_LIBDIR}" == "lib64" ] && \
-		python_mod_optimize -x site-packages -x test ${myroot}/usr/lib64/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 ${myroot}/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
-}
diff --git a/dev-lang/python/python-2.3.5-r1.ebuild b/dev-lang/python/python-2.3.5-r1.ebuild
deleted file mode 100644
index 1ad08d5f78ae..000000000000
--- a/dev-lang/python/python-2.3.5-r1.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.2 2005/08/15 21:31:11 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 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"
-
-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 tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	!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"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# fix readline detection problems due to missing termcap (#79013)
-	epatch ${FILESDIR}/${PN}-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 ${FILESDIR}/${PN}-2.3-add_portage_search_path_take_2.patch
-	# adds support for PYTHON_DONTCOMPILE shell environment to
-	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch ${FILESDIR}/${PN}-2.3-gentoo_py_dontcompile.patch
-	epatch ${FILESDIR}/${PN}-2.3.2-disable_modules_and_ssl.patch
-	epatch ${FILESDIR}/${PN}-2.3-mimetypes_apache.patch
-	epatch ${FILESDIR}/${PN}-2.3-db4.2.patch
-
-	# installs to lib64
-	[ "$(get_libdir)" == "lib64" ] && epatch ${FILESDIR}/python-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 ${FILESDIR}/python-2.3.5-st_flags.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
-
-	[ "${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 !X || use !tcltk ) && 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 -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.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 ${myroot}/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="subprocess tcl 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.3.5.ebuild b/dev-lang/python/python-2.3.5.ebuild
deleted file mode 100644
index c841b38e6509..000000000000
--- a/dev-lang/python/python-2.3.5.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2005 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.ebuild,v 1.22 2005/08/16 22:00:31 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 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"
-
-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 tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	!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"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# fix readline detection problems due to missing termcap (#79013)
-	epatch ${FILESDIR}/${PN}-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 ${FILESDIR}/${PN}-2.3-add_portage_search_path_take_2.patch
-	# adds support for PYTHON_DONTCOMPILE shell environment to
-	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch ${FILESDIR}/${PN}-2.3-gentoo_py_dontcompile.patch
-	epatch ${FILESDIR}/${PN}-2.3.2-disable_modules_and_ssl.patch
-	epatch ${FILESDIR}/${PN}-2.3-mimetypes_apache.patch
-	epatch ${FILESDIR}/${PN}-2.3-db4.2.patch
-
-	# installs to lib64
-	[ "$(get_libdir)" == "lib64" ] && epatch ${FILESDIR}/python-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
-}
-
-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
-
-	[ "${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 !X || use !tcltk ) && 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 -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.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 ${myroot}/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="subprocess tcl 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-r3.ebuild b/dev-lang/python/python-2.4-r3.ebuild
deleted file mode 100644
index d5108e892423..000000000000
--- a/dev-lang/python/python-2.4-r3.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4-r3.ebuild,v 1.8 2005/11/17 13:50:56 gmsoft 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
-
-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="A really great language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PYVER}/${MY_P}.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.4"
-KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~s390 ~alpha ~ia64 ~mips"
-IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	!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
-
-RDEPEND="${DEPEND} 	dev-python/python-fchksum"
-
-PROVIDE="virtual/python"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# unnecessary termcap dep in readline (#79013)
-	epatch ${FILESDIR}/${PN}-2.4-readline.patch
-
-	#Fixes security vulnerability in XML-RPC server - pythonhead (06 Feb 05)
-	#http://www.python.org/security/PSF-2005-001/
-	epatch ${FILESDIR}/${PN}-2.4-xmlrpc.patch
-	# adds support for PYTHON_DONTCOMPILE shell environment to
-	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch ${FILESDIR}/${PN}-${PYVER}-gentoo_py_dontcompile.patch
-	epatch ${FILESDIR}/${PN}-${PYVER}-disable_modules_and_ssl.patch
-	epatch ${FILESDIR}/${PN}-${PYVER}-mimetypes_apache.patch
-	epatch ${FILESDIR}/${PN}-${PYVER}-db4.2.patch
-
-	# prepends /usr/lib/portage/pym to sys.path
-	epatch ${FILESDIR}/${PN}-${PYVER}-add_portage_search_path.patch
-
-	epatch ${FILESDIR}/python-${PYVER}-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
-
-	# 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
-
-}
-
-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
-
-	[ "${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 \
-		${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/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
-
-	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
-}
-
diff --git a/dev-lang/python/python-2.4.1-r1.ebuild b/dev-lang/python/python-2.4.1-r1.ebuild
deleted file mode 100644
index 58904267ad6d..000000000000
--- a/dev-lang/python/python-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1-r1.ebuild,v 1.13 2005/11/17 13:50:56 gmsoft 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}"
-
-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"
-
-LICENSE="PSF-2.2"
-SLOT="2.4"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-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"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# unnecessary termcap dep in readline (#79013)
-	epatch ${FILESDIR}/${PN}-2.4.1-readline.patch
-	# db4.2 support
-	epatch ${FILESDIR}/${PN}-2.4.1-db4.patch
-
-	# adds support for PYTHON_DONTCOMPILE shell environment to
-	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch ${FILESDIR}/${PN}-${PYVER}-gentoo_py_dontcompile.patch
-	epatch ${FILESDIR}/${PN}-${PYVER}-disable_modules_and_ssl.patch
-	epatch ${FILESDIR}/${PN}-${PYVER}-mimetypes_apache.patch
-
-	# prepends /usr/lib/portage/pym to sys.path
-	epatch ${FILESDIR}/${PN}-${PYVER}-add_portage_search_path.patch
-
-	epatch ${FILESDIR}/${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 ${FILESDIR}/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 "${FILESDIR}"/python-2.4.1-bindir-libdir.patch
-		epatch "${FILESDIR}"/python-2.4.1-crosscompile.patch
-	fi
-}
-
-src_configure() {
-	# disable extraneous modules with extra dependencies
-	if use build; then
-		export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter"
-		export PYTHON_DISABLE_SSL=1
-	else
-		use gdbm \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm"
-		use berkdb \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm bsddb"
-		use readline \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline"
-		( use !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" LDFLAGS="" \
-		./configure --with-cxx=no || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e '/^HOSTPYTHON/s:=.*:=./hostpython:' \
-			-e '/^HOSTPGEN/s:=.*:=./Parser/hostpgen:' \
-			Makefile.pre.in || die
-	fi
-
-	tc-export CXX
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		`use_enable ipv6` \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man \
-		--with-threads \
-		--with-libc='' \
-		${myconf} || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	src_configure
-	make DESTDIR="${D}" altinstall  || die
-
-	# install our own custom python-config
-	exeinto /usr/bin
-	newexe ${FILESDIR}/python-config-${PYVER} python-config
-
-	# Use correct libdir in python-config
-	dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config
-
-	# The stuff below this line extends from 2.1, and should be deprecated
-	# in 2.3, or possibly can wait till 2.4
-
-	# seems like the build do not install Makefile.pre.in anymore
-	# it probably shouldn't - use DistUtils, people!
-	insinto /usr/$(get_libdir)/python${PYVER}/config
-	doins ${S}/Makefile.pre.in
-
-	# While we're working on the config stuff... Let's fix the OPT var
-	# so that it doesn't have any opts listed in it. Prevents the problem
-	# with compiling things with conflicting opts later.
-	dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' \
-			/usr/$(get_libdir)/python${PYVER}/config/Makefile
-
-	# install python-updater in /usr/sbin
-	dosbin ${FILESDIR}/python-updater
-
-	if use build ; then
-		rm -rf ${D}/usr/lib/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use elibc_uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test}
-		use berkdb || rm -rf ${D}/usr/lib/python${PYVER}/bsddb
-		( use !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 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.1.ebuild b/dev-lang/python/python-2.4.1.ebuild
deleted file mode 100644
index 2877879d9bdb..000000000000
--- a/dev-lang/python/python-2.4.1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1.ebuild,v 1.11 2005/11/17 13:50:56 gmsoft 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
-
-# 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-orientated programming language."
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~s390 ~sparc ~x86"
-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
-
-RDEPEND="${DEPEND} 	dev-python/python-fchksum"
-
-PROVIDE="virtual/python"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# unnecessary termcap dep in readline (#79013)
-	epatch ${FILESDIR}/${PN}-2.4.1-readline.patch
-	# db4.2 support
-	epatch ${FILESDIR}/${PN}-2.4.1-db4.patch
-
-	# adds support for PYTHON_DONTCOMPILE shell environment to
-	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch ${FILESDIR}/${PN}-${PYVER}-gentoo_py_dontcompile.patch
-	epatch ${FILESDIR}/${PN}-${PYVER}-disable_modules_and_ssl.patch
-	epatch ${FILESDIR}/${PN}-${PYVER}-mimetypes_apache.patch
-
-	# prepends /usr/lib/portage/pym to sys.path
-	epatch ${FILESDIR}/${PN}-${PYVER}-add_portage_search_path.patch
-
-	epatch ${FILESDIR}/${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
-
-
-	# 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
-
-}
-
-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
-
-	econf --with-fpectl \
-		--enable-shared \
-		`use_enable ipv6` \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man \
-		--with-threads \
-		--with-libc='' \
-		${myconf} || die
-	emake || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	src_configure
-	make DESTDIR="${D}" altinstall  || die
-
-	# install our own custom python-config
-	exeinto /usr/bin
-	newexe ${FILESDIR}/python-config-${PYVER} python-config
-
-	# Use correct libdir in python-config
-	dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config
-
-	# The stuff below this line extends from 2.1, and should be deprecated
-	# in 2.3, or possibly can wait till 2.4
-
-	# seems like the build do not install Makefile.pre.in anymore
-	# it probably shouldn't - use DistUtils, people!
-	insinto /usr/$(get_libdir)/python${PYVER}/config
-	doins ${S}/Makefile.pre.in
-
-	# While we're working on the config stuff... Let's fix the OPT var
-	# so that it doesn't have any opts listed in it. Prevents the problem
-	# with compiling things with conflicting opts later.
-	dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' \
-			/usr/$(get_libdir)/python${PYVER}/config/Makefile
-
-	# install python-updater in /usr/sbin
-	dosbin ${FILESDIR}/python-updater
-
-	if use build ; then
-		rm -rf ${D}/usr/lib/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use elibc_uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test}
-		use berkdb || rm -rf ${D}/usr/lib/python${PYVER}/bsddb
-		( use !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="subprocess tcl 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."
-}