Updated libdir patch, remove append-flags -fPIC on amd64.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 81 insertions, 38 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index eb4f24b0791a..0a4e12f3c16e 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
 # 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.148 2005/05/30 02:33:01 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.149 2005/06/09 19:34:03 herbs Exp $
+
+  09 Jun 2005; Herbie Hopkins <herbs@gentoo.org>
+  files/python-2.4.1-libdir.patch, python-2.4.1.ebuild:
+  Fix libdir patch to work with amd64s no-symlink profile, removed
+  append-flags -fPIC as this seems to no longer be necessary.
 
   29 May 2005; <solar@gentoo.org> python-2.3.4-r1.ebuild, python-2.3.5.ebuild,
   python-2.4-r3.ebuild, python-2.4.1.ebuild:
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 12c29065935d..f77f0e485f3c 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 412592dd8b9cc1c38d80f6bf0b7957d7 python-2.4.1.ebuild 7952
+MD5 1df326999058ecec71a274a37ba15514 python-2.4.1.ebuild 8094
 MD5 a6d43ee33172c5dece94d4323f42dcfb python-2.3.5.ebuild 7733
 MD5 2632d539cd0ab18b40f9510118ed3099 python-2.1.3-r1.ebuild 2299
 MD5 5857a314767fd0ae2243590999fe78b2 python-2.2.3-r6.ebuild 4491
 MD5 5d44cc06438212c3b7db9fe19b425b33 python-2.3.4-r1.ebuild 7190
 MD5 ad616f0fecea68a16aea3f97e46c9a72 python-2.4-r3.ebuild 7106
-MD5 ff149771c94ba211f48d9dfa6d6e05f7 ChangeLog 25088
+MD5 192e07c0a59c1d653b21c9d407d18f8b ChangeLog 25323
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 MD5 7ed8f8f52ed392ef28dd320b130e3c6b files/python-2.4-lib64.patch 9941
 MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454
@@ -44,18 +44,16 @@ MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.
 MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r6 62
 MD5 c2e3a6ed5d700a7976f5b763cd935599 files/digest-python-2.3.4-r1 66
-MD5 de3ef5603912c494d379eec843c8a674 files/python-2.4.1-libdir.patch 7911
+MD5 bbd59b4a23c663ce9c8c5b669deaa93c files/python-2.4.1-libdir.patch 9406
 MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235
 MD5 3c77f8f9d55bbedacd9476a428088250 files/python-2.4-libdir.patch 8358
 MD5 2b953054102d344834597bc73b209e12 files/python-2.4-disable_modules_and_ssl.patch 1285
 MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r3 64
 MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.4-mimetypes_apache.patch 454
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iQCVAwUBQpp7ZJ4WFLgrx1GWAQLCKgQAo05ClotG5Lae1drs5i/sSRC2PVAnvGeL
-ivnRqiIh3ml66evdwrP65c+HBCbxc9Sgqa6tJESuhuuGvEF3jnUuRoF/GSogRGub
-AjF6qT5WUXrX6ieYvIq493+H8YyB64FpQwt94vChpxf5j6NDr2bptUhAjr19Es+k
-C4/nNRW8vk4=
-=aARP
+iD8DBQFCqJne2G5bA0cA/ScRAthAAJ4sRXC+kLM4YbRFMG5M1fvgjrY0OQCeJRo/
+pjGZKSedqMjMcZUGpqiNv28=
+=vBkF
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/python-2.4.1-libdir.patch b/dev-lang/python/files/python-2.4.1-libdir.patch
index 434c6aed2711..033b18f5d194 100644
--- a/dev-lang/python/files/python-2.4.1-libdir.patch
+++ b/dev-lang/python/files/python-2.4.1-libdir.patch
@@ -1,6 +1,6 @@
-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
+diff -Naurp Python-2.4.1.orig/Lib/distutils/command/install.py Python-2.4.1/Lib/distutils/command/install.py
+--- Python-2.4.1.orig/Lib/distutils/command/install.py	2005-01-20 19:15:39.000000000 +0000
++++ Python-2.4.1/Lib/distutils/command/install.py	2005-06-09 18:08:20.000000000 +0100
 @@ -39,14 +39,14 @@ else:
  INSTALL_SCHEMES = {
      'unix_prefix': {
@@ -18,9 +18,9 @@ diff -Naurp Python-2.4.orig/Lib/distutils/command/install.py Python-2.4/Lib/dist
          '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
+diff -Naurp Python-2.4.1.orig/Lib/distutils/sysconfig.py Python-2.4.1/Lib/distutils/sysconfig.py
+--- Python-2.4.1.orig/Lib/distutils/sysconfig.py	2005-01-06 23:16:03.000000000 +0000
++++ Python-2.4.1/Lib/distutils/sysconfig.py	2005-06-09 18:08:20.000000000 +0100
 @@ -99,8 +99,12 @@ def get_python_lib(plat_specific=0, stan
          prefix = plat_specific and EXEC_PREFIX or PREFIX
  
@@ -35,9 +35,10 @@ diff -Naurp Python-2.4.orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/
          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 @@
+diff -Naurp Python-2.4.1.orig/Lib/site.py Python-2.4.1/Lib/site.py
+--- Python-2.4.1.orig/Lib/site.py	2005-06-09 18:06:37.000000000 +0100
++++ Python-2.4.1/Lib/site.py	2005-06-09 18:08:20.000000000 +0100
+@@ -179,10 +179,20 @@ def addsitepackages(known_paths):
                  sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
              elif os.sep == '/':
                  sitedirs = [os.path.join(prefix,
@@ -58,9 +59,9 @@ diff -Naurp Python-2.4.orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/
                  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
+diff -Naurp Python-2.4.1.orig/Makefile.pre.in Python-2.4.1/Makefile.pre.in
+--- Python-2.4.1.orig/Makefile.pre.in	2005-03-29 00:23:01.000000000 +0100
++++ Python-2.4.1/Makefile.pre.in	2005-06-09 18:08:20.000000000 +0100
 @@ -79,7 +79,7 @@ exec_prefix=	@exec_prefix@
  
  # Expanded directories
@@ -70,10 +71,10 @@ diff -Naurp Python-2.4.orig/Makefile.pre.in Python-2.4/Makefile.pre.in
  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
+diff -Naurp Python-2.4.1.orig/Modules/Setup.dist Python-2.4.1/Modules/Setup.dist
+--- Python-2.4.1.orig/Modules/Setup.dist	2005-03-09 23:47:44.000000000 +0000
++++ Python-2.4.1/Modules/Setup.dist	2005-06-09 18:08:20.000000000 +0100
+@@ -329,7 +329,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:
@@ -82,7 +83,7 @@ diff -Naurp Python-2.4.orig/Modules/Setup.dist Python-2.4/Modules/Setup.dist
  # *** Or uncomment this for Solaris:
  #	-L/usr/openwin/lib \
  # *** Uncomment these for TOGL extension only:
-@@ -396,7 +396,7 @@ GLHACK=-Dclear=__GLclear
+@@ -400,7 +400,7 @@ GLHACK=-Dclear=__GLclear
  #DB=/usr/local/BerkeleyDB.4.0
  #DBLIBVER=4.0
  #DBINC=$(DB)/include
@@ -91,7 +92,7 @@ diff -Naurp Python-2.4.orig/Modules/Setup.dist Python-2.4/Modules/Setup.dist
  #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
  
  # Historical Berkeley DB 1.85
-@@ -442,7 +442,7 @@ GLHACK=-Dclear=__GLclear
+@@ -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/
@@ -100,9 +101,9 @@ diff -Naurp Python-2.4.orig/Modules/Setup.dist Python-2.4/Modules/Setup.dist
  
  # 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
+diff -Naurp Python-2.4.1.orig/Modules/getpath.c Python-2.4.1/Modules/getpath.c
+--- Python-2.4.1.orig/Modules/getpath.c	2004-08-08 02:00:47.000000000 +0100
++++ Python-2.4.1/Modules/getpath.c	2005-06-09 18:12:56.000000000 +0100
 @@ -113,7 +113,7 @@
  
  #ifndef PYTHONPATH
@@ -112,7 +113,42 @@ diff -Naurp Python-2.4.orig/Modules/getpath.c Python-2.4/Modules/getpath.c
  #endif
  
  #ifndef LANDMARK
-@@ -525,7 +525,7 @@ calculate_path(void)
+@@ -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);
@@ -121,9 +157,9 @@ diff -Naurp Python-2.4.orig/Modules/getpath.c Python-2.4/Modules/getpath.c
      }
      /* 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
+diff -Naurp Python-2.4.1.orig/setup.py Python-2.4.1/setup.py
+--- Python-2.4.1.orig/setup.py	2005-06-09 18:06:37.000000000 +0100
++++ Python-2.4.1/setup.py	2005-06-09 18:08:20.000000000 +0100
 @@ -248,6 +248,7 @@ class PyBuildExt(build_ext):
          global disable_ssl
          # Ensure that /usr/local is always used
@@ -155,7 +191,7 @@ diff -Naurp Python-2.4.orig/setup.py Python-2.4/setup.py
                                     libraries=readline_libs) )
          if platform not in ['mac']:
              # crypt module.
-@@ -996,7 +997,7 @@ class PyBuildExt(build_ext):
+@@ -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')
diff --git a/dev-lang/python/python-2.4.1.ebuild b/dev-lang/python/python-2.4.1.ebuild
index 5a09ada9d0fd..55db80238fc9 100644
--- a/dev-lang/python/python-2.4.1.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.1.ebuild,v 1.9 2005/05/30 02:33:02 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1.ebuild,v 1.10 2005/06/09 19:34:03 herbs Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -103,8 +103,9 @@ src_configure() {
 src_compile() {
 	filter-flags -malign-double
 
+	# Seems to no longer be necessary
+	#[ "${ARCH}" = "amd64" ] && 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
@@ -149,6 +150,9 @@ src_install() {
 	exeinto /usr/bin
 	newexe ${FILESDIR}/python-config-${PYVER} python-config
 
+	# Use correct libdir in python-config
+	dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config
+
 	# The stuff below this line extends from 2.1, and should be deprecated
 	# in 2.3, or possibly can wait till 2.4