From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Tue, 20 Jun 2006 22:12:50 +0000 (+0000)
Subject: Fixed compilation on amd64.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=76eca8741d8e55b03151df546396a33db82ef58c;p=gentoo.git

Fixed compilation on amd64.
Package-Manager: portage-2.1.1_pre1-r1
---

diff --git a/games-emulation/nestra/Manifest b/games-emulation/nestra/Manifest
index a2a11a8f896d..74500306dc1e 100644
--- a/games-emulation/nestra/Manifest
+++ b/games-emulation/nestra/Manifest
@@ -5,12 +5,12 @@ AUX nestra-0.66-exec-stack.patch 235 RMD160 956b2e474a10ba8c8fadef42bffc3db12dff
 MD5 0ce4563cf54ce668376ab9877fffda1e files/nestra-0.66-exec-stack.patch 235
 RMD160 956b2e474a10ba8c8fadef42bffc3db12dff7123 files/nestra-0.66-exec-stack.patch 235
 SHA256 66d0d08ff4c311dedbbe3ffce3dd07f911e269e1d667b705ac41bfb0e9e6eb52 files/nestra-0.66-exec-stack.patch 235
-DIST nestra-0.66.tar.gz 49757 RMD160 e798b5642cd8875bf5e5ed74b196a8631448371b SHA256 6be7743cef85cf3de2da4e7489bfd2329f7f21aa01be9f58801f6dbd9f8e96d6
-DIST nestra_0.66-7.diff.gz 2294 RMD160 11a873b2435d27863892559275220b8af16e94c2 SHA256 dc5a68093e6eee90857a100e40d56b2cf7189bd9752f1ecf9df319165f537538
-EBUILD nestra-0.66-r1.ebuild 1225 RMD160 dfde950faacc99673daf4d7a072c1fcae3923a7e SHA1 aa657d808a64bfa45908e6d707de80db8d81ddad SHA256 a399eea830db837bf764b87e4444c0a26a1c9310b37eec7fde909f76f8796e3b
-MD5 bc952d30f0e77810bc6e6869a2309d79 nestra-0.66-r1.ebuild 1225
-RMD160 dfde950faacc99673daf4d7a072c1fcae3923a7e nestra-0.66-r1.ebuild 1225
-SHA256 a399eea830db837bf764b87e4444c0a26a1c9310b37eec7fde909f76f8796e3b nestra-0.66-r1.ebuild 1225
+DIST nestra-0.66.tar.gz 49757 RMD160 e798b5642cd8875bf5e5ed74b196a8631448371b SHA1 6f8cd46d452f6e3ac34b567875ab24953ac29d28 SHA256 6be7743cef85cf3de2da4e7489bfd2329f7f21aa01be9f58801f6dbd9f8e96d6
+DIST nestra_0.66-7.diff.gz 2294 RMD160 11a873b2435d27863892559275220b8af16e94c2 SHA1 ea1d261bb91bc0121ed48812b0da7bc323f3836c SHA256 dc5a68093e6eee90857a100e40d56b2cf7189bd9752f1ecf9df319165f537538
+EBUILD nestra-0.66-r1.ebuild 1272 RMD160 dc64d6f4c448d33e03a3610a0fd3c2bca5fb43a5 SHA1 43460fe0f4f09ee5549e4cdf6ebd478bf44fcdb0 SHA256 026a1baf54cff37d267f43f03e76235cab143e46b1f8b07a84a4b6d90a9cec3f
+MD5 e82a506cb4540e1640826c55df436dd5 nestra-0.66-r1.ebuild 1272
+RMD160 dc64d6f4c448d33e03a3610a0fd3c2bca5fb43a5 nestra-0.66-r1.ebuild 1272
+SHA256 026a1baf54cff37d267f43f03e76235cab143e46b1f8b07a84a4b6d90a9cec3f nestra-0.66-r1.ebuild 1272
 MISC ChangeLog 1646 RMD160 1d152d2404bd7c708d6b571985fe69488089d69c SHA1 15ec5cca623cbfa45f64b08d931ff36959fa00f7 SHA256 5c1b80e4d4f021c20b429bcabb86ee90c7b8991ef5732ca1880419aa9fef61dd
 MD5 4f72e97c7cf7626031aaf340d987a8e5 ChangeLog 1646
 RMD160 1d152d2404bd7c708d6b571985fe69488089d69c ChangeLog 1646
@@ -25,7 +25,7 @@ SHA256 3363ddeb7981a363225fd879ce9888c145b5f1d6027c2ee5448d17d7bd90e4ee files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEmEqnamhnQswr0vIRAmHUAJ9YXeSMGFUq1iZniZ7nqAq2LQau1wCePEYK
-pQuFomd4a0SDJgN9vSGMRQY=
-=8EYO
+iD8DBQFEmHLsOpjtAl+gMRURAqhrAKCDA+68QoXUqTTr1ZHrisHZ1QjTtgCgvDTH
+3oyPAq24rDWIEUmT3oAX8wQ=
+=cqf8
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/nestra/nestra-0.66-r1.ebuild b/games-emulation/nestra/nestra-0.66-r1.ebuild
index 89b679b5b989..b22cbccafe1c 100644
--- a/games-emulation/nestra/nestra-0.66-r1.ebuild
+++ b/games-emulation/nestra/nestra-0.66-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/games-emulation/nestra/nestra-0.66-r1.ebuild,v 1.14 2006/06/20 19:16:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/nestra/nestra-0.66-r1.ebuild,v 1.15 2006/06/20 22:12:50 eradicator Exp $
 
 inherit eutils toolchain-funcs flag-o-matic multilib games
 
@@ -26,6 +26,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${WORKDIR}"/${PATCH} "${FILESDIR}"/${P}-exec-stack.patch
 	append-ldflags -Wl,-z,noexecstack
+	use amd64 && multilib_toolchain_setup x86
 	sed -i \
 		-e "s:-L/usr/X11R6/lib:${LDFLAGS}:" \
 		-e 's:-O2 ::' \