experimental python 2.4.3 ebuild to completely support multilib rather than a half supported version.

svn path=/; revision=59

1 files changed, 156 insertions, 0 deletions

diff --git a/dev-lang/python/files/patches/2.4.3-libdir.patch b/dev-lang/python/files/patches/2.4.3-libdir.patch
new file mode 100644
index 0000000..f75c756
--- /dev/null
+++ b/dev-lang/python/files/patches/2.4.3-libdir.patch
@@ -0,0 +1,156 @@
+diff -ur Python-2.4.3.orig/Lib/distutils/command/install.py Python-2.4.3/Lib/distutils/command/install.py
+--- Python-2.4.3.orig/Lib/distutils/command/install.py	2005-01-20 19:15:39.000000000 +0000
++++ Python-2.4.3/Lib/distutils/command/install.py	2006-08-16 15:15:27.000000000 +0100
+@@ -38,8 +38,8 @@
+ 
+ INSTALL_SCHEMES = {
+     'unix_prefix': {
+-        'purelib': '$base/lib/python$py_version_short/site-packages',
+-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
++        'purelib': '$base/@@GENTOO_LIBDIR@@/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',
+Only in Python-2.4.3/Lib/distutils/command: install.py~
+diff -ur Python-2.4.3.orig/Lib/distutils/sysconfig.py Python-2.4.3/Lib/distutils/sysconfig.py
+--- Python-2.4.3.orig/Lib/distutils/sysconfig.py	2005-01-06 23:16:03.000000000 +0000
++++ Python-2.4.3/Lib/distutils/sysconfig.py	2006-08-16 15:16:47.000000000 +0100
+@@ -100,7 +100,7 @@
+ 
+     if os.name == "posix":
+         libpython = os.path.join(prefix,
+-                                 "lib", "python" + get_python_version())
++                                 "@@GENTOO_LIBDIR@@", "python" + get_python_version())
+         if standard_lib:
+             return libpython
+         else:
+Only in Python-2.4.3/Lib/distutils: sysconfig.py~
+diff -ur Python-2.4.3.orig/Lib/site.py Python-2.4.3/Lib/site.py
+--- Python-2.4.3.orig/Lib/site.py	2006-08-16 15:06:40.000000000 +0100
++++ Python-2.4.3/Lib/site.py	2006-08-16 15:19:21.000000000 +0100
+@@ -179,10 +179,10 @@
+                 sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
+             elif os.sep == '/':
+                 sitedirs = [os.path.join(prefix,
+-                                         "lib",
++                                         "@@GENTOO_LIBDIR@@",
+                                          "python" + sys.version[:3],
+                                          "site-packages"),
+-                            os.path.join(prefix, "lib", "site-python")]
++                            os.path.join(prefix, "@@GENTOO_LIBDIR@@", "site-python")]
+                 sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs
+             else:
+                 sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
+Only in Python-2.4.3/Lib: site.py~
+diff -ur Python-2.4.3.orig/Makefile.pre.in Python-2.4.3/Makefile.pre.in
+--- Python-2.4.3.orig/Makefile.pre.in	2006-03-13 13:08:41.000000000 +0000
++++ Python-2.4.3/Makefile.pre.in	2006-08-16 15:11:25.000000000 +0100
+@@ -79,11 +79,11 @@
+ 
+ # Expanded directories
+ BINDIR=		$(exec_prefix)/bin
+-LIBDIR=		$(exec_prefix)/lib
++LIBDIR=		$(exec_prefix)/@@GENTOO_LIBDIR@@
+ MANDIR=		@mandir@
+ INCLUDEDIR=	@includedir@
+ CONFINCLUDEDIR=	$(exec_prefix)/include
+-SCRIPTDIR=	$(prefix)/lib
++SCRIPTDIR=	$(prefix)/@@GENTOO_LIBDIR@@
+ 
+ # Detailed destination directories
+ BINLIBDEST=	$(LIBDIR)/python$(VERSION)
+Only in Python-2.4.3: Makefile.pre.in~
+diff -ur Python-2.4.3.orig/Modules/Setup.dist Python-2.4.3/Modules/Setup.dist
+--- Python-2.4.3.orig/Modules/Setup.dist	2005-12-27 17:37:16.000000000 +0000
++++ Python-2.4.3/Modules/Setup.dist	2006-08-16 15:19:14.000000000 +0100
+@@ -401,7 +401,7 @@
+ #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
+@@ -447,7 +447,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)/@@GENTOO_LIBDIR@@ -lz
+ 
+ # Interface to the Expat XML parser
+ #
+Only in Python-2.4.3/Modules: Setup.dist~
+diff -ur Python-2.4.3.orig/Modules/getpath.c Python-2.4.3/Modules/getpath.c
+--- Python-2.4.3.orig/Modules/getpath.c	2006-02-20 17:37:39.000000000 +0000
++++ Python-2.4.3/Modules/getpath.c	2006-08-16 15:21:21.000000000 +0100
+@@ -112,8 +112,8 @@
+ #endif
+ 
+ #ifndef PYTHONPATH
+-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
+-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
++#define PYTHONPATH PREFIX "/@@GENTOO_LIBDIR@@/python" VERSION ":" \
++              EXEC_PREFIX "/@@GENTOO_LIBDIR@@/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[] = "@@GENTOO_LIBDIR@@/python" VERSION;
+ 
+ static void
+ reduce(char *dir)
+@@ -529,7 +529,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, "@@GENTOO_LIBDIR@@/lib-dynload");
+     }
+     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
+ 
+Only in Python-2.4.3/Modules: getpath.c~
+diff -ur Python-2.4.3.orig/setup.py Python-2.4.3/setup.py
+--- Python-2.4.3.orig/setup.py	2006-08-16 15:06:37.000000000 +0100
++++ Python-2.4.3/setup.py	2006-08-16 15:13:53.000000000 +0100
+@@ -275,8 +275,7 @@
+         # 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',
+-            '/lib', '/usr/lib',
++            '@@GENTOO_LIBDIR@@', '/usr/@@GENTOO_LIBDIR@@',
+             ]
+         inc_dirs = self.compiler.include_dirs + ['/usr/include']
+         exts = []
+@@ -441,11 +440,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/@@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.
+@@ -1023,8 +1022,7 @@
+             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/@@GENTOO_LIBDIR@@')
+         elif os.path.exists('/usr/X11R5/include'):
+             include_dirs.append('/usr/X11R5/include')
+             added_lib_dirs.append('/usr/X11R5/lib')
+Only in Python-2.4.3: setup.py~