diff options
Diffstat (limited to 'dev-lang/python/files/patches')
14 files changed, 0 insertions, 1213 deletions
diff --git a/dev-lang/python/files/patches/2.4-mimetypes_apache.patch b/dev-lang/python/files/patches/2.4-mimetypes_apache.patch deleted file mode 100644 index 7254aa0..0000000 --- a/dev-lang/python/files/patches/2.4-mimetypes_apache.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Lib/mimetypes.py.old 2004-01-24 21:48:39.957577048 +0000 -+++ Lib/mimetypes.py 2004-01-24 21:49:27.023421952 +0000 -@@ -33,6 +33,8 @@ - - knownfiles = [ - "/etc/mime.types", -+ "/etc/apache/conf/mime.types", # Apache 1.x for Gentoo -+ "/etc/apache2/conf/mime.types", # Apache 2.x for Gentoo - "/usr/local/etc/httpd/conf/mime.types", - "/usr/local/lib/netscape/mime.types", - "/usr/local/etc/httpd/conf/mime.types", # Apache 1.2 diff --git a/dev-lang/python/files/patches/2.4.1-libdir.patch b/dev-lang/python/files/patches/2.4.1-libdir.patch deleted file mode 100644 index 9312ddd..0000000 --- a/dev-lang/python/files/patches/2.4.1-libdir.patch +++ /dev/null @@ -1,176 +0,0 @@ ---- Python-2.4.1/Lib/distutils/command/install.py -+++ Python-2.4.1/Lib/distutils/command/install.py -@@ -39,15 +39,15 @@ else: - INSTALL_SCHEMES = { - 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', -+ 'purelib': '$base/@@GENTOO_LIBDIR@/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', -+ 'purelib': '$base/@@GENTOO_LIBDIR/python', -- 'platlib': '$base/lib/python', -+ 'platlib': '$base/@@GENTOO_LIBDIR@@/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', ---- Python-2.4.1/Lib/distutils/sysconfig.py -+++ Python-2.4.1/Lib/distutils/sysconfig.py -@@ -99,9 +99,9 @@ def get_python_lib(plat_specific=0, stan - prefix = plat_specific and EXEC_PREFIX or PREFIX - - 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: ---- Python-2.4.1/Lib/site.py -+++ Python-2.4.1/Lib/site.py -@@ -179,10 +179,20 @@ def addsitepackages(known_paths): - 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")] ---- Python-2.4.1/Makefile.pre.in -+++ Python-2.4.1/Makefile.pre.in -@@ -79,9 +79,9 @@ 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 ---- Python-2.4.1/Modules/Setup.dist -+++ Python-2.4.1/Modules/Setup.dist -@@ -400,7 +400,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 -@@ -446,7 +446,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 - # ---- Python-2.4.1/Modules/getpath.c -+++ Python-2.4.1/Modules/getpath.c -@@ -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 -@@ -125,6 +125,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_exec_python[] = "@@GENTOO_LIBDIR@@/python" VERSION; - - static void - reduce(char *dir) -@@ -321,7 +322,7 @@ search_for_exec_prefix(char *argv0_path, - strncpy(exec_prefix, delim+1, MAXPATHLEN); - else - strncpy(exec_prefix, home, MAXPATHLEN); -- joinpath(exec_prefix, lib_python); -+ joinpath(exec_prefix, lib_exec_python); - joinpath(exec_prefix, "lib-dynload"); - return 1; - } -@@ -338,7 +339,7 @@ search_for_exec_prefix(char *argv0_path, - copy_absolute(exec_prefix, argv0_path); - do { - n = strlen(exec_prefix); -- joinpath(exec_prefix, lib_python); -+ joinpath(exec_prefix, lib_exec_python); - joinpath(exec_prefix, "lib-dynload"); - if (isdir(exec_prefix)) - return 1; -@@ -348,7 +349,7 @@ search_for_exec_prefix(char *argv0_path, - - /* Look at configure's EXEC_PREFIX */ - strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); -- joinpath(exec_prefix, lib_python); -+ joinpath(exec_prefix, lib_exec_python); - joinpath(exec_prefix, "lib-dynload"); - if (isdir(exec_prefix)) - return 1; -@@ -525,7 +526,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.) */ - ---- Python-2.4.1/setup.py -+++ Python-2.4.1/setup.py -@@ -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. -@@ -1015,7 +1016,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/patches/2.4.1-st_flags.patch b/dev-lang/python/files/patches/2.4.1-st_flags.patch deleted file mode 100644 index a042bd2..0000000 --- a/dev-lang/python/files/patches/2.4.1-st_flags.patch +++ /dev/null @@ -1,185 +0,0 @@ -Only in Python-2.4.1-st_flags/: autom4te.cache -diff -ur Python-2.4.1/configure Python-2.4.1-st_flags/configure ---- Python-2.4.1/configure 2005-03-29 01:23:02.000000000 +0200 -+++ Python-2.4.1-st_flags/configure 2005-06-19 01:26:10.485461096 +0200 -@@ -16411,6 +16411,116 @@ - - fi - -+echo "$as_me:$LINENO: checking for struct stat.st_flags" >&5 -+echo $ECHO_N "checking for struct stat.st_flags... $ECHO_C" >&6 -+if test "${ac_cv_member_struct_stat_st_flags+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static struct stat ac_aggr; -+if (ac_aggr.st_flags) -+return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 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_objext' -+ { (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_member_struct_stat_st_flags=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static struct stat ac_aggr; -+if (sizeof ac_aggr.st_flags) -+return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 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_objext' -+ { (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_member_struct_stat_st_flags=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_member_struct_stat_st_flags=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_flags" >&5 -+echo "${ECHO_T}$ac_cv_member_struct_stat_st_flags" >&6 -+if test $ac_cv_member_struct_stat_st_flags = yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_STRUCT_STAT_ST_FLAGS 1 -+_ACEOF -+ -+ -+fi -+ - echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5 - echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6 - if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then -diff -ur Python-2.4.1/configure.in Python-2.4.1-st_flags/configure.in ---- Python-2.4.1/configure.in 2005-03-29 01:23:34.000000000 +0200 -+++ Python-2.4.1-st_flags/configure.in 2005-06-19 01:25:34.050000128 +0200 -@@ -2421,6 +2421,7 @@ - AC_STRUCT_TIMEZONE - AC_CHECK_MEMBERS([struct stat.st_rdev]) - AC_CHECK_MEMBERS([struct stat.st_blksize]) -+AC_CHECK_MEMBERS([struct stat.st_flags]) - AC_STRUCT_ST_BLOCKS - - AC_MSG_CHECKING(for time.h that defines altzone) -Only in Python-2.4.1-st_flags/: configure.in.orig -diff -ur Python-2.4.1/Modules/posixmodule.c Python-2.4.1-st_flags/Modules/posixmodule.c ---- Python-2.4.1/Modules/posixmodule.c 2005-03-13 23:18:26.000000000 +0100 -+++ Python-2.4.1-st_flags/Modules/posixmodule.c 2005-06-19 01:25:34.048000432 +0200 -@@ -703,6 +703,9 @@ - #ifdef HAVE_STRUCT_STAT_ST_RDEV - {"st_rdev", "device type (if inode device)"}, - #endif -+#ifdef HAVE_STRUCT_STAT_ST_FLAGS -+ {"st_flags", "flags set onf ile"}, -+#endif - {0} - }; - -@@ -724,6 +727,12 @@ - #define ST_RDEV_IDX ST_BLOCKS_IDX - #endif - -+#ifdef HAVE_STRUCT_STAT_ST_FLAGS -+#define ST_FLAGS_IDX (ST_RDEV_IDX+1) -+#else -+#define ST_FLAGS_IDX ST_RDEV_IDX -+#endif -+ - static PyStructSequence_Desc stat_result_desc = { - "stat_result", /* name */ - stat_result__doc__, /* doc */ -@@ -887,6 +896,10 @@ - PyStructSequence_SET_ITEM(v, ST_RDEV_IDX, - PyInt_FromLong((long)st.st_rdev)); - #endif -+#ifdef HAVE_STRUCT_STAT_ST_FLAGS -+ PyStructSequence_SET_ITEM(v, ST_FLAGS_IDX, -+ PyInt_FromLong((long)st.st_flags)); -+#endif - - if (PyErr_Occurred()) { - Py_DECREF(v); -Only in Python-2.4.1-st_flags/Modules: posixmodule.c.orig -diff -ur Python-2.4.1/pyconfig.h.in Python-2.4.1-st_flags/pyconfig.h.in ---- Python-2.4.1/pyconfig.h.in 2004-10-13 17:30:55.000000000 +0200 -+++ Python-2.4.1-st_flags/pyconfig.h.in 2005-06-19 01:26:10.971387224 +0200 -@@ -480,6 +480,9 @@ - /* Define to 1 if `st_blocks' is member of `struct stat'. */ - #undef HAVE_STRUCT_STAT_ST_BLOCKS - -+/* Define to 1 if `st_flags' is member of `struct stat'. */ -+#undef HAVE_STRUCT_STAT_ST_FLAGS -+ - /* Define to 1 if `st_rdev' is member of `struct stat'. */ - #undef HAVE_STRUCT_STAT_ST_RDEV - -Only in Python-2.4.1-st_flags/: pyconfig.h.in~ diff --git a/dev-lang/python/files/patches/2.4.2-readline.patch b/dev-lang/python/files/patches/2.4.2-readline.patch deleted file mode 100644 index 7c5ab7d..0000000 --- a/dev-lang/python/files/patches/2.4.2-readline.patch +++ /dev/null @@ -1,287 +0,0 @@ -diff -u configure configure ---- configure 2005-03-29 00:23:02.000000000 +0100 -+++ configure 2005-04-26 14:14:49.373258580 +0100 -@@ -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 configure.in configure.in ---- configure.in 2005-03-29 00:23:34.000000000 +0100 -+++ 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/patches/2.4.3-libdir.patch b/dev-lang/python/files/patches/2.4.3-libdir.patch deleted file mode 100644 index f75c756..0000000 --- a/dev-lang/python/files/patches/2.4.3-libdir.patch +++ /dev/null @@ -1,156 +0,0 @@ -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~ diff --git a/dev-lang/python/files/patches/2.5-libdir.patch b/dev-lang/python/files/patches/2.5-libdir.patch deleted file mode 100644 index 0347f41..0000000 --- a/dev-lang/python/files/patches/2.5-libdir.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- ./Lib/distutils/sysconfig.py~ 2006-06-27 11:08:25.000000000 +0100 -+++ ./Lib/distutils/sysconfig.py 2006-08-09 14:38:58.000000000 +0100 -@@ -100,7 +100,8 @@ - - 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: -@@ -409,7 +410,7 @@ - # command. (It's also needed for non-MS compilers on Windows, and - # it's taken care of for them by the 'build_ext.get_libraries()' - # method.) -- g['LDSHARED'] = ("%s -L%s/lib -lpython%s" % -+ g['LDSHARED'] = ("%s -L%s/@@GENTOO_LIBDIR@@ -lpython%s" % - (linkerscript, PREFIX, get_python_version())) - - global _config_vars ---- ./Lib/distutils/command/install.py~ 2006-03-27 22:55:21.000000000 +0100 -+++ ./Lib/distutils/command/install.py 2006-08-09 14:36:01.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', ---- ./Lib/site.py~ 2006-08-09 14:34:02.000000000 +0100 -+++ ./Lib/site.py 2006-08-09 14:40:31.000000000 +0100 -@@ -182,13 +182,13 @@ - 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")] -- sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs -+ os.path.join(prefix, "@@GENTOO_LIBDIR@@", "site-python")] -+ sitedirs = [os.path.join(prefix, "@@GENTOO_LIBDIR@@", "portage","pym")] + sitedirs - else: -- sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] -+ sitedirs = [prefix, os.path.join(prefix, "@@GENTOO_LIBDIR@@", "site-packages")] - if sys.platform == 'darwin': - # for framework builds *only* we add the standard Apple - # locations. Currently only per-user, but /Library and ---- ./Makefile.pre.in~ 2006-07-30 17:20:10.000000000 +0100 -+++ ./Makefile.pre.in 2006-08-09 14:46:42.000000000 +0100 -@@ -84,11 +84,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) ---- ./setup.py~ 2006-08-09 14:45:13.000000000 +0100 -+++ ./setup.py 2006-08-09 14:46:21.000000000 +0100 -@@ -504,11 +504,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'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - if platform not in ['mac']: ---- ./Modules/Setup.dist~ 2006-08-09 14:42:29.000000000 +0100 -+++ ./Modules/Setup.dist 2006-08-09 14:42:45.000000000 +0100 -@@ -448,7 +448,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 - # ---- ./Modules/getpath.c~ 2006-08-09 14:43:13.000000000 +0100 -+++ ./Modules/getpath.c 2006-08-09 14:43:43.000000000 +0100 -@@ -129,7 +129,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) -@@ -524,7 +524,7 @@ - } - else - strncpy(zip_path, PREFIX, MAXPATHLEN); -- joinpath(zip_path, "lib/python00.zip"); -+ joinpath(zip_path, "@@GENTOO_LIBDIR@@/python00.zip"); - bufsz = strlen(zip_path); /* Replace "00" with version */ - zip_path[bufsz - 6] = VERSION[0]; - zip_path[bufsz - 5] = VERSION[2]; -@@ -534,7 +534,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.) */ - diff --git a/dev-lang/python/files/patches/2.5-mimetypes_gentoo_apache.patch b/dev-lang/python/files/patches/2.5-mimetypes_gentoo_apache.patch deleted file mode 100644 index edf42e4..0000000 --- a/dev-lang/python/files/patches/2.5-mimetypes_gentoo_apache.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Lib/mimetypes.py.old 2006-08-09 14:31:43.000000000 +0100 -+++ Lib/mimetypes.py 2006-08-09 14:32:32.000000000 +0100 -@@ -33,6 +33,8 @@ - - knownfiles = [ - "/etc/mime.types", -+ "/etc/apache/conf/mime.types", # Gentoo Apache 1 -+ "/etc/apache2/conf/mime.types", # Gentoo Apache 2 - "/etc/httpd/mime.types", # Mac OS X - "/etc/httpd/conf/mime.types", # Apache - "/etc/apache/mime.types", # Apache 1 diff --git a/dev-lang/python/files/patches/2.5-readline.patch b/dev-lang/python/files/patches/2.5-readline.patch deleted file mode 100644 index e9ef328..0000000 --- a/dev-lang/python/files/patches/2.5-readline.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- configure.in.old 2006-08-09 14:27:46.000000000 +0100 -+++ configure.in 2006-08-09 14:28:16.000000000 +0100 -@@ -3069,10 +3069,10 @@ - # save the value of LIBS so we don't actually link Python with readline - LIBS_no_readline=$LIBS - AC_CHECK_LIB(readline, readline) --if test "$ac_cv_have_readline_readline" = no --then -- AC_CHECK_LIB(termcap, readline) --fi -+#if test "$ac_cv_have_readline_readline" = no -+#then -+# AC_CHECK_LIB(termcap, readline) -+#fi - - # check for readline 2.1 - AC_CHECK_LIB(readline, rl_callback_handler_install, diff --git a/dev-lang/python/files/patches/python-2.4-add_portage_search_path.patch b/dev-lang/python/files/patches/python-2.4-add_portage_search_path.patch deleted file mode 100644 index 655eeed..0000000 --- a/dev-lang/python/files/patches/python-2.4-add_portage_search_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Lib/site.py 2004-09-03 15:10:33.158488512 -0700 -+++ Lib/site.py 2004-09-03 15:10:24.101865328 -0700 -@@ -183,6 +183,7 @@ - "python" + sys.version[:3], - "site-packages"), - os.path.join(prefix, "lib", "site-python")] -+ sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs - else: - sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] - if sys.platform == 'darwin': - diff --git a/dev-lang/python/files/patches/python-2.4-disable_modules_and_ssl.patch b/dev-lang/python/files/patches/python-2.4-disable_modules_and_ssl.patch deleted file mode 100644 index 808d7cb..0000000 --- a/dev-lang/python/files/patches/python-2.4-disable_modules_and_ssl.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- setup.py.old 2003-11-01 19:23:48.495647848 +0000 -+++ setup.py 2003-11-01 19:24:16.044459792 +0000 -@@ -15,7 +15,14 @@ - from distutils.command.install_lib import install_lib - - # This global variable is used to hold the list of modules to be disabled. --disabled_module_list = [] -+try: -+ disabled_module_list = os.environ["PYTHON_DISABLE_MODULES"].split() -+except KeyError: -+ disabled_module_list = [] -+try: -+ disable_ssl = os.environ["PYTHON_DISABLE_SSL"] -+except KeyError: -+ disable_ssl = 0 - - def add_dir_to_list(dirlist, dir): - """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -240,6 +247,7 @@ - return sys.platform - - 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.include_dirs, '/usr/local/include') -@@ -451,7 +459,8 @@ - ] ) - - if (ssl_incs is not None and -- ssl_libs is not None): -+ ssl_libs is not None and -+ not disable_ssl): - exts.append( Extension('_ssl', ['_ssl.c'], - include_dirs = ssl_incs, - library_dirs = ssl_libs, diff --git a/dev-lang/python/files/patches/python-2.4-gentoo_py_dontcompile.patch b/dev-lang/python/files/patches/python-2.4-gentoo_py_dontcompile.patch deleted file mode 100644 index 9cd1c31..0000000 --- a/dev-lang/python/files/patches/python-2.4-gentoo_py_dontcompile.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- Python-2.4/Python/import.c 2004-09-08 10:02:03.166032656 +0100 -+++ import.c 2004-09-08 10:02:57.423420120 +0100 -@@ -808,8 +808,12 @@ - write_compiled_module(PyCodeObject *co, char *cpathname, long mtime) - { - FILE *fp; -- -- fp = open_exclusive(cpathname); -+ char *py_dontcompile = getenv("PYTHON_DONTCOMPILE"); -+ -+ if (!py_dontcompile) -+ fp = open_exclusive(cpathname); -+ else -+ fp = NULL; - if (fp == NULL) { - if (Py_VerboseFlag) - PySys_WriteStderr( - diff --git a/dev-lang/python/files/patches/python-2.4.1-crosscompile.patch b/dev-lang/python/files/patches/python-2.4.1-crosscompile.patch deleted file mode 100644 index 6a78648..0000000 --- a/dev-lang/python/files/patches/python-2.4.1-crosscompile.patch +++ /dev/null @@ -1,106 +0,0 @@ -Ripped from OpenEmbedded - ---- Python-2.4c1/Makefile.pre.in -+++ Python-2.4c1/Makefile.pre.in -@@ -162,6 +162,7 @@ - - PYTHON= python$(EXE) - BUILDPYTHON= python$(BUILDEXE) -+HOSTPYTHON= $(BUILDPYTHON) - - # === Definitions added by makesetup === - -@@ -188,7 +189,7 @@ - ########################################################################## - # Parser - PGEN= Parser/pgen$(EXE) -- -+HOSTPGEN= $(PGEN)$(EXE) - POBJS= \ - Parser/acceler.o \ - Parser/grammar1.o \ -@@ -320,8 +321,8 @@ - # Build the shared modules - sharedmods: $(BUILDPYTHON) - case $$MAKEFLAGS in \ -- *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ -- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ -+ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ -+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ - esac - - # buildno should really depend on something like LIBRARY_SRC -@@ -442,7 +443,7 @@ - - - $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) -- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) -+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - - $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -@@ -718,19 +719,19 @@ - done - $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -@@ -825,7 +826,7 @@ - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: -- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ -+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ ---- Python-2.4c1/setup.py -+++ Python-2.4c1/setup.py -@@ -206,6 +206,7 @@ - try: - imp.load_dynamic(ext.name, ext_filename) - except ImportError, why: -+ return - self.announce('*** WARNING: renaming "%s" since importing it' - ' failed: %s' % (ext.name, why), level=3) - assert not self.inplace -@@ -239,8 +240,6 @@ - - def detect_modules(self): - # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - - # Add paths to popular package managers on OS X/darwin - if sys.platform == "darwin": -@@ -260,12 +260,6 @@ - add_dir_to_list(self.compiler.library_dirs, '/opt/local/lib') - add_dir_to_list(self.compiler.include_dirs, '/opt/local/include') - -- if os.path.normpath(sys.prefix) != '/usr': -- add_dir_to_list(self.compiler.library_dirs, -- sysconfig.get_config_var("LIBDIR")) -- add_dir_to_list(self.compiler.include_dirs, -- sysconfig.get_config_var("INCLUDEDIR")) -- - try: - have_unicode = unicode - except NameError: diff --git a/dev-lang/python/files/patches/python-2.4.3-db4.patch b/dev-lang/python/files/patches/python-2.4.3-db4.patch deleted file mode 100644 index 0ad5b3b..0000000 --- a/dev-lang/python/files/patches/python-2.4.3-db4.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- setup.py.old 2006-04-02 11:33:32.000000000 +0200 -+++ setup.py 2006-04-02 11:34:57.000000000 +0200 -@@ -500,30 +500,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,4): -- db_inc_paths.append('/usr/include/db4%d' % x) -- 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) -- db_inc_paths.append('/opt/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_inc_paths.append('/opt/db-3.%d/include' % x) - - db_ver_inc_map = {} - diff --git a/dev-lang/python/files/patches/python-2.4.3-gentoo_obsd-r1.patch b/dev-lang/python/files/patches/python-2.4.3-gentoo_obsd-r1.patch deleted file mode 100644 index ed2e3c8..0000000 --- a/dev-lang/python/files/patches/python-2.4.3-gentoo_obsd-r1.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur Python-2.4.3.orig/Include/Python.h Python-2.4.3/Include/Python.h ---- Python-2.4.3.orig/Include/Python.h 2006-05-04 14:20:30.000000000 +0000 -+++ Python-2.4.3/Include/Python.h 2006-05-04 14:21:26.000000000 +0000 -@@ -2,6 +2,11 @@ - #define Py_PYTHON_H - /* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */ - -+/* Required on Gentoo/OpenBSD */ -+#if defined(__OpenBSD__) -+#include <sys/types.h> -+#endif -+ - /* Include nearly all Python header files */ - - #include "patchlevel.h" -diff -Naur Python-2.4.3.orig/configure.in Python-2.4.3/configure.in ---- Python-2.4.3.orig/configure.in 2006-05-04 14:20:30.000000000 +0000 -+++ Python-2.4.3/configure.in 2006-05-04 14:23:22.000000000 +0000 -@@ -1528,9 +1528,16 @@ - - # only check for sem_ini if thread support is requested - if test "$with_threads" = "yes" -o -z "$with_threads"; then -+ case "$ac_sys_system" in -+ OpenBSD*) -+ LIBS="-pthread ${LIBS}" -+ ;; -+ *) - AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris - # posix4 on Solaris 2.6 - # pthread (first!) on Linux -+ ;; -+ esac - fi - - # check if we need libintl for locale functions |