version bump for 2.4.1, clean up readling, db4 and libdir patch for 2.4.1.

(Portage version: 2.0.51.19)

14 files changed, 541 insertions, 480 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 569c4cc04a20..7e3c948d4420 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/python
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.137 2005/04/20 18:48:48 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.138 2005/04/27 12:18:26 liquidx Exp $
+
+*python-2.4.1 (27 Apr 2005)
+
+  27 Apr 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/python-2.4.1-db4.patch, +files/python-2.4.1-libdir.patch,
+  +files/python-2.4.1-readline.patch, files/python-2.4-readline.patch,
+  -python-2.3.3-r2.ebuild, python-2.3.5.ebuild, -python-2.4-r1.ebuild,
+  -python-2.4-r2.ebuild, +python-2.4.1.ebuild:
+  version bump for 2.4.1, clean up readling, db4 and libdir patch for 2.4.1.
 
   20 Apr 2005; Alastair Tse <liquidx@gentoo.org> python-2.3.5.ebuild,
   python-2.4-r3.ebuild:
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index c42ae18d6e89..d1c2abea09c2 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,20 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 dff709aa1b2a43a03d21814610d40898 ChangeLog 23258
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 MD5 b0dabb5b661c34b2054f5ae852c2fd45 python-2.1.3-r1.ebuild 2329
 MD5 1e424541a26b4d5785a6e830e6a14fe8 python-2.2.3-r6.ebuild 4498
-MD5 2b2c1c7fabbe14699111e59f9e78f65f python-2.3.3-r2.ebuild 7160
 MD5 6208b0b2586611378709b4aec6628eac python-2.3.4-r1.ebuild 7167
-MD5 5cc96c3709ae06baddee984d80cfee3c python-2.4-r1.ebuild 6804
-MD5 1bc0f485e700a65e4b15c87a21b85154 python-2.4-r2.ebuild 6777
-MD5 b2b8ce321f3e21558aae7fb197e68dcf python-2.3.5.ebuild 7727
+MD5 f1f5fcab92f57d4b99aa467e3b8e9e3e python-2.3.5.ebuild 7726
 MD5 11883082a4dbea2432a68330776944dd python-2.4-r3.ebuild 7102
+MD5 60e012defea8a63fb2c33dfdd524d715 python-2.4.1.ebuild 7199
 MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235
 MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
 MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r3 64
-MD5 f9f6481db3bb2a97900110f5e4a4cb38 files/python-2.4-readline.patch 10117
+MD5 6eab04aaa6abe2b795e4e5f4983bea38 files/python-2.4-readline.patch 9099
+MD5 1e4084c2a8ee240668d02e703e7c171f files/digest-python-2.4.1 66
+MD5 eaa33949f072a9787c453c37c1236108 files/python-2.4.1-db4.patch 1414
 MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152
 MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997
 MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220
@@ -41,20 +38,12 @@ MD5 7ed8f8f52ed392ef28dd320b130e3c6b files/python-2.4-lib64.patch 9941
 MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.4-mimetypes_apache.patch 454
 MD5 d74e7f0fd47f00e8b3fe7ca36b7eb629 files/python-config-2.4 179
 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r6 62
-MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3-r2 66
 MD5 849ff6337b70ef28009c90021dfae0da files/digest-python-2.3.5 66
-MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r1 64
-MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r2 64
 MD5 55af7ba61954f03e09bcafbce1227c61 files/python-2.2.3-xmlrpc.patch 3659
 MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.3-xmlrpc.patch 4228
 MD5 3c77f8f9d55bbedacd9476a428088250 files/python-2.4-libdir.patch 8358
 MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.4-xmlrpc.patch 4228
 MD5 c2e3a6ed5d700a7976f5b763cd935599 files/digest-python-2.3.4-r1 66
 MD5 e9cc1b9be363e6c3f8df75cdb2ea9621 files/python-2.3-readline.patch 9596
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCZqQtTM53OX+9xmMRAjBuAJ970WOcGFlJ9ZQiIoMGzo+WUJp8fgCgihCQ
-DP+3ShaJGBWdcnA5sz/RW7M=
-=m536
------END PGP SIGNATURE-----
+MD5 47e9455f3e16c3369c9e57388ba3d643 files/python-2.4.1-readline.patch 8984
+MD5 30646e9931667060229fcf9685050ff4 files/python-2.4.1-libdir.patch 7910
diff --git a/dev-lang/python/files/digest-python-2.3.3-r2 b/dev-lang/python/files/digest-python-2.3.3-r2
deleted file mode 100644
index 8c0e033775a0..000000000000
--- a/dev-lang/python/files/digest-python-2.3.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70ada9f65742ab2c77a96bcd6dffd9b1 Python-2.3.3.tar.bz2 7195007
diff --git a/dev-lang/python/files/digest-python-2.4-r1 b/dev-lang/python/files/digest-python-2.4-r1
deleted file mode 100644
index f096fae6214a..000000000000
--- a/dev-lang/python/files/digest-python-2.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 44c2226eff0f3fc1f2fedaa1ce596533 Python-2.4.tar.bz2 7840762
diff --git a/dev-lang/python/files/digest-python-2.4-r2 b/dev-lang/python/files/digest-python-2.4-r2
deleted file mode 100644
index f096fae6214a..000000000000
--- a/dev-lang/python/files/digest-python-2.4-r2
+++ /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
new file mode 100644
index 000000000000..a3486637687c
--- /dev/null
+++ b/dev-lang/python/files/digest-python-2.4.1
@@ -0,0 +1 @@
+MD5 de3e9a8836fab6df7c7ce545331afeb3 Python-2.4.1.tar.bz2 7847025
diff --git a/dev-lang/python/files/python-2.4-readline.patch b/dev-lang/python/files/python-2.4-readline.patch
index 3dbeb8e02727..7469b577979c 100644
--- a/dev-lang/python/files/python-2.4-readline.patch
+++ b/dev-lang/python/files/python-2.4-readline.patch
@@ -1,19 +1,3 @@
-Common subdirectories: Python-2.4/Demo and Python-2.4.new/Demo
-Common subdirectories: Python-2.4/Doc and Python-2.4.new/Doc
-Common subdirectories: Python-2.4/Grammar and Python-2.4.new/Grammar
-Common subdirectories: Python-2.4/Include and Python-2.4.new/Include
-Common subdirectories: Python-2.4/Lib and Python-2.4.new/Lib
-Common subdirectories: Python-2.4/Mac and Python-2.4.new/Mac
-Common subdirectories: Python-2.4/Misc and Python-2.4.new/Misc
-Common subdirectories: Python-2.4/Modules and Python-2.4.new/Modules
-Common subdirectories: Python-2.4/Objects and Python-2.4.new/Objects
-Common subdirectories: Python-2.4/PC and Python-2.4.new/PC
-Common subdirectories: Python-2.4/PCbuild and Python-2.4.new/PCbuild
-Common subdirectories: Python-2.4/Parser and Python-2.4.new/Parser
-Common subdirectories: Python-2.4/Python and Python-2.4.new/Python
-Common subdirectories: Python-2.4/RISCOS and Python-2.4.new/RISCOS
-Common subdirectories: Python-2.4/Tools and Python-2.4.new/Tools
-Only in Python-2.4.new: autom4te.cache
 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
diff --git a/dev-lang/python/files/python-2.4.1-db4.patch b/dev-lang/python/files/python-2.4.1-db4.patch
new file mode 100644
index 000000000000..8fb24957efe5
--- /dev/null
+++ b/dev-lang/python/files/python-2.4.1-db4.patch
@@ -0,0 +1,35 @@
+--- setup.py.old	2005-04-26 15:10:52.306357556 +0100
++++ setup.py	2005-04-26 15:13:56.855313581 +0100
+@@ -505,27 +505,13 @@
+         # construct a list of paths to look for the header file in on
+         # top of the normal inc_dirs.
+         db_inc_paths = [
++            '/usr/include/db4.3',		
++            '/usr/include/db4.2',
++            '/usr/include/db4.1',
+             '/usr/include/db4',
+-            '/usr/local/include/db4',
+-            '/opt/sfw/include/db4',
+-            '/sw/include/db4',
+-            '/usr/include/db3',
+-            '/usr/local/include/db3',
+-            '/opt/sfw/include/db3',
+-            '/sw/include/db3',
++            '/usr/include/db3.2',
++	    '/usr/include/db3',
+         ]
+-        # 4.x minor number specific paths
+-        for x in (0,1,2,3):
+-            db_inc_paths.append('/usr/include/db4%d' % x)
+-            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
+-            db_inc_paths.append('/usr/local/include/db4%d' % x)
+-            db_inc_paths.append('/pkg/db-4.%d/include' % x)
+-        # 3.x minor number specific paths
+-        for x in (2,3):
+-            db_inc_paths.append('/usr/include/db3%d' % x)
+-            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
+-            db_inc_paths.append('/usr/local/include/db3%d' % x)
+-            db_inc_paths.append('/pkg/db-3.%d/include' % x)
+ 
+         db_ver_inc_map = {}
+ 
diff --git a/dev-lang/python/files/python-2.4.1-libdir.patch b/dev-lang/python/files/python-2.4.1-libdir.patch
new file mode 100644
index 000000000000..4a11d1e8514b
--- /dev/null
+++ b/dev-lang/python/files/python-2.4.1-libdir.patch
@@ -0,0 +1,166 @@
+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.
+@@ -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.1-readline.patch b/dev-lang/python/files/python-2.4.1-readline.patch
new file mode 100644
index 000000000000..2db5a82b4efa
--- /dev/null
+++ b/dev-lang/python/files/python-2.4.1-readline.patch
@@ -0,0 +1,294 @@
+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/python-2.3.3-r2.ebuild b/dev-lang/python/python-2.3.3-r2.ebuild
deleted file mode 100644
index 645aa500a89d..000000000000
--- a/dev-lang/python/python-2.3.3-r2.ebuild
+++ /dev/null
@@ -1,215 +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.3-r2.ebuild,v 1.2 2005/02/27 00:11:04 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
-
-MY_PV=${PV/_rc/c}
-PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`"
-PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`"
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-S="${WORKDIR}/Python-${MY_PV}"
-DESCRIPTION="A really great language"
-SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${MY_PV}.tar.bz2"
-HOMEPAGE="http://www.python.org"
-
-IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X uclibc"
-LICENSE="PSF-2.2"
-SLOT="2.3"
-
-KEYWORDS="x86 ~ppc sparc arm hppa amd64 s390 alpha ~ia64 mips ppc64"
-# ~mips ~arm"
-
-DEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.3
-	!build? (
-		X? ( tcltk? ( >=dev-lang/tk-8.0 ) )
-		doc? ( =dev-python/python-docs-${PV}* )
-		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 )
-		dev-libs/expat
-	)"
-
-RDEPEND="${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}
-	#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}" = "hppa" ] && append-flags -fPIC
-	[ "${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; 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!
-	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 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.ebuild b/dev-lang/python/python-2.3.5.ebuild
index 6329fbf45be9..106b28478397 100644
--- a/dev-lang/python/python-2.3.5.ebuild
+++ b/dev-lang/python/python-2.3.5.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2005/04/20 18:48:48 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5.ebuild,v 1.6 2005/04/27 12:18:26 liquidx Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc x86"
 IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X"
 
 DEPEND="virtual/libc
diff --git a/dev-lang/python/python-2.4-r1.ebuild b/dev-lang/python/python-2.4-r1.ebuild
deleted file mode 100644
index 13464f220337..000000000000
--- a/dev-lang/python/python-2.4-r1.ebuild
+++ /dev/null
@@ -1,212 +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-r1.ebuild,v 1.2 2005/03/01 18:07:27 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
-
-PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`"
-PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`"
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-MY_P="Python-${PV}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="A really great language"
-SRC_URI="http://www.python.org/ftp/python/${PYVER}/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.python.org"
-
-IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X"
-LICENSE="PSF-2.2"
-SLOT="2.4"
-
-KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~s390 ~alpha ~ia64 ~mips"
-
-DEPEND="virtual/libc
-	>=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
-	)"
-
-RDEPEND="${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}
-	#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
-	# prepends /usr/lib/portage/pym to sys.path
-	epatch ${FILESDIR}/${PN}-${PYVER}-add_portage_search_path.patch
-	# adds support for PYTHON_DONTCOMPILE shell environment to
-	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch ${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
-	# installs to lib64
-	#This needs testing, lib64 people:
-	[ "${CONF_LIBDIR}" == "lib64" ] && epatch ${FILESDIR}/python-${PYVER}-lib64.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; 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!
-	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/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
-	else
-		use 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
-}
-
-pkg_postrm() {
-	python_makesym
-	python_mod_cleanup /usr/lib/python${PYVER}
-	[ "${CONF_LIBDIR}" == "lib64" ] && python_mod_cleanup /usr/lib64/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}
-	[ "${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.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-r2.ebuild b/dev-lang/python/python-2.4.1.ebuild
index 3b622385a1be..0545ff557b0b 100644
--- a/dev-lang/python/python-2.4-r2.ebuild
+++ b/dev-lang/python/python-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.2 2005/02/27 00:11:04 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1.ebuild,v 1.1 2005/04/27 12:18:26 liquidx Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -9,16 +9,18 @@
 
 inherit eutils flag-o-matic python multilib
 
+# we need this so that we don't depends on python.eclass
 PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`"
 PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`"
 PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
+
 MY_P="Python-${PV}"
 S="${WORKDIR}/${MY_P}"
-DESCRIPTION="A really great language"
-SRC_URI="http://www.python.org/ftp/python/${PYVER}/${MY_P}.tar.bz2"
+DESCRIPTION="Python is an interpreted, interactive, object-orientated programming language."
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.python.org"
 
-IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X"
+IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X uclibc"
 LICENSE="PSF-2.2"
 SLOT="2.4"
 
@@ -26,6 +28,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~s390 ~alpha ~ia64 ~mips"
 
 DEPEND="virtual/libc
 	>=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 ) )
@@ -36,30 +39,36 @@ DEPEND="virtual/libc
 		dev-libs/expat
 	)"
 
-RDEPEND="${DEPEND} dev-python/python-fchksum"
+# 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
 
-# The dev-python/python-fchksum RDEPEND is needed to that this python provides
-# the functionality expected from previous pythons.
+RDEPEND="${DEPEND} 	dev-python/python-fchksum"
 
 PROVIDE="virtual/python"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	#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
+
+	# 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
-	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
+	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 \
@@ -179,7 +188,6 @@ 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}
@@ -196,6 +204,11 @@ pkg_postinst() {
 		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:"