Override Makefile arch detection; add ~x86 keyword

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

3 files changed, 17 insertions, 9 deletions

diff --git a/games-emulation/mupen64plus/ChangeLog b/games-emulation/mupen64plus/ChangeLog
index 6556d3ce8d8a..c32baf94f0d0 100644
--- a/games-emulation/mupen64plus/ChangeLog
+++ b/games-emulation/mupen64plus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/mupen64plus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.2 2009/08/31 21:49:20 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.3 2009/09/22 19:54:06 nyhm Exp $
+
+  22 Sep 2009; Tristan Heaven <nyhm@gentoo.org> mupen64plus-1.5.ebuild:
+  Override Makefile arch detection; add ~x86 keyword
 
   31 Aug 2009; Tristan Heaven <nyhm@gentoo.org>
   files/mupen64plus-1.5-flags.patch:
diff --git a/games-emulation/mupen64plus/Manifest b/games-emulation/mupen64plus/Manifest
index d9b47888a99c..d735325e1cb6 100644
--- a/games-emulation/mupen64plus/Manifest
+++ b/games-emulation/mupen64plus/Manifest
@@ -6,13 +6,13 @@ AUX mupen64plus-1.5-glide64-gcc44.patch 1262 RMD160 28ccdd74a669af58363501f386ac
 AUX mupen64plus-1.5-plugindir.patch 722 RMD160 905d38cd37f4afdc67d2e7ac7f8d66a5bc9a296a SHA1 d4b77ace873c4a50ebe89fe81f523c6e00dffc8d SHA256 07507a688ab77322317cf3b7fb6419f681386b343c77d26bf3fd01afa3348276
 AUX mupen64plus-1.5-unbundle-bzip2.patch 1317 RMD160 98403a2c3853fc60c666180b106a735e8c8410a3 SHA1 9ff21c4c945dc475f7c248f738913adb13d29b82 SHA256 cc5e3e15ad44b2c5483b222dd55bba8588759ac032b97667d9e3c69d590938e0
 DIST Mupen64Plus-1-5-src.tar.gz 2348443 RMD160 690d1e80d4a10a3a74e7d955c0ee23e3bd4ff996 SHA1 ef200d6ea2eb3faa969ba9c82d2a771236c3145d SHA256 58b2da6095ed8f3bcdcb5d7612bb0f1ba81cda1861ca784ef7e46991fd73cf3f
-EBUILD mupen64plus-1.5.ebuild 3097 RMD160 f462dbc2d138ec720acfd6a03c1cb2c62af70caa SHA1 f2f0ef4d440045437c44653b8cee7f265ed7de27 SHA256 1faf19ef811248bb64dcc52fc60f1fa4f84975c332fcd82270ec81a07f27de49
-MISC ChangeLog 1197 RMD160 6c415250170f5ba99d1e12840a2e71d09b4bf66e SHA1 5a1968b9d0a0364c60205cc87a39a23a3e6c95b7 SHA256 a1ad4aab05eb95f1b20bc746b945aa841e828ca20935f2c579d6ca87b95d43c0
+EBUILD mupen64plus-1.5.ebuild 3252 RMD160 ee582483c8a0b3a9129ff6fb52414e86f691491d SHA1 fbaf3b5991257a18103979d6d888aff62cbb36ba SHA256 360458e6401653bb015161503929cdc5e7c749df548a7f8435c9f3c00e88bcba
+MISC ChangeLog 1323 RMD160 6a94865fbec98e7a2c63b6c4638023141e6926d9 SHA1 57ffa93fd32fb3baddd8dcd78c781ed902b851c6 SHA256 031df4fba68ef75d05892f1b0e2fce575cd3470b57751b8630b9251f32e5d46b
 MISC metadata.xml 679 RMD160 a52b94f3dac0302970e9b6d9ead4341ca3722d5c SHA1 cddc937cadb60d9a67c578c815f192136b1dd701 SHA256 8cb8d6f4a9724cde575da81a562322e28c628a7bd7233de3424a3c001a006a2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqcRWYACgkQdz7hIScOURHLnQCgy+nvuiVmGYtY/7xfY/pBKBZV
-2XAAoJdOKvoA22MIxKLgqTE0Lh2iw6hE
-=0a30
+iEYEARECAAYFAkq5K2QACgkQdz7hIScOURG+rQCgsjh/ZbvXRgsIbgjo7MjTKGuI
+iwoAn3Po19bNhMC/2ve/+TwjGvlsHfZ4
+=QuPU
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus/mupen64plus-1.5.ebuild b/games-emulation/mupen64plus/mupen64plus-1.5.ebuild
index f4d21a5d93a1..0ae78a217383 100644
--- a/games-emulation/mupen64plus/mupen64plus-1.5.ebuild
+++ b/games-emulation/mupen64plus/mupen64plus-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/mupen64plus-1.5.ebuild,v 1.1 2009/08/28 07:50:00 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/mupen64plus-1.5.ebuild,v 1.2 2009/09/22 19:54:06 nyhm Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ SRC_URI="http://mupen64plus.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="+gtk libsamplerate lirc qt4 sse"
 
 # GTK+ is currently required by plugins even if no GUI support is enabled
@@ -49,7 +49,7 @@ pkg_setup() {
 src_prepare() {
 	# unbundle bzip2
 	epatch "${FILESDIR}"/${P}-unbundle-bzip2.patch
-	# XXX: try to unbundle more?
+	# XXX: try to unbundle more
 
 	# fix compilation with gcc4.4
 	epatch "${FILESDIR}"/${P}-glide64-gcc44.patch
@@ -72,6 +72,10 @@ src_prepare() {
 }
 
 get_opts() {
+	if use amd64 || use x86 ; then
+		echo -n "CPU=X86 ARCH=64BITS$(use x86 && echo -n _32) "
+	fi
+
 	use libsamplerate || echo -n "NO_RESAMP=1 "
 	use lirc && echo -n "LIRC=1 "
 	use sse || echo -n "NO_ASM=1 "
@@ -87,6 +91,7 @@ get_opts() {
 }
 
 src_compile() {
+	use x86 && use sse && append-flags -fomit-frame-pointer
 	emake $(get_opts) all || die "make failed"
 }