Fix multilib. Thanks to David Leverton <u01drl3@abdn.ac.uk> in bug #154065.

Package-Manager: portage-2.1.2_rc1-r2

3 files changed, 19 insertions, 16 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 3591f6984423..acc80d530e95 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.43 2006/08/14 16:51:18 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.44 2006/11/05 01:02:38 peper Exp $
+
+  05 Nov 2006; Piotr Jaroszyński <peper@gentoo.org> libffi-3.4.1.ebuild:
+  Fix multilib. Thanks to David Leverton <u01drl3@abdn.ac.uk> in bug #154065.
 
   14 Aug 2006; Christian Heim <phreak@gentoo.org> libffi-3.3.5.ebuild,
   libffi-3.4.1.ebuild, libffi-3.4.1-r1.ebuild, libffi-3.4.3.ebuild:
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 907b5f84aa95..0bfb7569991f 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -25,18 +25,18 @@ EBUILD libffi-3.4.1-r1.ebuild 5765 RMD160 e0dc481461fc857b0a8d045b5aca7dbbb395fd
 MD5 9b5e491d3c9bb1cb889b572f99a35a1d libffi-3.4.1-r1.ebuild 5765
 RMD160 e0dc481461fc857b0a8d045b5aca7dbbb395fd52 libffi-3.4.1-r1.ebuild 5765
 SHA256 7bca1265bde5cb4829c79b52d29d2198152646542387d54c4d8cdfc9979f557a libffi-3.4.1-r1.ebuild 5765
-EBUILD libffi-3.4.1.ebuild 7068 RMD160 1b4eba3f5dfb9146e71e36c4e40b607011d88be5 SHA1 765c15b4bfb70a12ed114cb82758e430b8fde97c SHA256 021f3f9c69f03fd19c118c52a28461f419f0b27451f19d61465b8cb1bc01a8cb
-MD5 2dbb02a7cf6ae1d2b6ac04dab64fd992 libffi-3.4.1.ebuild 7068
-RMD160 1b4eba3f5dfb9146e71e36c4e40b607011d88be5 libffi-3.4.1.ebuild 7068
-SHA256 021f3f9c69f03fd19c118c52a28461f419f0b27451f19d61465b8cb1bc01a8cb libffi-3.4.1.ebuild 7068
+EBUILD libffi-3.4.1.ebuild 7089 RMD160 eb4596c2672f90323c3f6fbf6f4f41f3b404066c SHA1 b8b68af4130b4c4cdca6513f840b9ebf4540a52f SHA256 398e690abb51ac4cedebbe7c92fa8de33899c60c96fcd822cec40e97c21a79b2
+MD5 1ed0a9a734c638a565f9e47992bb88fe libffi-3.4.1.ebuild 7089
+RMD160 eb4596c2672f90323c3f6fbf6f4f41f3b404066c libffi-3.4.1.ebuild 7089
+SHA256 398e690abb51ac4cedebbe7c92fa8de33899c60c96fcd822cec40e97c21a79b2 libffi-3.4.1.ebuild 7089
 EBUILD libffi-3.4.3.ebuild 5723 RMD160 8f72f24dfe20e3f0e6bcbc5ca274dabc62ca18a3 SHA1 ddc5db8fc3459598955092bd662dbca09045318e SHA256 101eea1eec7264501eb5ac9da47492a214f39fc30685788854c0c57d632c571f
 MD5 d0de5d927e141f795c5f4048e9bf8990 libffi-3.4.3.ebuild 5723
 RMD160 8f72f24dfe20e3f0e6bcbc5ca274dabc62ca18a3 libffi-3.4.3.ebuild 5723
 SHA256 101eea1eec7264501eb5ac9da47492a214f39fc30685788854c0c57d632c571f libffi-3.4.3.ebuild 5723
-MISC ChangeLog 6635 RMD160 e5f4e11de754d749fdf5db229a2794bceff464fe SHA1 fb915e31611aa5f58a312a58ab9e632f5de46d89 SHA256 307eee1bbff87470548fd6b2e766033dba93f5c8e683931a9b08ec5099fd496b
-MD5 bdcb7513a970caebe8f4ead2680d3375 ChangeLog 6635
-RMD160 e5f4e11de754d749fdf5db229a2794bceff464fe ChangeLog 6635
-SHA256 307eee1bbff87470548fd6b2e766033dba93f5c8e683931a9b08ec5099fd496b ChangeLog 6635
+MISC ChangeLog 6787 RMD160 5f53dd8e67ef09d4b489a5bea122485612e2801b SHA1 89be89a1f3f4da042f5305f123aaac037801dfab SHA256 4f1dff28fe38cc091fb32798644f21ce24320ee5db74e0947c420a1f00a592a4
+MD5 d63e03721541eac68f3f72f86ae4898d ChangeLog 6787
+RMD160 5f53dd8e67ef09d4b489a5bea122485612e2801b ChangeLog 6787
+SHA256 4f1dff28fe38cc091fb32798644f21ce24320ee5db74e0947c420a1f00a592a4 ChangeLog 6787
 MISC metadata.xml 1623 RMD160 a005567b44b3d4811ac1a8d666cd69efbe35a832 SHA1 1f4b95db85eee8120a0392c3720d46d5a0149e6b SHA256 ffbf37ac66d97b2ed7f6988b2d76938f8211b48c8871325aa2ad9d1523345b11
 MD5 8161cc67336bc464a1b70356df7b4be4 metadata.xml 1623
 RMD160 a005567b44b3d4811ac1a8d666cd69efbe35a832 metadata.xml 1623
@@ -59,7 +59,7 @@ SHA256 598c11efdf33e2c698a1aa83604c90b4ec09f5e7c4be1cd88b614cd485059bc0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE4KoTyuNVb5qfaOYRAp/1AJ4lDhxUzU3kqGF67e9ZGNheLUC9jQCgkfjf
-Id0cAtXn8b+WKi+IW+idSwU=
-=vHds
+iD8DBQFFTTg4ppoStNGKGywRAjyvAJ9ejl6AQGyM/nodlQoIS3DTVI3nswCgkH7f
+sIHQ/YLZ334IBYi067noj1E=
+=ZE/0
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libffi/libffi-3.4.1.ebuild b/dev-libs/libffi/libffi-3.4.1.ebuild
index 4be5e8238fd4..f37270b48960 100644
--- a/dev-libs/libffi/libffi-3.4.1.ebuild
+++ b/dev-libs/libffi/libffi-3.4.1.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-libs/libffi/libffi-3.4.1.ebuild,v 1.14 2006/08/14 16:51:18 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.1.ebuild,v 1.15 2006/11/05 01:02:38 peper Exp $
 
 IUSE="nls nptl"
 SLOT="0"
@@ -220,14 +220,14 @@ src_install() {
 
 	# we want the headers...
 	mkdir -p ${D}/${LOC}/include/${PN}
-	mv ${D}/${LOC}/lib/gcc-lib/${CCHOST}/${PV}/include/* ${D}/${LOC}/include/${PN}
+	mv ${D}/${LOC}/$(get_libdir)/gcc-lib/${CCHOST}/${PV}/include/* ${D}/${LOC}/include/${PN}
 	mv ${D}/${LOC}/lib/gcc/${CCHOST}/${PV}/include/libffi/* ${D}/${LOC}/include/${PN}
 	# remove now useless directory...
-	rm -Rf ${D}/${LOC}/lib/gcc-lib/
+	rm -Rf ${D}/${LOC}/$(get_libdir)/gcc-lib/
 	rm -Rf ${D}/${LOC}/lib/gcc
 
 	mkdir -p ${D}/${LOC}/$(get_libdir)/${PN}/
-	mv ${D}/${LOC}/{lib,lib64}/* ${D}/${LOC}/$(get_libdir)/${PN}/
+	mv ${D}/${LOC}/$(get_libdir)/* ${D}/${LOC}/$(get_libdir)/${PN}/
 
 	mkdir -p ${D}/etc/env.d/
 	echo "LDPATH=\"${LOC}/$(get_libdir)/${PN}\"" >> ${D}/etc/env.d/99libffi