Cross-compile update: bindir-libdir patch is no longer needed and will break the patching if it's there. Also, unset CC to force the native python build to use the native compiler.

Package-Manager: portage-2.1-r1

3 files changed, 31 insertions, 17 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index c250bacb906b..bb01094597b7 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.200 2006/06/28 17:35:35 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.201 2006/06/30 18:39:06 kanaka Exp $
+
+  30 Jun 2006; Joel Martin <kanaka@gentoo.org> python-2.4.3-r1.ebuild:
+  Cross-compile update: bindir-libdir patch is no longer needed and will break
+  the patching if it's there. Also, unset CC to force the native python build
+  to use the native compiler.
 
   28 Jun 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   python-2.4.3-r1.ebuild:
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index bab8b5c7b30b..622fa8b06487 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX depreorder-topsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d
 MD5 7e423c353b08a2c05693d13f21e067d0 files/depreorder-topsort.py 1958
 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 files/depreorder-topsort.py 1958
@@ -46,13 +49,13 @@ AUX python-updater-r1 8769 RMD160 4c1222cfde4e2e13ef75eb6656ff80c43a9cf69f SHA1
 MD5 4b6d43b5e4510d6dc29be97c6aef21ca files/python-updater-r1 8769
 RMD160 4c1222cfde4e2e13ef75eb6656ff80c43a9cf69f files/python-updater-r1 8769
 SHA256 d74f8dc8ed892285642acb3fa30b05187d136f8e8c56890982023193dc1fba27 files/python-updater-r1 8769
-DIST Python-2.1.3.tgz 6194432 RMD160 d7216480cf884507d97bf7932767871977fc1ccc SHA256 1bcb5bb587948bc38f36db60e15c376009c56c66570e563a08a82bf7f227afb9
-DIST Python-2.2.3.tgz 6709556 RMD160 3590f813582d65194b467f4ab450e360e35eb40e SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188
-DIST Python-2.3.5.tar.bz2 7230000 RMD160 2b1fa90393f517fe02d546c037996754f65f8c89 SHA256 1b81787c3dcae3752cadaa6be80c24e247c239ba93d91538af39b4b717e29bf4
+DIST Python-2.1.3.tgz 6194432 RMD160 d7216480cf884507d97bf7932767871977fc1ccc SHA1 7042a5c5fd60d334c0ac227885d68a4c305713b4 SHA256 1bcb5bb587948bc38f36db60e15c376009c56c66570e563a08a82bf7f227afb9
+DIST Python-2.2.3.tgz 6709556 RMD160 3590f813582d65194b467f4ab450e360e35eb40e SHA1 177d587e77e0eaa14131ab0d0d0b470777de4400 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188
+DIST Python-2.3.5.tar.bz2 7230000 RMD160 2b1fa90393f517fe02d546c037996754f65f8c89 SHA1 98bfa6257f73a3826b244047c183d933d26f4322 SHA256 1b81787c3dcae3752cadaa6be80c24e247c239ba93d91538af39b4b717e29bf4
 DIST Python-2.4.2.tar.bz2 7853169 RMD160 c511d2b76b5394742d285e71570a2bcd3c1fa871 SHA1 a1f1c466fb4a06f612faac75dbaa8bc81e609c2e SHA256 e163b95ee56819c0f3c58ef9278c30b9e49302c2f1a1917680ca894d33929f7e
 DIST Python-2.4.3.tar.bz2 8005915 RMD160 c86247554975e6c44f91d05e44e68e280d5244dc SHA1 d6b81e1aec0045b5acff99676f2abe303da1b384 SHA256 c9b3bbc52fa18c6dba7a8c3481fa7de98187c9978749241395305f252134ba2c
-DIST python-2.2-patches-1.tar.bz2 3127 RMD160 2874de5568776a0b195c6694e4af6769e08fc028 SHA256 1c638792add80a832d5b65c1473ccb056f3ebe2fe99d29a65e1a730ed8ab6218
-DIST python-2.3-patches-1.tar.bz2 8482 RMD160 a2fa53c2246864e0f7240132d7d9394dd630ff26 SHA256 c3b766299b4a9363a63bc27983e7e82f19daa430a5f11d2ce29012a63229bf89
+DIST python-2.2-patches-1.tar.bz2 3127 RMD160 2874de5568776a0b195c6694e4af6769e08fc028 SHA1 e635a6744c94dd084051ab3c9591dacc027ab409 SHA256 1c638792add80a832d5b65c1473ccb056f3ebe2fe99d29a65e1a730ed8ab6218
+DIST python-2.3-patches-1.tar.bz2 8482 RMD160 a2fa53c2246864e0f7240132d7d9394dd630ff26 SHA1 2be225f8e21ffa88de8cadd186d4727d44bd5d7b SHA256 c3b766299b4a9363a63bc27983e7e82f19daa430a5f11d2ce29012a63229bf89
 DIST python-2.4-patches-1.tar.bz2 7820 RMD160 313c0f4f4dea59290c42a9b2c8de1db159f1ca1b SHA1 c965bc5a60c07b29743ab2763e5d0563e10ad9af SHA256 e22abe4394f1f0919aac429f155c00ec1b3fe94cdc302119059994d817cd30b5
 DIST python-2.4-patches-2.tar.bz2 9219 RMD160 bd4c3502b42f4f9a10f423c434f31ad370d9da4b SHA1 812f0796e348e1788ba56a851050932c0b69218d SHA256 e66ee41328999e89bea833ff3dc58b4691a6d16ada029e88a8ba9df35979352a
 EBUILD python-2.1.3-r1.ebuild 2299 RMD160 c34187e843cbc93f9d675e77eaf1c8008c60c986 SHA1 c9ceb6f3763ac0b4542d9a9efe3f7cf013985807 SHA256 5aff296d1e28d87f2ce6dfd4929dffb009a2f541dd3628dc8683fe9034ded1ed
@@ -79,18 +82,18 @@ EBUILD python-2.4.2.ebuild 9556 RMD160 8d1307a81c6d18e3eb57d47ba86b0960795f7d37
 MD5 01db2bd229ee8711bc212ecd3498849d python-2.4.2.ebuild 9556
 RMD160 8d1307a81c6d18e3eb57d47ba86b0960795f7d37 python-2.4.2.ebuild 9556
 SHA256 b1131f1f803bec3d22e55aa97a89f2bb72fa87e694a55ffb71ce23488ec6cf7b python-2.4.2.ebuild 9556
-EBUILD python-2.4.3-r1.ebuild 9852 RMD160 3ac8ae27f35c60172e682dea4334278c4b00d7f3 SHA1 975f0c8b507614192debf40c56f19d1592f91d5d SHA256 888d5ff18867c3eec2aa49806a3e34dc41100bc7a8d534b5877bcad9bc2a5d55
-MD5 c6939eef3a8eb54fed69753fc5d5ac21 python-2.4.3-r1.ebuild 9852
-RMD160 3ac8ae27f35c60172e682dea4334278c4b00d7f3 python-2.4.3-r1.ebuild 9852
-SHA256 888d5ff18867c3eec2aa49806a3e34dc41100bc7a8d534b5877bcad9bc2a5d55 python-2.4.3-r1.ebuild 9852
+EBUILD python-2.4.3-r1.ebuild 9787 RMD160 cb1bab6540948fb142593190950e03f9cdf374dd SHA1 b54f70624d2cbc92e2cf4b454ab1d4baf1485f38 SHA256 729a677901a30a61b32f33b06fee12ccb513556dbc417af608548e230c5756dc
+MD5 157c007d2a5c1f7a754012ee8814a14d python-2.4.3-r1.ebuild 9787
+RMD160 cb1bab6540948fb142593190950e03f9cdf374dd python-2.4.3-r1.ebuild 9787
+SHA256 729a677901a30a61b32f33b06fee12ccb513556dbc417af608548e230c5756dc python-2.4.3-r1.ebuild 9787
 EBUILD python-2.4.3.ebuild 9849 RMD160 d088659d8cd2727730ed48a039e1c1592c59c1d6 SHA1 00f1d5dfeaa35d7acb5573cf053986598a35cd1b SHA256 cd7ba514782f1320582d1611f162a3bef1ab9b3f39d64156d7b093838044d4c2
 MD5 e7dc812d3078ca6a3fd4aa8335644a88 python-2.4.3.ebuild 9849
 RMD160 d088659d8cd2727730ed48a039e1c1592c59c1d6 python-2.4.3.ebuild 9849
 SHA256 cd7ba514782f1320582d1611f162a3bef1ab9b3f39d64156d7b093838044d4c2 python-2.4.3.ebuild 9849
-MISC ChangeLog 33548 RMD160 6b45908f4ef00ba0137708b425b6c2950bdb5574 SHA1 7d935ae1ef95a25fc51dea78f3262fa1d42c2284 SHA256 913404ce47ab80c0300c90c7eaaffcefab54ae08506181d9398793a6d5679e53
-MD5 0cb536a5966f536359abf7b45b099e04 ChangeLog 33548
-RMD160 6b45908f4ef00ba0137708b425b6c2950bdb5574 ChangeLog 33548
-SHA256 913404ce47ab80c0300c90c7eaaffcefab54ae08506181d9398793a6d5679e53 ChangeLog 33548
+MISC ChangeLog 33803 RMD160 fe4443b61eb581bdd1f6378a104753b64e6e4caf SHA1 1523a0c39eae7a5d010436b972f9d5f630342515 SHA256 64cb634ef0d99048c6b2b17614ed7ff3761d3949c872f866c1ddb68ae173a7df
+MD5 3fc46630d3cd078e4360eb7c50ca2195 ChangeLog 33803
+RMD160 fe4443b61eb581bdd1f6378a104753b64e6e4caf ChangeLog 33803
+SHA256 64cb634ef0d99048c6b2b17614ed7ff3761d3949c872f866c1ddb68ae173a7df ChangeLog 33803
 MISC metadata.xml 221 RMD160 dd50f32b16d6c15330ae1ee711d8a6cf8f6e3bed SHA1 85903c4affc3a23dd37e4910eb9b198cd02b242e SHA256 c14b93d19008cbeeb3312ec60b97513eef18ccfe82b8e2303cb44977ca13e3bd
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 RMD160 dd50f32b16d6c15330ae1ee711d8a6cf8f6e3bed metadata.xml 221
@@ -119,3 +122,10 @@ SHA256 3f77c805317ac37a5bbe788bc0ad4b723c3584c0d676d6ee4e2040291cb4177d files/di
 MD5 074466092860a2451d114cf7fad357f2 files/digest-python-2.4.3-r1 503
 RMD160 71a7eceb40337728f36e0d2970e1fb3956b7496a files/digest-python-2.4.3-r1 503
 SHA256 3f77c805317ac37a5bbe788bc0ad4b723c3584c0d676d6ee4e2040291cb4177d files/digest-python-2.4.3-r1 503
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFEpXEkbaW+3NC9cLgRAvKxAJ9k26JC/r3L0/P81HIrhdYxl65yCgCgnIhi
+jWEuJRPGkiS4het2+EPxgKE=
+=lwxV
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.4.3-r1.ebuild b/dev-lang/python/python-2.4.3-r1.ebuild
index bbb60e88f471..ce275884a13f 100644
--- a/dev-lang/python/python-2.4.3-r1.ebuild
+++ b/dev-lang/python/python-2.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.3-r1.ebuild,v 1.6 2006/06/28 17:35:35 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.3-r1.ebuild,v 1.7 2006/06/30 18:39:06 kanaka Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -93,7 +93,6 @@ src_unpack() {
 	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure
 
 	if tc-is-cross-compiler ; then
-		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-bindir-libdir.patch
 		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-crosscompile.patch
 	fi
 
@@ -155,7 +154,7 @@ src_compile() {
 	src_configure
 
 	if tc-is-cross-compiler ; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" \
+		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
 		./configure --with-cxx=no || die "cross-configure failed"
 		emake python Parser/pgen || die "cross-make failed"
 		mv python hostpython