Only apply lib64 patch CONF_LIBDIR == lib64

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 8b8e0a3e19a8fb47b8e8d45f5974087ef73e9206..91ed0bf2f911133ff4b990548dad23d178f6fbaf 100644 (file)
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,9 +1,9 @@
 # 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.123 2005/01/05 17:46:53 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.124 2005/01/05 18:24:34 pythonhead Exp $
 
   05 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> python-2.4.ebuild:
-  Removed 2.4 lib64 patch until fixed
+  Only apply lib64 patch on CONF_LIBDIR == lib64
 
   04 Jan 2005; Rob Cakebread <pythonhead@gentoo.org>
   +files/python-2.4-lib64.patch, python-2.4.ebuild:
@@ -71,7 +71,7 @@
   Made python-2.1 stable on ppc as there are still some ebuilds which require
   this version.
 
-  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> python-2.3.3-r1.ebuild:
+  03 Jul 2004; Bryan Ã\83Â\98stergaard <kloeri@gentoo.org> python-2.3.3-r1.ebuild:
   Stable on alpha.
 
   03 Jul 2004; Grant Goodyear <g2boojum@gentoo.org> python-2.3.4.ebuild:
@@ -104,7 +104,7 @@
 
 *python-2.3.4 (04 Jun 2004)
 
-  04 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> +python-2.3.4.ebuild:
+  04 Jun 2004; Bryan Ã\83Â\98stergaard <kloeri@gentoo.org> +python-2.3.4.ebuild:
   Bump version.
 
   02 Jun 2004; Travis Tilley <lv@gentoo.org> python-2.3.3-r1.ebuild:
@@ -158,7 +158,7 @@
   Removing portage version check again as it's preventing new installations.
   Bug #43036
 
-  25 Feb 2004; Bryan Østergaard,,, <kloeri@gentoo.org> python-2.3.3.ebuild:
+  25 Feb 2004; Bryan Ã\83Â\98stergaard,,, <kloeri@gentoo.org> python-2.3.3.ebuild:
   Reinstating portage version check as people keep upgrading python without
   upgrading portage.
 

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 5bf38b37f6843a49cf775a901cbcfaa268a04d83..15f36f6fde34efd00baad3fa27ad528afe692ab3 100644 (file)
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f9f98b7013db5ec36933387caf274aa5 ChangeLog 20984
+MD5 482fa094b0e786bd7c492499f007ac9d ChangeLog 21001
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 MD5 b0dabb5b661c34b2054f5ae852c2fd45 python-2.1.3-r1.ebuild 2329
-MD5 94aded089bfaf144af987b9a25fdf8bd python-2.4.ebuild 6588
+MD5 b9847cb34e549e5488762f1a2ceec71f python-2.4.ebuild 6660
 MD5 d646219175210ff5eec9a8996d2edb43 python-2.2.3-r5.ebuild 4311
 MD5 3d174b1204c330f7cb067dbe6134fb73 python-2.3.3.ebuild 5571
 MD5 79ce98d4e26ccecf872e428d3d7574af python-2.3.3-r1.ebuild 7019
@@ -41,10 +38,3 @@ MD5 2121d3986faa4b6c2c3ed472f77f2a9d files/python-2.4-gentoo_py_dontcompile.patc
 MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.4-mimetypes_apache.patch 454
 MD5 d74e7f0fd47f00e8b3fe7ca36b7eb629 files/python-config-2.4 179
 MD5 a387f41bfc6767b90a51daaa0c0aac45 files/python-2.4-lib64.patch 11779
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB3Cgwz2gxt1z4IGYRAtLaAJ9SmR3LIiKFjMpxcUiawTtIrhN+7ACggGD6
-TMVb8vDrzwDzEuK7hd+Ens8=
-=R+qD
------END PGP SIGNATURE-----

diff --git a/dev-lang/python/python-2.4.ebuild b/dev-lang/python/python-2.4.ebuild
index c1b7b46e484a1451d4455620ed26dea9980831af..51c1ef36be977661927db9ff57c030b970abe369 100644 (file)
--- a/dev-lang/python/python-2.4.ebuild
+++ b/dev-lang/python/python-2.4.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.ebuild,v 1.3 2005/01/05 17:46:53 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.ebuild,v 1.4 2005/01/05 18:24:34 pythonhead Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -54,8 +54,9 @@ src_unpack() {
        epatch ${FILESDIR}/${PN}-${PYVER}-disable_modules_and_ssl.patch
        epatch ${FILESDIR}/${PN}-${PYVER}-mimetypes_apache.patch
        epatch ${FILESDIR}/${PN}-${PYVER}-db4.2.patch
-       #This needs fixing:
-       #epatch ${FILESDIR}/${PN}-${PYVER}-lib64.patch
+       # installs to lib64
+       # This needs testing, lib64 people:
+       [ "${CONF_LIBDIR}" == "lib64" ] && epatch ${FILESDIR}/python-${PYVER}-lib64.patch
 }
 
 src_configure() {