Convert to CPU_FLAGS_X86.

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

7 files changed, 72 insertions, 38 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 4310f40d6bfd..dcb69ce9e47a 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.931 2014/12/15 14:42:24 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.932 2015/01/30 17:15:57 mgorny Exp $
+
+  30 Jan 2015; Michał Górny <mgorny@gentoo.org> metadata.xml,
+  mplayer-1.1.1-r1.ebuild, mplayer-1.2_pre20130729.ebuild,
+  mplayer-1.2_pre20141011.ebuild, mplayer-9999.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   15 Dec 2014; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   update for recent upstream changes on internal dvd libs, bug #528706 by Dan
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 944beb8ddf43..33e948a83834 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -19,17 +19,29 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
 DIST mplayer-1.2_pre20130729.tar.xz 5358436 SHA256 9928cd6d0d765eb38f2824c501b94e5b6e0a2ec6e39a0c788654c5508c9eb9ab SHA512 e76ae7a1aeca9e853edf5403f3e3ae60dace980076a12160c501e18d019184af08256829f8e657b9fdbf549126bf518cf5dbe2860eda906e6fcd3ccc44a5f5a5 WHIRLPOOL b4007e4a00fd8b0b2d75a6d375f3b334b3251ea8dd677a5c1d562e4997fbbee81981bbbde9a88a61dc83bfc2d3e5dac6f93e7ff882088ba8b0c3df7c2cd9a6bd
 DIST mplayer-1.2_pre20141011.tar.xz 5357084 SHA256 5657720f44602e5fef04b215ce4116014d08934772cf9011038327b9e413d14d SHA512 9d7497b9ca0ea6f260251f410020b40be8cd9baa95e06d6f6d3d8e299a87ae3a56d8451bd078ca4077de38f7e8907da1763e3dbd21357769e282f91241f650da WHIRLPOOL 39903730b0d9eb8ea17730f282a1ba70c923ffa3f5c31a9ad9b8d56cc5e7bef75531159f06ded141e08581171df4016e8486892067bad2c82086d4c6147731b4
-EBUILD mplayer-1.1.1-r1.ebuild 18277 SHA256 9c3f60a9f4ab017547f99cb2d3124d30de1928696c669d6133e0af70e0beca55 SHA512 e5b60bef7740831b45eac20ee1e8d2c0186d991ccf76f3a9df6726cea6cda06727fdc7ca0c4f35564662ad2b11510248c025426b8474ba0f642db1b8dbac794e WHIRLPOOL d97cdde7cd10ec5f2fb34fd67bebc5d8d0d3975e006cbd468bf8ac88064261f625db0a32cc06e2f3f6ff9b60c5dfa9de60e4a6c217fc8fa21da1b8cd93f7d539
-EBUILD mplayer-1.2_pre20130729.ebuild 17346 SHA256 6c2c5b81470fe6bcb635a261e1ddfd92b195daaf55e3a059ddbf15dbe56fb15c SHA512 c525b54d83f29d8e0d66930f5a24ec5b845cee6869a703b553e44eb39ca469061d05d5d6ae8bfd8fa18100c0605972335d90b4eea2917c8531bc26b091ec7c9c WHIRLPOOL 5d1e3f525e83e205bd4fa9021fb44d36cd9811808f285e69aa7248bf371eb15a5efd303f18d11d9751e73d368fa942b92f3937d39484da9b25169b3dcde17b25
-EBUILD mplayer-1.2_pre20141011.ebuild 17202 SHA256 c32fbab510c3a94cdd11fd7f8740dbc1ff9c63b3f3813d747d60b5723a7aeda7 SHA512 4ab89dc18b290c9f6fdd87fdba565295eb57a178b301df627bc071945ca624ed0af90fcc29b46b3acdd99f83156749d1a11b67aeb0042f902496b7c8502f3138 WHIRLPOOL 40f9df5b7ecfee8de571f7fce74073688e310d4be796d9b7227619664a667e2460686a84d41eb4392ac2560880264a35d5638762addf63b1155a9d505fe57112
-EBUILD mplayer-9999.ebuild 17120 SHA256 316377fe81ea98e9003c5a82a3cee779e63fbba3c831884e2d130980875d492e SHA512 13e330b4dbf6f9e3cbb53c49d02120b22ff8884f9e4b609282139bbd13342173cbe6bb9a98c31837d7db5604313fc64dfe19d525004281c7602753f07907eb14 WHIRLPOOL 61d0acef9800387815ed015fd1d9d469a7fdb421f207622702bf2ed7e176bd580154380ee4d611b792694092550b0222a139857c5be8dcfe53f142df1d0dcc3b
-MISC ChangeLog 54125 SHA256 3fba8bfb8666018c1da6d67907698a5391769be1a81574f9f879d012d4289604 SHA512 544b3d8e5ba646a82d2b3b48e1ee39cbaee6babcd1f06b26f68b71a1ba4be1b8fb07a6fbaf2699365b402ace20a3204893ff559f342d002ae1c1ff07682184be WHIRLPOOL 103e4f222ff168311c534c1bf9db919773c9611c8a2527738332c1e50a0114eac6970318949edd4aad938a8762c1a73bba4fee45701ebbc0c60fac6a41696663
+EBUILD mplayer-1.1.1-r1.ebuild 18462 SHA256 36dca2cc8bb7b177ed8dd3fa8b8a2ab9b270246ffd8eb32238dcff5a08ade827 SHA512 e293842a172eb6f3c1f014b551f857aaa522ef015fb2af53ee647df7e956a17ca1d889a0c0362dc38b19bbaa32ab381d417a4e1296782c76431a2582159499dc WHIRLPOOL bb820d62d91c385dd3fff0d7232b81248f0f3952cd70c96f80b2bb4b3b46e95226f0e00ba38a8aa9fdae114992699618e2876651cf7749d954015c09620b834e
+EBUILD mplayer-1.2_pre20130729.ebuild 17533 SHA256 e3b5eecd6c3b0de0e89547117c161bfccb24ede3903f54615f1aee8f7bec19a1 SHA512 1463f5897e2037bdd5a8a53a7cbe274a35bde5e48784016643891d6cc96b884c5d4f89f616f5568dff7dcc334a53f01c4929f8e1056278c6809efea2a4b26f9f WHIRLPOOL 20734bf5b746e82628fbae94d18f7339e882f71320ce3d734813c5ad1aa467bb6a54fa976c5aac6533af233f62212880131cb4c5e41d49c45cda4e7e988be652
+EBUILD mplayer-1.2_pre20141011.ebuild 17386 SHA256 5b470c922df18c08d7b6e198e1a3ffc64bc28a41fc74434fee117923db0213e1 SHA512 68fcdf71a17f139e318f5037ba1dd183f0b58739387d6342283f968ee1838a3ff340d307a79ce40a6f75b37ad81aba94f94aecf2812747625531e78223a6cee1 WHIRLPOOL 593d47eaddd2c818a13b628a2672f247d308a173f08218b3074c31f9faa4d1368eef9f70199b7e314bfef07b7c75f39bc3ba528a020431d5547ffe3eff328be5
+EBUILD mplayer-9999.ebuild 17304 SHA256 61c9829288ab3d21c3387fda9f028b272d5671923c56aa7bfb1f3fedbbb92ba7 SHA512 3081aa657251f22d2693a8b5f61092e292e1672209af961780585117be12e497bd4ae248d47e65099267da943e089e8def1c3a70e9d70d579e315975d0b4b500 WHIRLPOOL 2817f754e3d35bf78456b99389bbfabef13d9012e62fb18790b2531327a4b7614fb9b524fe912b89062267d2670875fb3fe166b958b8a425c5e5d7acba1f6f8c
+MISC ChangeLog 54330 SHA256 9ecb51521e53021aa329ce1e120465d6ed4bd1015d5d043217d3648142a00233 SHA512 4216d489bde1af73acbbc4bd146d3af1daf60735b8c9cb3361e9b7693c9b77b826fb2fbb8d537ac2f66730520365dc57d531bbc41063ec5c7996391f72f0b948 WHIRLPOOL b3a74248974940e024056c3645a2dc821c28a7129f2dc4c98340b5a70ec4e6450879b2e3df8b2ffab2ab0ba83c22434cc39fbf0e4a0c4da5dc60e641031c9f27
 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
-MISC metadata.xml 2825 SHA256 1cfceed0df46a651a5236072ab550073f468a0f9c3aef51c943f1536cc898bac SHA512 7fcf38fdc415346b4576f2e078cd8014905be1269febbc5e574e5f6c44620e239506a63b530d2b8f1b271edf3e6a2b6791dd5fd45ec5d3d1518b0d46c3dde710 WHIRLPOOL 15aa6e751c8b80a033b61b66e3ba0e3d118efe433c620126323c2a87edf6834a60762af0fee1bbe19c406fe3c9b699c9c2b7b2837b9d3b50f2132ba07479e9ab
+MISC metadata.xml 2587 SHA256 6e73e451f391153d0f686fc2afed9e2b846f9a70fd7be2d00a07a961d069aff4 SHA512 e82c5d3465d4b8d7206eea6e5614f547374581330557a9c76c281502ce5837c97847d2007df49c6727924cdaca1fb7ef297194d2ddbe1ccfae944aad251c6696 WHIRLPOOL c5618151508c3020c44f655cec0e6ee2e76ea4262165e78373386f926836a0b2377725545667a9b22261e905d72b4ed4b1696218aee9a7d80787c63c71eef224
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSO81EACgkQvFcC4BYPU0ogtQCfTLCMtTNDhyBrasZ5Dc//rIdq
-Su0AnieRgCF1TvHasqTttTVPtCmIsX3n
-=1FBC
+iQJ8BAEBCABmBQJUy7xPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOaf0P/A6VS7GC06W4CCNJ3KBFeeie
+EdnasxinYa8+kwYg3+MT4NK95vm3j8MZu9bQ4rlgxgWRdiL/pJrk/7iHGPUgZoQv
+7iiJfd2RB1147hYcyrELUa+tzhQXxWA0+om4I96sgILrDR0S2Kt1X3vLX02TKgEJ
+0QNM11G17udJtPlSkRafVepqMhSH3FHaUchAkPX0wu4SrQjRniKOv2hyuTt9AOyO
+Ei6IrBZY967/Pe/V0hwXIVTaNrGBD8no+tQfklXcwlXahIqcJssMKxxvpfie/kLG
+P4DI2T2bJEyluHQ4HEkqr5qYpUwkAyRVViDD4SgrBj3nsQ+n4I172AC+QeK7ubwU
+qsBNxhcpcYgraqb4FJx9lyjzM4Q9wlymHODk1pe3Yy2/HTjp4L+7Q5oEf9Bp0tIF
+gk+eKtNVJ427TJXMs7gEmtPjGlqA867NFCjqAU0uN5/P3PXXYRq9GW7PoFk1CRBP
+LJzzVgrmxDcG3k593vV/WATwYKkYPDKk1KdtI1xE6MPbfiSgBiLmkU2y/SvcoD4g
+q1aC69ROowHkaoFNKWcSpEjrawLpwc7AKfc9xdwa1mXkLYOFrsR60VrIitgiVroV
+PlNitwWvT/9lokRTrbMov5CoqjT7WexRBnKabb5t8PwlIcbHIQY1wI9us7pclrfL
+3vptrCAKn97Fzhb19Cin
+=LpvV
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 1c4df4e2f69e..472986b34967 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -6,7 +6,6 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="3dnowext">Enable 3dnowext cpu instructions</flag>
     <flag name="bindist">Enforces license compatibility constraints via REQUIRED_USE.</flag>
     <flag name="bl">Blinkenlights video output</flag>
     <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
@@ -20,7 +19,6 @@
     <flag name="libmpeg2">Build support for mpeg2 over media-libs/libmpeg2 rather than using ffmpeg.</flag>
     <flag name="live">Enables live.com streaming media support</flag>
     <flag name="md5sum">Enables md5sum video output</flag>
-    <flag name="mmxext">Enables mmx2 support</flag>
     <flag name="mng">MNG input support</flag>
     <flag name="network">Enables network streaming support</flag>
     <flag name="nut">Enables support for the NUT container format</flag>
@@ -32,7 +30,6 @@
     <flag name="rtc">Enables usage of the linux real time clock. The alternative is software emulation of rtc</flag>
     <flag name="rtmp">Enables RTMPDump Streaming Media support</flag>
     <flag name="shm">Enable support for shm</flag>
-    <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
     <flag name="tga">Enables Targa video output</flag>
     <flag name="toolame">Enable toolame MPEG-2 encoding</flag>
     <flag name="tremor">Enable internal support for Vorbis</flag>
diff --git a/media-video/mplayer/mplayer-1.1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1.1-r1.ebuild
index d40339aeb24c..bac881d5293d 100644
--- a/media-video/mplayer/mplayer-1.1.1-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1.1-r1.ebuild,v 1.14 2014/07/28 01:27:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1.1-r1.ebuild,v 1.15 2015/01/30 17:15:57 mgorny Exp $
 
 EAPI=4
 
@@ -10,13 +10,13 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
-IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua bidi bindist bl bluray
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext +a52 aalib +alsa altivec aqua bidi bindist bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga
 directfb doc +dts +dv dvb +dvd +dvdnav +enca +encode faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas
++libass libcaca libmpeg2 lirc +live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng +mp3 nas
 +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
-radio +rar +rtc rtmp samba selinux +shm sdl +speex sse sse2 ssse3
+radio +rar +rtc rtmp samba selinux +shm sdl +speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
 tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix
 +vorbis +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
 
@@ -492,7 +492,12 @@ src_configure() {
 	# Platform specific flags, hardcoded on amd64 (see below)
 	use cpudetection && myconf+=" --enable-runtime-cpudetection"
 
-	uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
+	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+	for i in ${uses}; do
+		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+	done
+
+	uses="altivec shm"
 	for i in ${uses}; do
 		myconf+=" $(use_enable ${i})"
 	done
diff --git a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
index ab4ab10abcf7..c9c349194319 100644
--- a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.16 2014/11/02 12:02:09 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.17 2015/01/30 17:15:57 mgorny Exp $
 
 EAPI=5
 
@@ -10,13 +10,13 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
-IUSE="3dnow 3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga
 directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +mmx mmxext mng mp3 nas
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
 +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex sse sse2 ssse3
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
 tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
 vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
 
@@ -470,7 +470,12 @@ src_configure() {
 	# Platform specific flags, hardcoded on amd64 (see below)
 	use cpudetection && myconf+=" --enable-runtime-cpudetection"
 
-	uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
+	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+	for i in ${uses}; do
+		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+	done
+
+	uses="altivec shm"
 	for i in ${uses}; do
 		myconf+=" $(use_enable ${i})"
 	done
diff --git a/media-video/mplayer/mplayer-1.2_pre20141011.ebuild b/media-video/mplayer/mplayer-1.2_pre20141011.ebuild
index 34b276627ae4..96fbff9463ef 100644
--- a/media-video/mplayer/mplayer-1.2_pre20141011.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20141011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20141011.ebuild,v 1.4 2014/12/15 14:33:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20141011.ebuild,v 1.5 2015/01/30 17:15:57 mgorny Exp $
 
 EAPI=5
 
@@ -10,13 +10,13 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
-IUSE="3dnow 3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga
 directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +mmx mmxext mng mp3 nas
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
 +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex sse sse2 ssse3
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
 tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
 vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
 
@@ -468,7 +468,12 @@ src_configure() {
 	# Platform specific flags, hardcoded on amd64 (see below)
 	use cpudetection && myconf+=" --enable-runtime-cpudetection"
 
-	uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
+	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+	for i in ${uses}; do
+		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+	done
+
+	uses="altivec shm"
 	for i in ${uses}; do
 		myconf+=" $(use_enable ${i})"
 	done
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index f80ea00f6b41..1a85e5a09807 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.165 2014/12/15 14:42:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.166 2015/01/30 17:15:57 mgorny Exp $
 
 EAPI=5
 
@@ -10,13 +10,13 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
-IUSE="3dnow 3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga
 directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +mmx mmxext mng mp3 nas
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
 +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex sse sse2 ssse3
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
 tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
 vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
 
@@ -465,7 +465,12 @@ src_configure() {
 	# Platform specific flags, hardcoded on amd64 (see below)
 	use cpudetection && myconf+=" --enable-runtime-cpudetection"
 
-	uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
+	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+	for i in ${uses}; do
+		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+	done
+
+	uses="altivec shm"
 	for i in ${uses}; do
 		myconf+=" $(use_enable ${i})"
 	done