Replace hardcoded /lib64 searching with /<abi_libdir> paths.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index e853cc0a25fbdfd64473b865408c718847aa107b..10f1a63c8b2be35d75b2ac369061dee16421a781 100644 (file)
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.560 2011/12/01 13:58:42 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.561 2011/12/09 03:10:09 vapier Exp $
+
+  09 Dec 2011; Mike Frysinger <vapier@gentoo.org> python-3.2.2.ebuild:
+  Replace hardcoded /lib64 searching with /<abi_libdir> paths.
 
   01 Dec 2011; Dirkjan Ochtman <djc@gentoo.org> python-2.7.2-r3.ebuild,
   python-3.1.4-r3.ebuild, python-3.2.2.ebuild:

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 88a9cc219a3ae2a53a7f6ad4642e4c4257930a76..d33289e726b684928ec6b9c0d3fbf342f1a9378a 100644 (file)
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX linux2.patch 606 RMD160 0cca6f619a98e6090d01f4a80c2178c323416a47 SHA1 8fc817c8da2f74d3ccc93d84a1bc713ed26c00e2 SHA256 a178120a3022ecb14044c82eff7e828f6d060b6885acacd4a4d8569fde372fd7
 AUX pydoc.conf 279 RMD160 85dcc3abd24faf09f3753b5c2299517f9b2ebc6a SHA1 c1faef486a0041c2175bfbc2cf10eccaa574e8c2 SHA256 6437e85d16d34efaf2665b3cabb0707392e6dee3df04989d3fcac63fd22997e8
@@ -36,13 +36,13 @@ EBUILD python-2.7.1-r1.ebuild 11217 RMD160 c26e835583ee4797dfc0e5ae51932fd8e9303
 EBUILD python-2.7.2-r3.ebuild 11997 RMD160 425059fd1d381a08f53df8ac8f9b229b34040c48 SHA1 0d736c8ec246032ba7e97485a69714845aad045b SHA256 e113b08aa78cf20fb5ca27de9fad65973b174fd5c60e82b500b3517a38d33f7b
 EBUILD python-3.1.3-r1.ebuild 9894 RMD160 edd846b9fe5c472e4e99dfa95395708afa71ed13 SHA1 2807dad1ee84148cb2ddd466f047e5610e7c668b SHA256 ff762195045158c7cf2719a7ebfdb8317b4aa7fcf089db52afa9559a36ed01bc
 EBUILD python-3.1.4-r3.ebuild 10497 RMD160 b6e737a8eeee28b66c92fe19df31d3bda80b2f20 SHA1 97b5df3896f924d8e1203eb6d6319ead6c7ad228 SHA256 f364881588d07d2eba7a1c897caa071c2378ef8c3f5ddd3ae9df3b919b3238e9
-EBUILD python-3.2.2.ebuild 10724 RMD160 c9459967f31d9af9bfd4aa2d75a2a7947b89d36b SHA1 297ef250605a004c0cd799d7f3b4b915cb6a6e61 SHA256 13405863b383495be23f3b6b5975da571abf6385f34c91a17aea61efc04194d7
-MISC ChangeLog 100191 RMD160 27f0b946cbf0916933d86964dac61e92a3c4436f SHA1 b7afa7f92e720780bc2253a4373d250b16dd7397 SHA256 2ac72a7c13b0072d6aa39aad3c036d0225adf605af3565129aa0b30dab382d62
+EBUILD python-3.2.2.ebuild 10825 RMD160 aa133da67f9db98ea8d131addbf61cfbbf281d59 SHA1 8033372f907492fc4bbf3fc390764954f650e3de SHA256 ba79f24437d8eefffa1fef4f13e3554488f17574551e381c2fcba37d1eab4af2
+MISC ChangeLog 100329 RMD160 3b1d8faa0f91ec9e800b57104e5cd44e902b9c93 SHA1 d596c10f19a0bfaa8f2dbbd47918f55811a1f75d SHA256 0ea768df45b0ca33344263dab2b6d9850338a031dbc38810a9f879938811e47c
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEUEAREKAAYFAk7XiB0ACgkQxeMuLWsGW/t2IACfTc69Oel8cRD3W750vQKFNc+M
-78gAlivtDAWQfla/2c+AIGEtpBbqJFs=
-=RiL5
+iF4EAREIAAYFAk7hfCAACgkQaC/OocHi7JYVJwD/e3I+oP2lN+f3HW+/EE3ol9Lr
+s/yzdossqEdLcWw89sgA/3n7eWid0Op1rSMjkptpnR5gy0gKqtxuWoeOTr6ihKVL
+=9etB
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/python/python-3.2.2.ebuild b/dev-lang/python/python-3.2.2.ebuild
index 95f25711245755556b3b6474bf63fdcc37c0f68c..debdd0c038de49ab21b98dc4775d8ad73a0ddf89 100644 (file)
--- a/dev-lang/python/python-3.2.2.ebuild
+++ b/dev-lang/python/python-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.2.ebuild,v 1.4 2011/12/01 13:58:42 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.2.ebuild,v 1.5 2011/12/09 03:10:09 vapier Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -119,6 +119,8 @@ src_prepare() {
                Modules/Setup.dist \
                Modules/getpath.c \
                setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+       # The setup.py file hardcodes /usr/lib64!
+       sed -i -e "s:/lib64:/$(get_libdir):g" setup.py || die
 
        if ! use wininst; then
                # Remove Microsoft Windows executables.