Remove implicit CPU flags from the Makefiles. Support epatch_user.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

21 files changed, 201 insertions, 126 deletions

diff --git a/games-emulation/mupen64plus-audio-sdl/ChangeLog b/games-emulation/mupen64plus-audio-sdl/ChangeLog
index 34b56986f6dd..ba73b12f6b98 100644
--- a/games-emulation/mupen64plus-audio-sdl/ChangeLog
+++ b/games-emulation/mupen64plus-audio-sdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mupen64plus-audio-sdl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-audio-sdl/ChangeLog,v 1.1 2013/12/15 12:09:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-audio-sdl/ChangeLog,v 1.2 2013/12/16 16:41:42 mgorny Exp $
+
+  16 Dec 2013; Michał Górny <mgorny@gentoo.org>
+  mupen64plus-audio-sdl-2.0.ebuild:
+  Remove implicit CPU flags from the Makefiles. Support epatch_user.
 
 *mupen64plus-audio-sdl-2.0 (15 Dec 2013)
 
diff --git a/games-emulation/mupen64plus-audio-sdl/Manifest b/games-emulation/mupen64plus-audio-sdl/Manifest
index db4f14d7e019..81a41d0fbcc1 100644
--- a/games-emulation/mupen64plus-audio-sdl/Manifest
+++ b/games-emulation/mupen64plus-audio-sdl/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST mupen64plus-audio-sdl-src-2.0.tar.gz 26084 SHA256 943ffa6b6cdaf0cda2a24469dfa1d8e951c88c41472ded9e5c9ecbc111363286 SHA512 92ee4755c22da5a753374c7c6f5e074bf6c1ab06a0ab27d475566d50f8ed75b636b59ffe1a8c9d3d63558bf5783b999a600703951679f7bab346643c0c86871d WHIRLPOOL 82a56a49f0ffe620917dba92bf135593c7e66e2944ec0688b29cc2d5362221b81f76e162840e315476d959b445d38f3bc1bf05538fbf1fa9de96b616835b2198
-EBUILD mupen64plus-audio-sdl-2.0.ebuild 1960 SHA256 fbd0296ddbe57fa252f13b7213234c8a57b4d94d364b08bab85293d2e0a312c7 SHA512 0bba18c05247482a594e7412f923630c824daf41183ea3e1dedf614c0d9c97ec314733e1b959b5fd724288eba5f38159c8cf4519abfbc58fa78d691de8ad25aa WHIRLPOOL fb93b91228fe8c9f5a1155b6b70b4e4e5d7bfd0bf3aedbc34f1848ddbc3f2d4d9e21544dce455360a37aed61708d9cff43c85cddfc0bc31912a3738a9bc2f5d5
-MISC ChangeLog 446 SHA256 bb73d6ab8c75238a43ff58feaed8df01e2946371c0d6eb2db67aeb43526d6b84 SHA512 d6acde670aae0f0040737c68c81b1932786f9b58a495166e09324308e25efd9750a0e25955f870fab9a243322138ad8716497df49ae09af60f5cb1c64466664f WHIRLPOOL 3764e50abdfeae88bcfb83322b9518c860a31662903e6e45488de07ef7ce29dd9695e4846466259045e72cf7a3afbe9cea1a97ae5c93364b5e08efa02a2c78b0
+EBUILD mupen64plus-audio-sdl-2.0.ebuild 2103 SHA256 69c2cacace67e114e3f7c2194ddcb46b039163414ff57eca2de19e68a7369783 SHA512 f591aca080bba6e1a02781539ef3f587eada34da5145f1bd440f2b3e26aead43a046f4b960e9279fb6a734628e92c555772f5796f678fb035d858f564d639da0 WHIRLPOOL 397c3dcb6f4c3919976a3e0bad6cd9a53d05fe578151c74410adb316408a293006ede37893c935b98c17d90a03ee2b46875fee409248eaf75c47223790e8d4a6
+MISC ChangeLog 602 SHA256 38c6f09c1c917f435540a6456893b49abd8e2e68168aa302fbed62e8030f2b26 SHA512 9a1363f04d8941318394a2de8a031a171622a5a6fab9fbe31f1b7334ab98c90913bb826bcda4ff17e4d840b5a9b8858975e03ff70426280ab758de7e1aaceb0c WHIRLPOOL de4315e9a659f53fcfab76e431e82fb53f3134b682bc07dad3c4ddef09cc0c0712ed9710acc355345e6b7c3e09e84cbd6fb71fd6e5217ad9d3edccb7c19a1874
 MISC metadata.xml 352 SHA256 b5b11f77354a3f9a9051da98c3e7499a195f42a2abc71c3fe55979eeab43c7cc SHA512 579bbf3da7e4b2a573bbec036b4e5710dbe5289278094e9dc3c3cda8d8ca9533031e189bc12a15a47abe9f4cb58f83a98d2b0796ac0394797085b367658c3af8 WHIRLPOOL 3ced83d68b1b7923be49ae91e82ffe778aac35895fd681e8be87f28f77b716a60384af1935cc632abd7c510181d76526d475548e33117c73416d9cd922af49f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSrZvdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSry1KXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6BEP/RTyEqeNkGwCSchW0hhTJEVC
-GLLy+BUijzLnvnbdZxSTjeRKkX1sRLD6eDeUkz5zejwppwdQAwnOLV2jO2lgpxES
-RdHmxKQHB8C1XXubR5suhs2Yx6fbofotV/tg/5Jc0z4dpY1E4qXx6W+YG/VrdQme
-c9JmrPxDchNl0kpXZUbXONWwXOgRcTPexqRgsD4L2Yj/vUijNKXVDCWjnNECGwlA
-oA0U2ViDYkSWmA+x7BtXHpWBXT25R/7A9DukzXnb6wb16YuKm+OIdTuIlxDncU/+
-cgwou0j3da40x7eHUQ1Yvw7fn9IA5Yx9uR1iwAGCan44tvRFO8Z6mkHSEu6e8SzP
-irSW1W2D880mtBBExw+QaYuq5Dbl3NEVUDy/NwMgcvFPAyYKkhUEOR7qq3rplqVS
-aM2+kueOGAJZNNfQWXbz5bKsWy5MUvSKqDRVNVidHatf1ddadGehTYdqTnElsa5d
-mWAE4I+2U7JWzupp8+NRph+6E6n4rRz0or7+UiIvw06GJcs31q9lG8k0S07Q9Kps
-O7Hmwa3CGTJpj14vPE7Zry/v7aY8kARRox+Ap/TaZ20+oRYErdmh8tPOF9uqLf/h
-lzsAsGI4qGEtOsBWif2SIARfBWX0T3qqO1D4qL9uUEHt994m5sUG+yj9/e9p7m9c
-9L6zl8PY26FIj5gR2s2l
-=LdRo
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZODnoP/j4XJzcpQyPcyoq/iR9UHVl+
+qhAG2/BwmZHswRpRiy5b8aH7+NHracqSNDnQ96CL0QamVF7jeEjK2nb9edlDVLUZ
+WbKE0HcgHXB+t59UR3njOAiDiuKx1AkVYnolOG+++r+ihTI6p0pHbdv2WcIyoz1C
+b3Adlhl2JVqNa5XRqSe+cVBt4qzXtQ6TP8Ncm+Ducjk2GH54vaNUszxhcafJ0ClR
+K+NQUic6r4bXicgumVWwS6l1V7eROkpklqv7jYDRo61l7yN31AS6ChtmExYXWoB9
+FW6iYZ7hsxhrIyly/6cIrjAtXbS2Lin1dssuGmNkc1tjrbdnmmmDu0LaWsZ/ocyv
+bnULz+zC5xq/nG5epIJ0NA2xJiGV8M009lsodDpqsyGbV336xyxo3EcmSNPwRfyl
+74IgHWaWHHBLMSbg4zCVR//Ny6kwDFAJ7+G6qS5kE+kKakIWKxv3Fmi/g3spiM4v
+q5cop9JoPKTKzVP2L+8FtAU0EKl6FCaFmU7NN3V9ryDEvX9KyblT/HtgbOXZ6HFe
+bpuoy1Kbok4CROaPZVlonTHjnJDsQW4Ut8iIQtegDwN8ncpnlFDPKKb0Dzc9aAen
+eCnoLo89FvZqQ/V25k+ZtLCQWtpyV+fizZd9nThC0sNMaNQcS8g4J2q+eGvEWpwP
+GlY5jqDYl6bbgIRgPmOG
+=6MY+
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0.ebuild b/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0.ebuild
index 59fa70924856..96717916553c 100644
--- a/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0.ebuild
+++ b/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0.ebuild,v 1.1 2013/12/15 12:09:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0.ebuild,v 1.2 2013/12/16 16:41:42 mgorny Exp $
 
 EAPI=5
 
@@ -25,6 +25,13 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch_user
+
+	# avoid implicitly appending CPU flags
+	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
 src_compile() {
 	MAKEARGS=(
 		# Note: please keep this in sync in all of mupen64plus-* packages
diff --git a/games-emulation/mupen64plus-core/ChangeLog b/games-emulation/mupen64plus-core/ChangeLog
index 29e2ba0e0b21..7d22e7e9aa78 100644
--- a/games-emulation/mupen64plus-core/ChangeLog
+++ b/games-emulation/mupen64plus-core/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/mupen64plus-core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-core/ChangeLog,v 1.1 2013/12/15 12:07:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-core/ChangeLog,v 1.2 2013/12/16 16:42:00 mgorny Exp $
+
+  16 Dec 2013; Michał Górny <mgorny@gentoo.org> mupen64plus-core-2.0.ebuild:
+  Remove implicit CPU flags from the Makefiles. Support epatch_user.
 
 *mupen64plus-core-2.0 (15 Dec 2013)
 
diff --git a/games-emulation/mupen64plus-core/Manifest b/games-emulation/mupen64plus-core/Manifest
index 4e5e61d02818..e5678b5d39c3 100644
--- a/games-emulation/mupen64plus-core/Manifest
+++ b/games-emulation/mupen64plus-core/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST mupen64plus-core-src-2.0.tar.gz 1127862 SHA256 7e98795dbe4646b858919078f58a6ed94f7cfa30867df6cf44ef33da6aaa7a28 SHA512 6f7391536c23b465af737b3b64f3488bc0275c472e27f97f1d8be61e917c6772cad2c747db8ffa251ba88ba4f4c0d29de2451325f3ea4bcc6049534ef1dac41e WHIRLPOOL c32c97071d911696c9b24a931287ba7da1bdb29434300d984926a2a1b0541660022b6a811f616e8ed18de8d59fdafd168a571b248165c950d80f4e045e25aa53
-EBUILD mupen64plus-core-2.0.ebuild 2394 SHA256 24ee81ad3b323901c73a686af6ff64098548ba53c16d4cdb5ad6262c1039038c SHA512 b403b82e43fcea5184efa2807c1051d9907f0eac57c2b86b8ed56e53679d08e8623cc682cf86f7a4bb5cebe3fdfc166025bedcc3ee1362d959da9d1b52b60929 WHIRLPOOL 79ced0f0f24f094f8f29d8c28a5e003aa0dcc987a5969c8a9de608697d41a441e187b75069edf0d13a97cf3ef866488b243b7d4f6349872fd24b1804a3e39347
-MISC ChangeLog 421 SHA256 eb6feaaf47a1e67ff8913022bb60213f83cf1f03545f89315dcd83a10f2c34a4 SHA512 59747c003388235cf935192631caf5a32f62c089b5d23bc68f9a4edeec8d3205ea73efb041d491dcf003e82468d6ba490b609e5a7ce191c380f3df5510b0eaa1 WHIRLPOOL a8599e347fd2d09ea0d3a3fe4703c66cbb0960582770718217844228d3b7e56567d195d4bb76e790afbed820b545193b5e34c106364658c6ba62f948d9e8e751
+EBUILD mupen64plus-core-2.0.ebuild 2537 SHA256 1706cb093acfc541541f0527e846cb9f2838ba22f86937f5d3b5d6e5fed40f65 SHA512 fac2c95d2e59de4e2af708ccb36d14a6517d6031336f3f59902fbe7f2ad298022ed600ab9128259aa417ed0a278b1675e746799f693a57e5340a7473f923c53c WHIRLPOOL db2a1dca6272cd714e60de4db87edd1522759d6895d0edc4ee5534957df19224e66edc77c0e266c246b29d577b0ecc0744c5fd8c23ed7173151d76d5de4d93bd
+MISC ChangeLog 570 SHA256 3e8d9617bb9865fd583926a083a49919c4074ff67c2fc0227e811bbef779b5d0 SHA512 895664f490aa1cd1703db9dd7cf073c1ee31ee5e10f82cc12494c038bbe8c90a887d70bf262a3794f3ef74561b13c072a1665003067db7c6936ca3be8cb7e4f1 WHIRLPOOL 2ca219e607a5f6b2da3fcf1317adecacf1a1d7220a8db7067513c6d7741f95044f856b50ca4dc98079b081575852595cba9d1b94bdff0b3a982cff87c8a3982c
 MISC metadata.xml 889 SHA256 989541d6301b589b95a3b07a04d37c7f00d8a5eabf2df70bafc826471b4669a6 SHA512 c190c870601ac89e30a9db66742fd79aa653523973c053c732649c1685346c2e4a7bc5fea8184ef29c045baf5d51c5444f2a328e64f03dcb7ef5e9a320ca2aa7 WHIRLPOOL 9ecae27a5e8f2c3942812430c39270f3010b03f8f6d3cfcf248c74d5ccf7b9bf6918421baaab2ea601f8e07ca57c3c65eff7a9371a7e170e5d759f64573d8023
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSrZuCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSry1ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOVbMP/3Vm5JsF2o4sE4F5cmRxCP9h
-7aP8MOTEBkLwvGM6nJZHplgotQy09SBACNfEQcm1IPndhzwzBMCE6Z2ry9/1UIAt
-ve7vQ/Ztej1jtfv7tlqqeVubPjTr8rbu9BwRu5hi/npTwHiU45Y93olybYmcNVQD
-qGHawq5Wqt4Icg9c39G3tQcZ32ufIqnlzX0Vth/dxNtsxbtjVi9dJXTr7BaqSREe
-atbwA+bKQcEjn7qt6VISLJtwdxDPQONtdoxYCIbftY/z8+4uph0pGk0Ttgkf6T3B
-kDU+kOvF5ePcmFN6qsiB5LM3er9wvZE2yiQrhFRgQlzajKwY/dNR1hmLEFWD00Ux
-RMQRdNCBvWKYFXCbHF2yl3P5i5Ajut8ODX3iu+wTlEucPQS7JSaocIKxzFYEVBrW
-bxqjp6XwmVMdZ2vV1mDryhaLaLVfVK7pd6u+YjQwIPNVpqRrCgtEsdWpebUb5Ix7
-b7GKeefnlZnVl2xOD2JrZGT237C/VeYvB0l91+L4as0//l2aqPQND1UurLs6DxOg
-9stdBcPAKUJx320MlyECjyILHQJvTOGd70e0uOiuvgG7Bx+gXbfMLXChQ3ukxC0S
-TkqaOL2Ka57tLvFdCfyGG3KnXK6j0/uPCSrH9fy7AYwLxxhPAeWKk17I9pDAl95m
-+jvE/YTExthHEn798npk
-=S+0w
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5E4P/i48PrxYXQGWpgToVr4EpYJf
+cB84AEQ1U9e1aWq+mqeIBo/hEckHZUo/07hk2N0HhwrhDRVcL9v7OPSsHl30Zkcu
+UZdJs26LVMcke0EJMR0CodXyOm2RjmRI3xxU7rtD7vxPYjcH1/rS76pJbt0uQLY4
+p059li0+aR+Gp08vL/5TseoaDyrm3yuFmBDHKek/pJj2y4aKWzYlt2VhNuqmj/Cz
+A5XBs4z7D0pKsG0V3mB/5gn5O0RhYPNsbzjWkmJP+NASzYUluK7epW3pb/yCnvPz
+/k7Um7G+EPs+mCyGuvmHFAd6c80ry7aR5MDtk/E5l0+kcpIFBCXCrzSz0asILCsF
+dH6xWcDIFmLOTG4/ebor9BS/IPqTXkPyVBRa4WxKLpb2GOsFyuiEAVAUAKxe03XS
+bbrblz0Zc3sC1/GQ4YYXAchPYd14nas9KnRWQQt7ssZ8zN/nA0jBx4Ry+XdzkS1h
+iiBgKGArCincfQ3v5I2jyMgeONi3VQXXlHprn9TAtFXbDwO6FSen7Fh5QvYLai/T
+1leXU99NjNxyGgIRcUJrBfKJvs4FRUUA/h9+xVEZ6Aw6quqRpK9KKv/aU1CpasOv
+3IxyoAU/0iK9pCRINzZj46HlFtlHkT4ZOdwEfAb0tH83Ms4/9igtIO8B1sLNJi+m
+KGQMIErA7xwKohHQRLm3
+=ugS7
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild
index 1f650845adfe..86ddeac77299 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild,v 1.1 2013/12/15 12:07:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-core/mupen64plus-core-2.0.ebuild,v 1.2 2013/12/16 16:42:00 mgorny Exp $
 
 EAPI=5
 
@@ -32,6 +32,13 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch_user
+
+	# avoid implicitly appending CPU flags
+	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
 src_compile() {
 	MAKEARGS=(
 		# Note: please keep this in sync in all of mupen64plus-* packages
diff --git a/games-emulation/mupen64plus-input-sdl/ChangeLog b/games-emulation/mupen64plus-input-sdl/ChangeLog
index 2c8b4e5a482f..9c508d166048 100644
--- a/games-emulation/mupen64plus-input-sdl/ChangeLog
+++ b/games-emulation/mupen64plus-input-sdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mupen64plus-input-sdl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-input-sdl/ChangeLog,v 1.1 2013/12/15 12:09:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-input-sdl/ChangeLog,v 1.2 2013/12/16 16:41:59 mgorny Exp $
+
+  16 Dec 2013; Michał Górny <mgorny@gentoo.org>
+  mupen64plus-input-sdl-2.0.ebuild:
+  Remove implicit CPU flags from the Makefiles. Support epatch_user.
 
 *mupen64plus-input-sdl-2.0 (15 Dec 2013)
 
diff --git a/games-emulation/mupen64plus-input-sdl/Manifest b/games-emulation/mupen64plus-input-sdl/Manifest
index 777a65406a00..339c4d964a2b 100644
--- a/games-emulation/mupen64plus-input-sdl/Manifest
+++ b/games-emulation/mupen64plus-input-sdl/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST mupen64plus-input-sdl-src-2.0.tar.gz 43553 SHA256 b6be48e978683cced8c208ad03e27828c17ac7b2da5e699d6c34945db63d95b6 SHA512 adbeb83e01721aa74e5e65c05e4bff2a250c7bf51835a8b2c020752e9bf0bdb0f0672914fc5285ad9da2e6fa44259780aea6415d77914bb34e521f30eecf6747 WHIRLPOOL 647ccef13620c863077ae2eefb6934d966eaa413fe70437a38560e5fa03f479428e4848f2c2f3f38163a122a29f8b118fb50f9f772bfd1df96ab2860044352d7
-EBUILD mupen64plus-input-sdl-2.0.ebuild 1770 SHA256 4db2694d80657908bc98359a648f7262a399ce38cea316765fb09a9be959499f SHA512 c889b75cbebb92792e3662113565e14c321fcd640c4e5c195a58960c63cbf16138d5143862ecfbc5f3e566ff73a06d0da7ada18e1722ebccbfebaa93c4006b07 WHIRLPOOL b8e019ed6221fe6db3ac8721468ef56bc6513c0091f3983f3b45f29c9836f0db207efeac487e033d3762ab87c2509ec939c3ffaa93df05088ccb58ed50b55b50
-MISC ChangeLog 445 SHA256 0e0b47799a9d8b6a59956b8b0ce420e7c17e87a09c42af157c5e0ed715136c85 SHA512 858b55a0fbcaa3b51b0abda2397c8247272c3ffd84cd9896717ecdf058779a3e4f181f32dd80eacc85741aa94e65c75252dd3c560c820b86294e9c1b49413876 WHIRLPOOL 8a215611f1a18888a731e44dd736877d11187543f8f37bbd4550b30635d3be44919fa0b74213b3278db289eb735d2429aba8315accf87ef096ff151fd330fea1
+EBUILD mupen64plus-input-sdl-2.0.ebuild 1913 SHA256 612cc99263019b00914f27e3c5ebaef06718392e8a78aa4ce51d267a5740992b SHA512 a572c47b1392e8800b75d7a32ff3d1c9d4bb579771073f910356b1e2427cd0a5ef15ef830824dfee9d4195230eb32e5de6f794759fb92f1cdefaf1a55db92548 WHIRLPOOL 30b8ef7b089ecbef86b89d722570232e00abdfb0c44fd14db71a7c7a4ef3b370b0307c6f2fb47b16e5df0b3b3c107f9ae8ccd01e792fff290d6701e56eb9793b
+MISC ChangeLog 601 SHA256 0516de60f7bd8b0312eb52e6e9efbd0458f246c49d7cb2928ff7a727eb13c021 SHA512 4b2cbfc22035f0eda8a522139896f00314883b32840183efd61713c820793da69adea6bd2846a603b6eb852b444afd2743276e8904bbe7a862977b0bedc33dcc WHIRLPOOL 300cfaf52600dccd54be6e511453c7fd475a8805a24bc66a7a49add4e8794289665079d026ea6ccd7e71eb4498a8f23707fe36ebd62c2892ca2ca35b240432a5
 MISC metadata.xml 352 SHA256 b5b11f77354a3f9a9051da98c3e7499a195f42a2abc71c3fe55979eeab43c7cc SHA512 579bbf3da7e4b2a573bbec036b4e5710dbe5289278094e9dc3c3cda8d8ca9533031e189bc12a15a47abe9f4cb58f83a98d2b0796ac0394797085b367658c3af8 WHIRLPOOL 3ced83d68b1b7923be49ae91e82ffe778aac35895fd681e8be87f28f77b716a60384af1935cc632abd7c510181d76526d475548e33117c73416d9cd922af49f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSrZwHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSry1YXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOhcgP/2jhaOcoGTlmLoYlDaL9HvD0
-YnJoMm4slIxT2JmLrL0RNbTK4GawpfWCxE7nKd+8XJhTkikJqwIDjQQS1ojqNpUQ
-elBoNxuUy+FOkYq8i2V2Z7mHj4DtaJBKcFkHzNcImwxHFzw0dHXEagNg2vWtdH5p
-mItirumd7QxQVA4UE6/b6iizTMaxsEyuTOOdRr9eoR748NhH1+Wl+isKg1btQhpO
-CVmlZyrSnNev4cuLhJ1+jU+W5ENnnRVkzd3JEJypL6Qv/vKh4Zq2D7s74zOHCfxd
-jVl4MVQrW/Uqj1KCVBspjld6aPTRqZJqSmyDnl44f1kCShAcgeZ+UgkL1r9oP4Kv
-sgvf2lgCAW29F1OUKXCP8FTYu7cIEYLjZSjwx/XcQKe/2IDMPhZiB6OLAVHYFJ2R
-sB76TnOg65K10Bj/CAcxbbyf7UiZol6a3LX9Og+NZIak69EEqE6b0ek/Cs4gwWMH
-zSzuvpsRg/d5EYOYLIQ1grO71qwdVIOPM0UJqYZh8kBJI1Uji4LxXY1VOwOkZoin
-y39Nkv3CUsGRjkJWmJDNgegIPBxbf6Ftx1wT4QcySk/VBt1Q51nQO0UPrFqmtizT
-0NR7wXVKM3U71zYGGvnndUUlnRdu4dbSNerSaXD4DQR67taLUCfkVCaDrynJNMyB
-4gCB33nEyrvMtIM4HbMV
-=L5rT
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOFPAQALaZFqT6rt7hls8kcoSsvP5h
+DqH/TUaFYHje1mKUr9oSr5rZ/8Yy0mh58oxfcGT2ehjtgwl2PP1TtxJQa3BUcFoO
+GNSai+eE6661YZxfsZ9t3wdKE17KtGVYIw5MlIDJWFu99Bj4q3xtGSkKidB/+9cL
+29uwb0wL9T5tn2KGZPkyILs3JTlBlkI2tnCXq7YSF5Gp8kljKHTf5LOrBvgfxT+0
+4G+piG4JMHpeXZvj39e04ydLHYvkz8Uq6Ast+O0sLRD5BtWC10lJk8nprTAIsxF0
+kglN6v4HqLwnWiC4q1RPnqi1p7Yg0Y4Z4n0ChfBq2pgeWqTwJatxdVXLXEhTxbh1
+y+JS7L7QLoPRBHKvi1hfBct1hxnVkMmKx0Tr257qwjXMxvvq9v6+xPiPRgnWvtgC
+A2TlUJZ3PcjHsAVxSevUNYDzcGSYM2I/nqJQxpBkDPoMltPclEInPGy8Ot2oTR9Z
+I1xBjk/2MEZgPlQykEa6ufhIVqV2VEj41uM0Ry2NaQmGxshCYJzEEevzUW49EhEb
+uqAO1YqZPXqQfvymnOuU9T8XzV3A3WGTB6Qs2zS1Uhhj+MXHpSoGcwbom+ZPQKhH
+CcTIjVjl4VIlYxKMtJtonFqMj66uXZh+edlhKoTBEyEsvKjYJw6jangA2m5WRJjD
+eOAQplQD1UFFZ1tgTZf2
+=Cor9
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.0.ebuild b/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.0.ebuild
index 99cd3973b5da..391cff417476 100644
--- a/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.0.ebuild
+++ b/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.0.ebuild,v 1.1 2013/12/15 12:09:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.0.ebuild,v 1.2 2013/12/16 16:41:59 mgorny Exp $
 
 EAPI=5
 
@@ -23,6 +23,13 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch_user
+
+	# avoid implicitly appending CPU flags
+	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
 src_compile() {
 	MAKEARGS=(
 		# Note: please keep this in sync in all of mupen64plus-* packages
diff --git a/games-emulation/mupen64plus-rsp-hle/ChangeLog b/games-emulation/mupen64plus-rsp-hle/ChangeLog
index ebd5682c5f01..852277db9e19 100644
--- a/games-emulation/mupen64plus-rsp-hle/ChangeLog
+++ b/games-emulation/mupen64plus-rsp-hle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/mupen64plus-rsp-hle
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-rsp-hle/ChangeLog,v 1.1 2013/12/15 12:10:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-rsp-hle/ChangeLog,v 1.2 2013/12/16 16:41:58 mgorny Exp $
+
+  16 Dec 2013; Michał Górny <mgorny@gentoo.org> mupen64plus-rsp-hle-2.0.ebuild:
+  Remove implicit CPU flags from the Makefiles. Support epatch_user.
 
 *mupen64plus-rsp-hle-2.0 (15 Dec 2013)
 
diff --git a/games-emulation/mupen64plus-rsp-hle/Manifest b/games-emulation/mupen64plus-rsp-hle/Manifest
index 9d3d54028bd4..8b30fc37cdd7 100644
--- a/games-emulation/mupen64plus-rsp-hle/Manifest
+++ b/games-emulation/mupen64plus-rsp-hle/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST mupen64plus-rsp-hle-src-2.0.tar.gz 46291 SHA256 61c2bd163b3506d206957ba690dfd1b4d2921a6c8a3883ab6a8ef1204de7b736 SHA512 e1caa121d377be0856708fa5c13c234abc0bbb2cab90f40963983baf6230a1d4a4b7da9af0fa2ed6737538265b6392d8a43e9e537ccbd63bbb6ee44da8b29fdf WHIRLPOOL 9b3b1557bfc301390b5069892c4fabead82d7a6f1bf28da7a51ce8345fbbb12e611756d4818f423936517fbc51b0839eb25b3e9acf88160a9857ac7c7eb9ab35
-EBUILD mupen64plus-rsp-hle-2.0.ebuild 1479 SHA256 113093278a64738cb6e63da9046e8aabc31efeadcaebfb738b3218ec2c816156 SHA512 a708531b4a2a321a6a39e857044cae350216b135b239642d6db97b89c16b271c8d02906242dc6c0d40c5042d0db73cb3d4767847817420408f8fcfb46b978486 WHIRLPOOL f2b9825276109404e64e86bbaa61663dcd77fd91b589671fa05d07e53c7e60afa2a92d88341640a8da43311e709521655598c0cb2a242f7a4ccd31b8e899f1ce
-MISC ChangeLog 435 SHA256 afb2ea7f4a4e406ea821ec7662bd9b1eaf05e888eacfeaf4737500f2844deaf0 SHA512 1cdf0992b6fceabd50da57cb6f5431a196111bb24c753d4b31045d36fe7626429a851c8934a02508b70e3419412958ee9940baf3cb25e6324b33d5239bc01ee4 WHIRLPOOL 71f74e706239697678c4c0e3d9f36cc21a3712340dd028a6753d75e2510ce663717f6c58edc2392f3462afc143086429b73e95f818944a1703b9888927e7ffed
+EBUILD mupen64plus-rsp-hle-2.0.ebuild 1622 SHA256 03b7a8c8ea693b6eb441e3ad7dd3fdd69f78a833696f7ad2a2613e40ed4a5aa6 SHA512 e9ee3b56e654562bf5da361f29cac3e365db5ce6eda1fa1544bc490e272e4cd13fb2ebc677dc5fba5c15c4c9a68d9f48365bae92be8f2d2c98d942ea0211039c WHIRLPOOL eddba5fd23e998b4b78b0b250384bab83669a7da60bbf330bc1da0c556538ccf188206ef3e01886e19beeaa9e37da9c1f73da48e4394f90592ceacc7e9a4a33a
+MISC ChangeLog 587 SHA256 5a6d415ec844188df17dbe5465575e0e22ee0a1abb3a33c50082b31e2b2ce3af SHA512 7d56e8e3c14ea6c3ff7f334e83063beedf18cc674b97e93c171541613ca020dc0f35be21925bdc960cc2995cde0f6697142d21f595a70d42d8cb31986d87c0f6 WHIRLPOOL fa002925f223935c5f4b7d0ddd66a3b97638651870e91c0803bcb868141bbc32fddc25fac6fdeaf63112c61ca029e3f60cc79e41eddc5ed82c9cdcc4a12dc1b6
 MISC metadata.xml 352 SHA256 b5b11f77354a3f9a9051da98c3e7499a195f42a2abc71c3fe55979eeab43c7cc SHA512 579bbf3da7e4b2a573bbec036b4e5710dbe5289278094e9dc3c3cda8d8ca9533031e189bc12a15a47abe9f4cb58f83a98d2b0796ac0394797085b367658c3af8 WHIRLPOOL 3ced83d68b1b7923be49ae91e82ffe778aac35895fd681e8be87f28f77b716a60384af1935cc632abd7c510181d76526d475548e33117c73416d9cd922af49f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSrZw9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSry1XXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOcBIQAJL4LGwMxA2UzEfg9xXvCUhK
-Klx0hIXXjiRIxAHp1LX/jvb2Ea7YCqyttVVhGtmWHpQ1xHrKeXj8lTrAZKwDEtmf
-vhKody8/2yIQ2Sxv52tw2VnF+cXPpdAq5wraCq2wcyGHLi6Hfvu+GaLRXsTE1h1W
-AKb85aA3mRTSzcyhnIDXa7lT2j0RNcslzJ0a7TJkE4RHLbBTBnPzef9BIxAZSuyl
-qX7guXeCnvuvsQ7rBT5zjSd3py15sHaptu7Pjj5jn6zJovyKeIsTyuozcIKCXyOH
-7aXaJBZGAlo0hYM68LP1EfzvMPv5g/+4BwZlOAtucP9SZez79hC8lH/EVnvRfsId
-9iIkSuaLZ1bSCvq/H1wePeJy4PSbSx9mXzqzQXIpIm5zDjIYKFbMIYdz8F3mGJjC
-YPTux7MUsYgWyCBQ26V1s/+X8RJuuSZTe+CHaD9IQ4YAqAYYldFj6ypzIFcR9QQ5
-k+GqYWPGqCDFAqowKdWqLWuAeiBi7LA3UmDdyy7fr3lVHF3blHV3dqDixanxQ/dc
-4DB+ZBIIAjawHk2lxsutjfYALYLM4UWO7AyTo0ZRpek4eH7QTV4QvWYnKihYzgMk
-3LRySVz5rrDWgefitdva0x4DI0fLeu48XfNK77NDzHxNOhkjAPNdI8MwuUuThLZO
-rPOk+RjbvDnHxSZUb1uz
-=mKPI
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOyYIP/1bU0Zq6cllG701sss0B/WS/
+hsvSV8r2xqtQ4fphZg2R0Oa2GKZ8EZXQcQJijR262Q3nlTGzfMqe1VaAvlmXJ/y0
+5TONFlcvgHLMp+8UofZvz7IUQR6a/Xv6yBGWBT49fyiiJkasyiv2/Z53gA5icP6d
+S9QEcp7292VzO01tgoWNebkw+PQAglPJlZL5c2nqq+3fxHQOkoRzVbL2jk1Psny0
+A6hpr83lGCPQ+31nkvoZdJ4iP9vZzonLgRI1GbyNvhNuxP9v6myuJm3psNcd2ePC
+N6AJCHbZO/TWxoIAEcc2btiyii4LGlkDyw5XNVTA+pPK/UWNxUU1QSvmWtWmRQOs
+lFLNjfe2m+7iO45JZy7SmLyhGQ+jw+ICOo026WkvhTt/FPBlveXON44XSC8VUrsl
+gb8Vaf+s3hQ2AXu0sQ/tkN38mWrlJ+dNOmBlGCD+ZDNWhBYfWvh2HU2dSj58Tnyl
+QrHbBfZ343BN77VSXO4XeaJryLeYCDFyBvrkMOVVXYkP/cNWQ+z6+gaZ5NprTJnC
+UG9dKRMYE2ZtlIw3g/Zq8eExDgMJb+2YoY1vCMcsQh2gD26cCXiBfOWiDppDRTkr
+qlGNhrz+E9Z+yETnMSkQeXON8w6JLCOG6zBlpiDMvySXZyf149S5JtsT5pPMwZI9
+YPvU73xI/d37flHv51BU
+=vNg1
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.0.ebuild b/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.0.ebuild
index 3e37ee4cb76a..69456c0a4d6f 100644
--- a/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.0.ebuild
+++ b/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.0.ebuild,v 1.1 2013/12/15 12:10:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.0.ebuild,v 1.2 2013/12/16 16:41:58 mgorny Exp $
 
 EAPI=5
 
@@ -21,6 +21,13 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch_user
+
+	# avoid implicitly appending CPU flags
+	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
 src_compile() {
 	MAKEARGS=(
 		# Note: please keep this in sync in all of mupen64plus-* packages
diff --git a/games-emulation/mupen64plus-ui-console/ChangeLog b/games-emulation/mupen64plus-ui-console/ChangeLog
index a8495fbfc634..53d80c41940a 100644
--- a/games-emulation/mupen64plus-ui-console/ChangeLog
+++ b/games-emulation/mupen64plus-ui-console/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mupen64plus-ui-console
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-ui-console/ChangeLog,v 1.1 2013/12/15 12:12:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-ui-console/ChangeLog,v 1.2 2013/12/16 16:41:53 mgorny Exp $
+
+  16 Dec 2013; Michał Górny <mgorny@gentoo.org>
+  mupen64plus-ui-console-2.0.ebuild:
+  Remove implicit CPU flags from the Makefiles. Support epatch_user.
 
 *mupen64plus-ui-console-2.0 (15 Dec 2013)
 
diff --git a/games-emulation/mupen64plus-ui-console/Manifest b/games-emulation/mupen64plus-ui-console/Manifest
index 1ba8785acb1f..354785c6c529 100644
--- a/games-emulation/mupen64plus-ui-console/Manifest
+++ b/games-emulation/mupen64plus-ui-console/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST mupen64plus-ui-console-src-2.0.tar.gz 37954 SHA256 87b9ac0a5ebbc835baa4e1fba0f50e7467e87da6469aa28fdb196e2040e54877 SHA512 7276e19772cfa047ea75c0c87930d7042a41d7d30912cae7f2c44e37ce6d446e8f5bf4e8ce89e69cabcb05185fe7b59a0ff5d12a7f7bbfa010404c2bedd94ea0 WHIRLPOOL 455a3fbb5eb0027ffbf52693e41f2fe8b5a098e32daa0d532b05f0841a35905beb0ffac9b942165d0b03f975468fff75f953cb9b9de02f8a5e49944e28dfccf8
-EBUILD mupen64plus-ui-console-2.0.ebuild 1851 SHA256 25104a6b6f8022b4748dd1015bccb7979ba8fc7051e84337c7ba290c55f4f924 SHA512 22a2fd63e62af57624477743d256e9588bf992bef9458ebc09ea8879abb7d55e1328425875e279de0099ea45a3e8605a314d478fe8aa9710b1ca67111603188e WHIRLPOOL 7b3911dff47b65adfa53e2fed133cdcd7c3a83bbe2ba6a836790641e5924b749f7fc87f858759d28064a173314815d89337b322dc860cc254758c4cd824a760c
-MISC ChangeLog 443 SHA256 d5c2c20d134e2c3f69fa1eb6466f99ec20081cb6135fe297bb82d038b10c665e SHA512 3484a0c6399362c76907317bf7fc6259be697eea5c5912eae1787b94e61273a4e5c2adcb857b2e8af6613a1f4caa8edeea72a1a145e316720e61665a0772202f WHIRLPOOL f416a28873d344af7a82c9c7b8536d22e944fb9eabded9ba22beff4e7cd522fe0cbaf2ef54b7076f6a7faf80e94fa9c46d80cfeefba33b9ba641c830adfab6b7
+EBUILD mupen64plus-ui-console-2.0.ebuild 1994 SHA256 324ee759468c7da2ca2cb6591a9da365ccc188ab18f0ce44e0677e9d7e82e17a SHA512 a4d82fde1ad4ce34aeb98104cfd8fa65fa76715b4271b70b1201fff686970a4dcadf41c8ac424b7e65e67b1ebf60fce4eb43b2890c84deca5e2c85edb1522cea WHIRLPOOL 2afa3340ea636f0611e2090d97e3a5d44ef28e88180fb5959b98a1cee98abd3d79e5f5311c1be248c4e5eee9430308c003d5020119d67bb2d23f4fd927eb24f4
+MISC ChangeLog 600 SHA256 a2b34562b71c57c6b0bf416b6af5b25348b17bbb731d51acc060c5472d405784 SHA512 7cdc69b7921ffcfa2a63b5970db2e0c48445cbcfc114ec201ae412c928456dea41beb35342a61bbe0a712e032a4e2d62f2300d620b8f9a4c21b48a0d722a7611 WHIRLPOOL ce698c14cc2d850f20c72d9e16fb26723be4a33ee8c453264c910712bf3d31fecff07772c98d098258ad3b4f434a68101080d2facf5e574f7933390c641db426
 MISC metadata.xml 352 SHA256 b5b11f77354a3f9a9051da98c3e7499a195f42a2abc71c3fe55979eeab43c7cc SHA512 579bbf3da7e4b2a573bbec036b4e5710dbe5289278094e9dc3c3cda8d8ca9533031e189bc12a15a47abe9f4cb58f83a98d2b0796ac0394797085b367658c3af8 WHIRLPOOL 3ced83d68b1b7923be49ae91e82ffe778aac35895fd681e8be87f28f77b716a60384af1935cc632abd7c510181d76526d475548e33117c73416d9cd922af49f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSrZysXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSry1SXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOmqEQAIfll7C5pERAelauO/zvKivc
-loqM9vB9/8S9bbq2FgvRDk0nC3yGoEEUzUmNNyPAWZ4qYQMLPcH3/YbfYdZbKL0R
-EPFacyb2ws41AYfsg1IZLm8adBaQarPRCfYjS9vMwILH0cbkevqrYYiR5DRr+KYE
-rydBfBNl4A2ms/n1wd/qLvJsH1bj94q+MqWNUEKnCLlfcLff6KElBtmeLA8DjbXc
-vS9i1n8HQgo0AzphyOZ/mHc/JzjReL5ULHdzSnfhvgu6YMtz63QNYlSfoNY/ziJP
-ikPFWqIiFd62wE9h+j0o/poegb7caDalUTLOTDRNEO5aZC7NXRdqO33THO2ClroF
-m0NKB7E4PIXhIh9GTF/5m26OgseukUjaLuEc04sWwtbyLBesACrdMii4CU9fTsEP
-5JoBeu+vCiDenYie/PayfU4PQvc+GJRIhmZZy2LFVkDBBSuDJV96mmLl8AzWYu6t
-fWqiQYh4CXYfg5wsQ1Zr5JabsAfGG5lGMHYlcYCHX8CWnAtFrf6YFxsqI9hBG3W4
-TMCqN4Ba3tKqEFCLpFUhIneCNpBqL33RZlbE4hevJTpQex/JgqGB2X5D+iHnjQzQ
-hxVHmjvE/ZUERHq5VB0HRe6LyACI/UwRqLNryZGQcqypQi1rLR+lrY5Xkvrbj7WC
-YCqqKRZW1FzUEIPvJNjo
-=2RF1
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO64QP/j2YKrF9vrq2NZ4rHZ8kgO9g
+zrwKuUjbMC+BFWIxIEM2vYoESzgRaF7lCx2zCd04AblUa6sVIxRIWMRVepOWx8W9
+TsOcaJVwnI5h9OB2Q1HQMznCid/C9Qihs5NT/B8wZwhsvUcYoAo74Eu/+IPCxSsE
+HNFSuZ0OZLpNwzrRoFkpv4m8nLiOxe3TVe5C70c5ivrjI7HWdhwje8tYVRmVXOOR
+OHP5Po0V41DjIWG5G/+tJApmyw9kTyvoG5Hmhmm8/LFoeeLSazumukhxvBNYRVRu
+EnUD2KXbQfK8KWNszLNbYlU9oCwKBXJBdPLgfPJrXpbSKea9TNoLEmhi0l0mhcsK
+E/19Y2gvXwJYMemjBt0Y//Tjvjm7HrpOPbz7ATLBUOBPbr+Tl1MDpnk3OJp6grAG
+ItLHQSZNS8wFZq9uBCXuRUnE0MfHwxTPe5j5GhKd/IYw25uTrs9LsmT1nsC2zL6B
+RIF0eesZ917rEpDbtKcWu5UphsqOyxFZo2HN2Cw2ggb4rkGTkUsD8YlM11VeOLDe
+3TdvyjYfx4bQfOPQM4c4ewdLTRLvQB4lj2FNHUvhZXWtt2juLXtfmFaCdr+I/Z0c
+Ejf4o0psggQlKXxwiLVYKnEDg29CmM/0ktKMaB+9O1wfiDo2klBdOzhiEfJO4r21
+qH5aOSr1FfI6kuW7kC8n
+=ZnpA
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.0.ebuild b/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.0.ebuild
index cc21a34482a1..549373feff34 100644
--- a/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.0.ebuild
+++ b/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.0.ebuild,v 1.1 2013/12/15 12:12:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.0.ebuild,v 1.2 2013/12/16 16:41:53 mgorny Exp $
 
 EAPI=5
 
@@ -24,6 +24,13 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch_user
+
+	# avoid implicitly appending CPU flags
+	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
 src_compile() {
 	MAKEARGS=(
 		# Note: please keep this in sync in all of mupen64plus-* packages
diff --git a/games-emulation/mupen64plus-video-glide64mk2/ChangeLog b/games-emulation/mupen64plus-video-glide64mk2/ChangeLog
index 4876dcd2bc75..b81da99192b3 100644
--- a/games-emulation/mupen64plus-video-glide64mk2/ChangeLog
+++ b/games-emulation/mupen64plus-video-glide64mk2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mupen64plus-video-glide64mk2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-video-glide64mk2/ChangeLog,v 1.1 2013/12/15 12:11:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-video-glide64mk2/ChangeLog,v 1.2 2013/12/16 16:41:51 mgorny Exp $
+
+  16 Dec 2013; Michał Górny <mgorny@gentoo.org>
+  mupen64plus-video-glide64mk2-2.0.ebuild:
+  Remove implicit CPU flags from the Makefiles. Support epatch_user.
 
 *mupen64plus-video-glide64mk2-2.0 (15 Dec 2013)
 
diff --git a/games-emulation/mupen64plus-video-glide64mk2/Manifest b/games-emulation/mupen64plus-video-glide64mk2/Manifest
index f527e368014b..5c5da6f8cfa2 100644
--- a/games-emulation/mupen64plus-video-glide64mk2/Manifest
+++ b/games-emulation/mupen64plus-video-glide64mk2/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST mupen64plus-video-glide64mk2-src-2.0.tar.gz 445166 SHA256 7761594432e90aed2dd12a5f16b30674c65b1f1abad0d98ac6239c3b2c44a4d5 SHA512 043b84927219b574da3c489119007bd115c9fa0f3f476ea9e812c8321a7f1e9309af06bed0b975c00201bc35f925d3b85c3411aa02310fd1ea508191184afa9a WHIRLPOOL b55c7412139b5b31fc919947068a7ad06958b20e54b9ac350cac88af3fec0d03d4f36675c1b60ba330061e652d489113bd7b84f53e7677c3cc1f0039c2a135af
-EBUILD mupen64plus-video-glide64mk2-2.0.ebuild 1931 SHA256 6590b48fee1c61cd29b3dfd29e1a36ecf634a2cf419003f5b8c79772daaf29bf SHA512 85942add2915ff6b9eff6e50f4062e9e9ba3253987c1eb962bee293a10cf6b06b72d197b9c6c3de587eac87ffe833528b60b4115d7d66b7413f4a796b125f5d2 WHIRLPOOL b0847368111b1895f74c5e31767e34441289b33ef1d2c593372570ccd7644d9e05c3b82206eb8ce89e87fed84cf8c70bf50646e38109930c931935b0054df202
-MISC ChangeLog 480 SHA256 de07de79a2b824f17b1ee43def51dd65827c65882b9c4a012b8034cd34fe7c45 SHA512 0894f2b63b9408f79df2491be788de01f02899f4e8ae1237c7b7e322984486818b221c070a48c782720857a13fe2d1ab321829b83b338055b07aeb88048ac53c WHIRLPOOL c728908e6fe0070937212f547b3a033c6c11b69b07a8c7d42330e79daa99d47c245ba2e2a61dd161d1495a85d2cbba2e4e0fc73a7d7f58e961f1128a2fd1919c
+EBUILD mupen64plus-video-glide64mk2-2.0.ebuild 2074 SHA256 88ca5137d22b2b967b857ab09d2e324e1a7ee98da26217578a4088ed3d7d8ae3 SHA512 40a3971546bb8880e973817e53e463fd2df0195212f43fdb16c055a2068476a326bd61478c1c525c20b6aba51baf496232147af47f996f910e7601e91aa7eca3 WHIRLPOOL f38f5d1e02b0d638c4018d92e8bbe408e92ec24a34cb5841628350e9f40e1f5d7e86d034b1f61fa6fab395cd8d8e67199d7fb12e635c5798d7ebf2b518837aef
+MISC ChangeLog 643 SHA256 706485f46009311543c7c3a9b7e49d9284652db316693aace0c00569136c3b9f SHA512 e412704102621596f7d52b99b97277e501bcec2682ceb06079714ff92ebc3d395564cd7179e7685d2450e6c1e213ef64b724336439ad34010935cc97b2efad6e WHIRLPOOL c352bb9510ae5aa7d34206f9da8cc5db2196298326bea9d0ad7bea1aab64fadf4660b195d6b5f5dd92f13d549a6c048e9089e17d84fb70e9ba0c57ccbb1de168
 MISC metadata.xml 463 SHA256 4a126ef8cd1352fae79abfb1388f6c6ef0cff0ae6a88d4229635826b79d08ce3 SHA512 28bd320c4c7e10021a0472150c3f7ee748480cd0a2df4bae810271b6fcdfd5fc33d35a600540b36c77cdfd577a7c2f884efe48f8a5ec2af083d8ac919def952f WHIRLPOOL bbd139638ad1815e9502714726c6ec6f0901c7e0f71c9514e147fbea1dccbcb47eba3e4b4cad79ada3f9a55ca537620f880cb55e0f43f162e2c2000cad8664b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSrZyJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSry1QXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOCBIQAJPPo8pFiTGRZ3wteXihCI+C
-VPOu3L21EuMtz42yTy5x1P0WiMmzYFb53Dvpk15i0HqDQ11nmK84Jjv64z0/vG+7
-yD5/4/JiYaCfJQ9OpqjFIjMAGasU2C9cT3xeCDEWnlc4n1uJ8w4NNOiAtinRZqav
-DPYcfgdHF5Ap9VGeJOpgKxPNNInnF5/H8/ffFJp43s2afgDVW41d1RK/oV7H3Kyw
-PT86s/rko1Ovo47O7IoBRMKid8O/YeEXxuRg1z+fKrVVvxaLHI7/wDJNAZns9sok
-dzx3Sb2GpHEryACEU4qSLGVYFOtZgQxsP0xeqMGJRID2Y/rqS2xrjvwiSkm//zBV
-6bVrAAvQJY1uigmoGc6iCoLuD3sRhubAVorqtxa096ob/iUWzZcagTyc6jl8hQhb
-M/VhM9kpyz4l5e3GiNeiP5KWbYwOT7aVDPFnUYj4PaawPWGrTwe4kklx3hqVTiPe
-ZwWZ7R6HiABk5652JvElkJUJgxa8YAp2snmxzlIwuvvaiv6SHgAihP9AK17fWZg3
-R7UNdfKd0uXBeqU2oks/PqqCVOiTiVa4h7pusOxLrNfWe0tdyDoIWg2Xcfymv6yg
-nji/nLyzodlqmahePbxSQO2Rdp45S/dzqH9V3IWxLJFusQQOo7UcUlKLPIn0cq49
-iXiEcjz/hX0aziJCLsC1
-=KlYl
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOxUMP/2w0vDKOcaZVnPKSgWafbUUx
+pCNF5TaqR48+fUfJ0N3RA5V+moeSmw0UT+uTRZ5U08qngkvmbn944Qu1w7YAyGYR
+K7hyUPYwOw8Iwb1J0AxQ1mzfn3nHGVinr5PjkEcbKAwYnUGDBmqjvvKaL6+lW1qQ
+p7C4zvoBBMO7CRsGzJtAa8tJN7bIoifMtLHLo2VOLWRLMs59PP4ZNsehLcq7spP3
+8CJfNithoZtv36B32ADixutWnnDs5oI0AE2SfGSGd2uNwgT4WI21H4zdo8sGw/oH
+dBCbZmAlIBLO9CisuWzrUrjv8nuf2WzoEPuMlrsOC6y3lDvDPv78mAYT1AFlVlRN
+GWtkzZzwZhD5DrpbjhMnsshXqcSmsBt82UcLUwDBIi4OwGn5dtEIPoUmpgfeqh+g
+5PGv4yXmKkrV2iiow1VkvuOhj66+7XwtlMZmaoTaQ05+NyWsk1tzyPnWIHnYvmmc
+RFRNiJtCXpO9jeLmBHeVOGgxcFLURNUk9zv8cxuTNx9ZVK/zP5jxxHBmTjlPvb8E
+SG6uZ/T1INjAeO3valpEYb0fzz2ryuAg0JTIsHIS4CbCE6qXTt8NxK8TDUm8Q7j8
++R+nC4QXGhLerRzakJkPWqQhIQmBh6mz9tyd0gMfYlrEmhUwDxnehjaAJ4dtNnG6
+ac7wtWGJnCi/5ZmISfaO
+=OIMi
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.0.ebuild b/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.0.ebuild
index a8a6309053d0..b39c50ac7f6b 100644
--- a/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.0.ebuild
+++ b/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.0.ebuild,v 1.1 2013/12/15 12:11:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.0.ebuild,v 1.2 2013/12/16 16:41:51 mgorny Exp $
 
 EAPI=5
 
@@ -27,6 +27,13 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch_user
+
+	# avoid implicitly appending CPU flags
+	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
 src_compile() {
 	MAKEARGS=(
 		# Note: please keep this in sync in all of mupen64plus-* packages
diff --git a/games-emulation/mupen64plus-video-rice/ChangeLog b/games-emulation/mupen64plus-video-rice/ChangeLog
index 4a6128b656ef..66e99553f60b 100644
--- a/games-emulation/mupen64plus-video-rice/ChangeLog
+++ b/games-emulation/mupen64plus-video-rice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mupen64plus-video-rice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-video-rice/ChangeLog,v 1.1 2013/12/15 12:11:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-video-rice/ChangeLog,v 1.2 2013/12/16 16:41:50 mgorny Exp $
+
+  16 Dec 2013; Michał Górny <mgorny@gentoo.org>
+  mupen64plus-video-rice-2.0.ebuild:
+  Remove implicit CPU flags from the Makefiles. Support epatch_user.
 
 *mupen64plus-video-rice-2.0 (15 Dec 2013)
 
diff --git a/games-emulation/mupen64plus-video-rice/Manifest b/games-emulation/mupen64plus-video-rice/Manifest
index 62a65b72a416..2999fdad0d39 100644
--- a/games-emulation/mupen64plus-video-rice/Manifest
+++ b/games-emulation/mupen64plus-video-rice/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST mupen64plus-video-rice-src-2.0.tar.gz 362013 SHA256 3eb076e7c38ab45c9ec752d30e00eca022a9e0c6ead1a22df13ad94902e08238 SHA512 bbab67be20b6d2ed6a246de8a2b955051489ac128ddecff0e3fc54782fc1d17ed8f9e1cded22d215b2c5c865b4b5fe831fffb28803247a2e494746565d23d764 WHIRLPOOL ab4399e0c70351e69995a5f40aa308b4d37489b7997d8a0eae97a183c62eea6976469c1e420c04cd24f9c32e9828d677264ce684e57af2500e7e57047bf98011
-EBUILD mupen64plus-video-rice-2.0.ebuild 1840 SHA256 15fdb3930b14a998c67ce17f8bac18e9d37be746e785d3dc076c9f2e442ed420 SHA512 e9b40ba838b4e0a5ab27ddd6efedc99eff213eeee92f19b71f22873c160472d412f3b1614c9150dc86ab8202ddd4d64892e20a147b60aa6693f59b26fa1a82e5 WHIRLPOOL cff67ab99fdf6caf241ee637355ab631a6d01affce0a87f83dcfa277b10d176c37fcce1e3d00e22e1c2e98771f1892e24a5d722d6ca732aa5a6d2cdfaf9e9d9d
-MISC ChangeLog 450 SHA256 4033d86241b7d7a0c3abaf8ff8d806fa1b7b772442931f239e4f4c37640f7ac5 SHA512 e08f446579b202ec05b3f2334babc432a913140a0a7cf1a4a12278ae2bb34df710a28efd2c405b3a15ee8742c118cb1370413f2b7afbe07ce55c689dca7c8c56 WHIRLPOOL 5aa967a2db6cf1603f9e0cf8d44a3650446049ed58931f30eda20433550d56367d0a48092c70352d585d8dfa385689af991fe39339edb6194f7db773b85f7dbc
+EBUILD mupen64plus-video-rice-2.0.ebuild 1983 SHA256 f711e6dd79c41b60d9f40ac23162b12f83eb56cf81bf1425c2829f6c611b692f SHA512 9070d1d17cac71e1b23c7e4b655ebc8d44c13a57083231777ca31d60bdd9b0584b974625500ba459682f9aa8dcff07dbeec805a4b0067f44d542b15f26ea21e9 WHIRLPOOL 5293250cb03ad8c3744e2f3cea3ffb7aff6f66404f6d54ef13eaf03e0efa945debf55dd8a19da1244f4092005358b4443e4a377bc0a2ef22229665f519c6ee06
+MISC ChangeLog 607 SHA256 55b1033b4731f96ae31035f0b2840305ce82bca0039fe30c8cc2623a3397bab7 SHA512 3f4a45d889a399e49a24f771c0286aa20bad43f67b954233c854d5f48f10257f0327cf9969da8906a52a21a085f8d04f864da3841456c280d57cd862c2fbe77d WHIRLPOOL a33bd07968e2adeb305e5ab7dc87091a25072d7ff88276ed90c5867eb360380a31e4395ec9e3f674cbf7c32de6fc1cf2319eedc21cd6640a8f49c64c66ea42c1
 MISC metadata.xml 352 SHA256 b5b11f77354a3f9a9051da98c3e7499a195f42a2abc71c3fe55979eeab43c7cc SHA512 579bbf3da7e4b2a573bbec036b4e5710dbe5289278094e9dc3c3cda8d8ca9533031e189bc12a15a47abe9f4cb58f83a98d2b0796ac0394797085b367658c3af8 WHIRLPOOL 3ced83d68b1b7923be49ae91e82ffe778aac35895fd681e8be87f28f77b716a60384af1935cc632abd7c510181d76526d475548e33117c73416d9cd922af49f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSrZxmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSry1PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOdCoQALJCNjZExWEyWHkLim2BYGnW
-hQdBedoB8K4QMaln3ZEm8ek9jKiO4otbNQnYlgILEX96XeTw1gI0CJfYB7D+4tcP
-6ohMULZQD9Pn8ff7JXX2L0Qnt7c5e6IeHp0o8MsEahloDjzl92MepPOK5S2XJQ0L
-rMG16d9afMT8qigNdV04SSvXkqyE+WDqvucnaEl21UrY7kPe0xy194cO46hOXM75
-f219ajmI8J+/gmzxqD/fjuU/4bNFSbu1GKm1u+wT7+XHO6iSols65HI/Iu79aIXL
-M5ErWKI7FNoARCDpGCb4IW525OvDB8d1LBoCQbXm5b7Wnm3xkXNBIwKBgSIrt+vb
-3L/ZMD3xB8AhJnwXRxu1LV4uBP9Srb4GvCaqaCuNGq2p15+4HVTrKIl/jBV8Ruod
-J7KHrhb/RHmLC3tkIX8Ou+QZvZf85u605gM9SuRx0y8FRSA5EF9yGRN9H0RCQOxb
-ko+8Jd0UX6chL3RtbTNKSXJjRE/2NufNCW3Tu6fBfBgnYYe2JceISEVEgcCDeF3c
-zxAC/e2HcX103ItTG15l/u1zaLDBmN9JWdB0PAt0VtY8Cehso0ur2ackSYbsjNun
-ZOcPpSDVSHYXni8bSDzobECc0aNXiPUimgupwuT3GS6xDXmevP1TMZ28nmu9UMUs
-QdLAZw0/KlwvEyf/QrvW
-=pYHj
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLrQQAMXRt9scbx8PDQjADEEVNUxA
+iBlzRJy4TCsMm6g2lMttb1W8sm97mqcWw9CkZDqGCcS5X2ThPWhPpU51+b3+n49c
+KOZyaDRcnBPP/Fh3/8eBsWMdm2NsR4L44lclI3F6ZlGzQCmV3Y4s+JzR106l/+tC
+uDI0Mt23tRfZnYnylzRsFAykgzrrb4hQFS8vwGkECK0g9yN3SGAnsMe1WuG7ROgB
+72SYXwMfAlADekOrQtT+4d8ykvTwINE/KRKcx0cDyDno0XK1qZdtH+8CMnrT5F7b
+tA1IaRv5eWPpOLCf43bYOihQv2COhRO9BYnXAMTtXTfXOndI9gMpPfKNFijFA+ic
+WAKkdNCFk3VX+FScEKhQm5dcyhN/BBuQuPfCM0D0zdFsRwmeIbgcS4mBtR1GQgZr
+bwOavRFrUFUktsO54YLdMguXXqNURc1pUtnkWebAAy2LeZ6+emaNzJ3KC286jzMW
+cdly9QP5C+Dbikww2AwUkaOdGo3VDZF2HZ4FOS9wkvryYBQ3msEhkttzYWwT5COP
+x01p+q2bqFztKIs49j9zFkk3R7dJwQj4dtm3F5k0Pqc4naf5467UsKBo9cgrqbNH
+hfweuR0tOLl4xLonTZYzNUVtmVafbf1eBP9nXSWcyx7smkjjUIJfbBLP47Lg8b8A
+ezS8DxeVbos/xM5JOeHI
+=CbOo
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.0.ebuild b/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.0.ebuild
index b1955721686f..cc8e79cd892a 100644
--- a/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.0.ebuild
+++ b/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.0.ebuild,v 1.1 2013/12/15 12:11:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.0.ebuild,v 1.2 2013/12/16 16:41:50 mgorny Exp $
 
 EAPI=5
 
@@ -25,6 +25,13 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch_user
+
+	# avoid implicitly appending CPU flags
+	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
 src_compile() {
 	MAKEARGS=(
 		# Note: please keep this in sync in all of mupen64plus-* packages