Fix build on amd64 with multilib-strict. Thanks to Ben Skeggs <darktama@iinet.net.au> for the patch.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 22 insertions, 16 deletions

diff --git a/net-p2p/gift-gnutella/ChangeLog b/net-p2p/gift-gnutella/ChangeLog
index 3c7f2651c77e..39c512f29297 100644
--- a/net-p2p/gift-gnutella/ChangeLog
+++ b/net-p2p/gift-gnutella/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/gift-gnutella
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/ChangeLog,v 1.21 2005/09/08 21:07:33 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/ChangeLog,v 1.22 2005/09/27 13:07:40 metalgod Exp $
+
+  27 Sep 2005; Luis Medinas <metalgod@gentoo.org>
+  gift-gnutella-0.0.9.2-r1.ebuild, gift-gnutella-0.0.10.ebuild,
+  gift-gnutella-0.0.10.1.ebuild:
+  Fix build on amd64 with multilib-strict. Thanks to Ben Skeggs
+  <darktama@iinet.net.au> for the patch.
 
 *gift-gnutella-0.0.10.1 (08 Sep 2005)
 
diff --git a/net-p2p/gift-gnutella/Manifest b/net-p2p/gift-gnutella/Manifest
index 3a13691b20b3..5e4d940a315c 100644
--- a/net-p2p/gift-gnutella/Manifest
+++ b/net-p2p/gift-gnutella/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b7a0acaa7bd030c1cfe7257f61fbaf06 gift-gnutella-0.0.10.1.ebuild 1248
-MD5 ee6242ff5d1097f588d23aaac46ef549 gift-gnutella-0.0.10.ebuild 1246
-MD5 9ab9bc48a417687cdaabcb0f4d9f58c2 gift-gnutella-0.0.9.2-r1.ebuild 1448
-MD5 e35ba840fb3e4070939dffee2d7c72ac ChangeLog 3445
+MD5 9126364a85789d83dd6c25d40be53c14 ChangeLog 3697
 MD5 875f23093b78af2d864a7a7ba464f126 metadata.xml 223
+MD5 d0614cc91b4139aad6e1e0f0f89469e8 gift-gnutella-0.0.9.2-r1.ebuild 1456
+MD5 5549145ad2cbb33570d806b11c089444 gift-gnutella-0.0.10.ebuild 1255
+MD5 a5a7fc38a369f4cc29e8cc11d8e0eaf9 gift-gnutella-0.0.10.1.ebuild 1257
+MD5 87a8f04b6651ae553a4b3943d537392d files/cacheupdate.sh 837
 MD5 7dbcf3e3110924a2891054f9fd7f349a files/digest-gift-gnutella-0.0.10 73
-MD5 3a2b71fe09957a425acb0f40be079266 files/gift-gnutella-gcc35.patch 457
 MD5 c464f118c813212dd2f6e7ddbfd0bef4 files/digest-gift-gnutella-0.0.9.2-r1 74
+MD5 3a2b71fe09957a425acb0f40be079266 files/gift-gnutella-gcc35.patch 457
 MD5 341e21bdbe18cc172126e4647394edac files/digest-gift-gnutella-0.0.10.1 75
-MD5 87a8f04b6651ae553a4b3943d537392d files/cacheupdate.sh 837
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDIMR4Z/iYVBmujdURAqdeAJ9l6ueGMnNmAVYV+pKkM2pNjpdGJACfQ3QK
-FaWpkY5tO3OaTnLZw6+fiu8=
-=Kuq1
+iD8DBQFDOVH8wUpWvClEHQoRAtNTAKCDeempdzuE14X6lEHPR9pXT5RD7ACfUjv7
+rrPUpcafXmlDNK4yLdc8G+s=
+=CyrH
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/gift-gnutella/gift-gnutella-0.0.10.1.ebuild b/net-p2p/gift-gnutella/gift-gnutella-0.0.10.1.ebuild
index 4bac50bb5102..a384d1d5b18c 100644
--- a/net-p2p/gift-gnutella/gift-gnutella-0.0.10.1.ebuild
+++ b/net-p2p/gift-gnutella/gift-gnutella-0.0.10.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/net-p2p/gift-gnutella/gift-gnutella-0.0.10.1.ebuild,v 1.1 2005/09/08 21:07:33 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/gift-gnutella-0.0.10.1.ebuild,v 1.2 2005/09/27 13:07:40 metalgod Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ src_compile() {
 
 src_install() {
 	einstall giftconfdir=${D}/etc/giFT \
-		 plugindir=${D}/usr/lib/giFT \
+		 plugindir=${D}/usr/$(get_libdir)/giFT \
 		 datadir=${D}/usr/share \
 		 giftperldir=${D}/usr/bin \
 		 libgiftincdir=${D}/usr/include/libgift || die "Install failed"
diff --git a/net-p2p/gift-gnutella/gift-gnutella-0.0.10.ebuild b/net-p2p/gift-gnutella/gift-gnutella-0.0.10.ebuild
index f3d21942dcca..61c70476c0cf 100644
--- a/net-p2p/gift-gnutella/gift-gnutella-0.0.10.ebuild
+++ b/net-p2p/gift-gnutella/gift-gnutella-0.0.10.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/net-p2p/gift-gnutella/gift-gnutella-0.0.10.ebuild,v 1.3 2005/05/30 22:25:47 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/gift-gnutella-0.0.10.ebuild,v 1.4 2005/09/27 13:07:40 metalgod Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ src_compile() {
 
 src_install() {
 	einstall giftconfdir=${D}/etc/giFT \
-		 plugindir=${D}/usr/lib/giFT \
+		 plugindir=${D}/usr/$(get_libdir)/giFT \
 		 datadir=${D}/usr/share \
 		 giftperldir=${D}/usr/bin \
 		 libgiftincdir=${D}/usr/include/libgift || die "Install failed"
diff --git a/net-p2p/gift-gnutella/gift-gnutella-0.0.9.2-r1.ebuild b/net-p2p/gift-gnutella/gift-gnutella-0.0.9.2-r1.ebuild
index 97fd5ac05dae..f889d6f94fb6 100644
--- a/net-p2p/gift-gnutella/gift-gnutella-0.0.9.2-r1.ebuild
+++ b/net-p2p/gift-gnutella/gift-gnutella-0.0.9.2-r1.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/net-p2p/gift-gnutella/gift-gnutella-0.0.9.2-r1.ebuild,v 1.2 2005/05/30 22:25:47 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/gift-gnutella-0.0.9.2-r1.ebuild,v 1.3 2005/09/27 13:07:40 metalgod Exp $
 
 inherit eutils
 
@@ -36,7 +36,7 @@ src_compile() {
 
 src_install() {
 	einstall giftconfdir=${D}/etc/giFT \
-		 plugindir=${D}/usr/lib/giFT \
+		 plugindir=${D}/usr/$(get_libdir)giFT \
 		 datadir=${D}/usr/share \
 		 giftperldir=${D}/usr/bin \
 		 libgiftincdir=${D}/usr/include/libgift || die "Install failed"