From: Michał Górny <mgorny@gentoo.org>
Date: Thu, 29 Jan 2015 17:45:41 +0000 (+0000)
Subject: Convert to CPU_FLAGS_X86.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ade2256a707b94e710e80c8bd44ba79002e02c8;p=gentoo.git

Convert to CPU_FLAGS_X86.

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

diff --git a/media-libs/avidemux-plugins/ChangeLog b/media-libs/avidemux-plugins/ChangeLog
index 25c6fad77ca8..b1c42c6fd178 100644
--- a/media-libs/avidemux-plugins/ChangeLog
+++ b/media-libs/avidemux-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/avidemux-plugins
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/ChangeLog,v 1.21 2014/11/14 01:33:42 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/ChangeLog,v 1.22 2015/01/29 17:25:10 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org>
+  avidemux-plugins-2.6.2-r2.ebuild, avidemux-plugins-2.6.3.ebuild,
+  avidemux-plugins-2.6.4-r1.ebuild, avidemux-plugins-2.6.4.ebuild,
+  avidemux-plugins-2.6.5-r1.ebuild, avidemux-plugins-2.6.5.ebuild,
+  avidemux-plugins-2.6.7.ebuild, avidemux-plugins-2.6.8.ebuild,
+  avidemux-plugins-9999.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   14 Nov 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Remove myself.
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 5811b3f738ad..23acde4bb3bb 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX avidemux-plugins-2.6.4-optional-pulse.patch 787 SHA256 c95b6e56c51aa41894aa963c8568289968d07b8d685a3d7ed0d5ed74ade9a453 SHA512 783963cfb21e0e6510b80a56ffd2eb93dd94c79ab9f81ec91d82753734c7fc545c14d61f19abcc6ee935b05791182e83b5ad2db84d5286d220f7bfa013413dd6 WHIRLPOOL 0f91cd59f61d9695d1fedcb3efb6cd69520ecedc982cb2b74167c452db36174c8b24290191f35cd319caa5e2b4a360252ad1b11ec794266a572e6eafd9d72501
 DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d8744496578d1c77957ab103fdb6 SHA512 1ba6f1c751732eec9fdceb2b0728122005ceab4c74ac09d213ebeff4c2af2a0b6ce8737d88e7c43970d1b9ca80cb36ad925efc9e4a487c4f463f1435aee328b3 WHIRLPOOL 0c95e87293251fffb773c8a1996ac015ba0d6f9d36d4f5ae01313c0532d2cf020a3ba0704d0f607347bbf0444e10857d7508fcbd968d62e889d7b62b36b85df7
 DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc WHIRLPOOL 899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf
@@ -5,14 +8,33 @@ DIST avidemux_2.6.4.tar.gz 17109929 SHA256 2937c6c09248445942ac7e71b100ff8f7e272
 DIST avidemux_2.6.5.tar.gz 17322253 SHA256 428e1f6d99e2d854ccdcb68f2260d853c47c809eee6bd92f151cb298d98b1861 SHA512 e7f8be29812ca787a1ec2cfddb1c611e1032ed94f24f41c0684f106970085bb6d219c822f3e713c472508a3f7b306540d2cabeb665bdbac061a49bccf8c23a80 WHIRLPOOL 192ce60afe4634319567cd7a1440ba212d83e02c054d6625ad738955fde02d0e722eba948c60932f520bb5e76c46ebbab0001230c1da50d893fb99a18f1da76f
 DIST avidemux_2.6.7.tar.gz 17337193 SHA256 d28202273d23be85c748c12d6e4df5e013bb861ea52b9bac7e0f90ba3d23249f SHA512 deea9811a0b6f618fab2ecf63c675b37dac12ea0ab09136a6b251e13601cd62cdc1c97d032762ea54f38e07275380106026541243bc87e230ce302fb821f2e5c WHIRLPOOL a41c338fc51e14d2c900dcef86a3887f94164548e8b904945d47915a78db907d152fda4ae53e5c37bf368348ff9912b529005a271f85d993776f042b5b997553
 DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6
-EBUILD avidemux-plugins-2.6.2-r2.ebuild 2818 SHA256 2c617cdebb04d371c8af8bc3dc27c624fa17c533b56a32d171e61f20dc6a8ea6 SHA512 62b66f3a8b4118439567b7f25094431559099aa2099d2c550bc593c13413594b3aad6732104d018bd90b6ffaa13bc2640b131e8f412c60a3db74756428659912 WHIRLPOOL 6f1e71b92f40c9c7aa8d600027c219b5bab4963d47af540f837e401219a58047e4c7357b06697764a070a7c21af5670eeb3677400f646dc971bfe25109341247
-EBUILD avidemux-plugins-2.6.3.ebuild 3635 SHA256 893f5a8de32b34440ccfb39b332fdf23a01abc4c2382ce7ee37c67bf27eb1fe2 SHA512 d3634add1a0f82c829b368160ab06869be39998ea044d4a538080660569b6bc5053263fefd630659423207435e19a6dae61a2eafe13cd1abaa77ae232c0f7ff9 WHIRLPOOL ac5419702ad16e53ddceb12b63550038cb2aa6df2e880f8c15a700230fbae282fa9db8cdf0f9a72c4cb07fbc7bcf831d39bbd05a86c4d6239076848c7b56b133
-EBUILD avidemux-plugins-2.6.4-r1.ebuild 3933 SHA256 c513c7931042a93864272ae88337a08500f79c2f26b7412436d3158ac9527d44 SHA512 e0817675c666de35283a7476d9e80ba406d0ca4e84c42b78d0b32c8d649f1ae8fdf1ad3e40b4485cab5d097c08f304623f745cab77957ef623ccf92fb6466666 WHIRLPOOL 6617eebea168dde21f5b3875890ee64ee39e50098ae5189fd62ffbd11e9a3471ad1a4acbd62297637d6535ab9e0691b98a21a93e57ec6d71ac4e8c2d95c14256
-EBUILD avidemux-plugins-2.6.4.ebuild 3635 SHA256 4f7c39bf8896bf7fda8ebb34c969d5db12fc901aa4cba98b02dd51f1a26eb65e SHA512 d1507384a5d5e381310086c014fa9b9fd258294764ee6a7bcbc81dd82c47f20c0c9b58bcc566d3a4589003e872d64f75baa558f9744ec533136ca05621535da8 WHIRLPOOL 7ee8a50f53c0b312580a5d1f08a70d313c26a5bd8625877954cd56dd13bab6d232aac0a43de09cf0ce9613fb309166d948e1e9826dda9945f1df5ffe79b4ddbd
-EBUILD avidemux-plugins-2.6.5-r1.ebuild 4101 SHA256 11d2e8616e30d688e6b120012b20bebb8c2441bed22df17124bc4581b45a3001 SHA512 273cad3df92e4745a194a7728f93cb8573074b3d44b9567e438df7620d84a728899bc2c35c38f8798ea6d5d834e398c4f52cd45cd0ac803c2861b311e940531b WHIRLPOOL 89b41b9fb6be1f0e5ad7ed531aff03acc6c4a482f9b380cfea1cf6ce03e418dfd3ae69ef905eb24c9de962898813d9bcc250fa92e6717b49f6677f0c32501325
-EBUILD avidemux-plugins-2.6.5.ebuild 4098 SHA256 191fd8d82429cb3fd26ecf996649bf3f0e5577bd5e37db0bcbfc8f9c3016fdb0 SHA512 d0f395bd738b42b7f6432fd8134334ca8c4b6f0b9673158dead26e99ed000bc7ac054c0cf9028b660c71104fb1e5d5b0c08bc58165ed30a446ba6098756739d2 WHIRLPOOL 54b7c70cf22b7842e5b58ae766a315ff7033fd87c22d342bd98189d0a5179463f7ca5849a7f0de236ce9a3bf4147bf3c608d9a6b04da108384ca3cf79b9d6fba
-EBUILD avidemux-plugins-2.6.7.ebuild 4190 SHA256 dceae24d120c31ddecd9b3347eeba683f538a5334b8515192574dbf11bf71e66 SHA512 92dab8fd3e77febf4dc4f97d717fab1ed80bceed340236185919e56a8f9685ca161ebffa3016a1a5b736037e9c5598602b9d06a52a6a615c86d95ab632b3b51c WHIRLPOOL 968c5054b19e1ba56e401361a0a4948e4bed52e25a2c7f8f1c0f0dbf4185b7b8ed2df16f4cefe979db696fbbb6563f3ee12ffdcff1c1671729befa593731b49a
-EBUILD avidemux-plugins-2.6.8.ebuild 4190 SHA256 2c1e45ab2f67a6bf5e2d4a1051a53a9e465d4b636226223f5d1e26c93c78da52 SHA512 f4c795a508830e793cffdcdac8ef5d3578840c18f10ef1bfdffa857897dbec0bc221ae4e4be209b7adc6f496426b5e0805f4a23e97d838bf754515bbd5857321 WHIRLPOOL bee0aec1018896d020ebd2a850f426147940cd8ac4470377b0ee93bd325bb1968ec625f01d61a0f5cdf66c88ae395d9d351617a55204e5462c3460a0f76aaeca
-EBUILD avidemux-plugins-9999.ebuild 4189 SHA256 c1ec16d09626abac9039d9a50362846b6da2ef74938d0f6dea8fe4f8c1633c7e SHA512 ed600446130e6727f0292413785b8b3b580afd337240d98b58a74cd1bf903a80dfa406ca72ff13b5f8d680263ee7d5ef288394ae707631f105f01d580f1e07c2 WHIRLPOOL 4629a92ff104242b951471bfa39d9da5af1e22097a188aef669b6070e69ffef2a7598790cb83ae3956309b9386d9ad051c0474bc7ed84af193f4aa94c77bc344
-MISC ChangeLog 5795 SHA256 87fb40fae0735779e80424ef5d32047f7818259db96995afdac4a0389ab4f67e SHA512 8880f97e7cd482d543cbb0954ba3d22bcb0f54ebb0a1f7dd1a5c2185d7bb835f9db0c06e5dd6f0a7d0fdbaa0ca8ce90f705a7f4d2314407281b136a10666c3cf WHIRLPOOL 4ab3f0522b3ec9b4e63e700ee0462233d33b2b5f6446a476257ac96ad9f02c0d7b21f5e47501952e1abef718ecb39bd7da1c5f7acb4a95d34c4d4ed51fdff2dc
+EBUILD avidemux-plugins-2.6.2-r2.ebuild 2832 SHA256 632d56e615ef00fb5447c5c7357b84b28dbe9b82b144253b9d79db73b7a06f54 SHA512 611c5aeb7eb0fc904df2edb0e5aecaf94afea019acea5aaa1250afcbb09bbe11b8ee5a7b61a9350a63c3a6d9e95dc6f4ecb53b8c4ce048acbd144e156c0aa20c WHIRLPOOL 075669ebf86ceffdcbc0a54938989dfda951552425d301eddad9f53560e65c2696f4778c0e53ab212fa527f161fbb27cae793458ed48c08376e84c71f48711d9
+EBUILD avidemux-plugins-2.6.3.ebuild 3649 SHA256 044c3ea01835ae9d513f33e99a423b6da3fd8f24434371fb4071f7b1f321939b SHA512 e2e785eade60ffe408b961a3b882165b3f99b11572c919c6b55ea7431c0418cfc9250099fad75ac16edc98ef69ea722a689419571b561afdf333316a4d9e6307 WHIRLPOOL 775eb43a74e0c58e65d4fa96ab09040a9d7202ca85f9f8a4ae8b2239a6e59c06ba9d8ee21918b7e0c43c75fbae1b17af816c50ddebbb6740b08ebaa167ebbd17
+EBUILD avidemux-plugins-2.6.4-r1.ebuild 3947 SHA256 67a42deb612429952343002bf34c7e9b42092ea2b128713676d618b0a2fc76d6 SHA512 b9f2de936e620b20f69d71b4c8274d59f40a9b50bb10ee648b40a5b1ccf9ae3a5df792314376c2d465527641b733c90ab0abab4af9493e200cc9f178daa3a541 WHIRLPOOL d405b981f069c0b828ae6e7f4bf279bf33d31294d3073901fa15921e9b02fc3772e060bca6ba01f0d2f45d1cb790773697589111f99948beb95092210eb06fb2
+EBUILD avidemux-plugins-2.6.4.ebuild 3649 SHA256 28197979e81695df28a395a24cd1390bc249f62e1175eb118e1b6d5027536a3c SHA512 87e042e7dfd013212b5456b83f46e8a74fc45d33990042b407d6e4c7671f4af3556b02a74e4c15b8fbae058a1f523c9af55c15393b8fcf9a55c42a8031936b12 WHIRLPOOL bffed58e8bb70bba5cce67f75034555b4e6d205aef7a46fd64fb5a73095d297a46949b2477ee551d10df5fbd579dd0a82903e4e47e1312c8711ee6c35c5b00c5
+EBUILD avidemux-plugins-2.6.5-r1.ebuild 4115 SHA256 5b86a5ea6b2992943538f807f9d5d96c8c8292682ba25a0c5bfb904f9dc5349c SHA512 a5a99b378e18dc102b8697291d8075bfbcf8e019034e8336e05cc9480414ed8bd49b5c05b0027d0dd47496004bc7f334115d2881f392a71684a3338e66d831dc WHIRLPOOL 1673bd3bc1b6303085c241950fc73a2992d805c6b965aaeedf9f6798a37e534a189d716deff1859b887b03ea039d0aef3ac495e4c82b41dc10762656edf5b782
+EBUILD avidemux-plugins-2.6.5.ebuild 4112 SHA256 649707da3e244d0d18fa6e6bc1d83c79c4ba9a67833fa598ce69a6bc4962ade4 SHA512 83794c5dcff4979193301b1343eb02764f5c7650db311646ece602e2f70e7eb19f7e05b1eae43a0dced4db8674d48d8616b405d634b909c41bf8d5efb518b3cc WHIRLPOOL fe7903f05e1e0ba84450fcda1baa0540ac25c59b7ba775728a420e5cbb3e0777d00da291ffe89e8dfb4a19db3c26385d2e624b9018101e284b47fef438a6e1b9
+EBUILD avidemux-plugins-2.6.7.ebuild 4204 SHA256 943ba1c13b056b1f3b974c724b49af7fc557f3d3d9a9e6bdd2c23768add3fb90 SHA512 9c71ffc4764008ac9eac4cddb352d047764fea685c9ac7dae13c69b42d28bfbe299609ed314bf14e1435fb5931578525f5997037857ae36f39890545f9f2d706 WHIRLPOOL 879b1a50675b49c36c779768acf399874c8ef415369da9d3d5653733e6ddb746c71e9d7610a469cd683cf49ccc277dd0a2ec3c69eb139aea4ccb052254c013fa
+EBUILD avidemux-plugins-2.6.8.ebuild 4204 SHA256 929f0bc1857d6f3c282c63081aff33cf8d734d4b1beff571271448560a6a4f84 SHA512 0f53ed71bc79b74568a5314794a02998766ceceb94e8faaa622c5ea2a2afdaf823c97df1f4cfaeb495021ab5c62359494f41b15c0d817a60f504e66f1f91f589 WHIRLPOOL 7955c025e72ba161e23fba990698b1c3a38daa165c22c94a04c41b4a5c3ae9d2c535ba91e24be2c266dbed21c355a5acb35d484a36936c6ec241f9cb8a569f3c
+EBUILD avidemux-plugins-9999.ebuild 4203 SHA256 1808eb01565cd9dfadfd2121df865ae5037498b066db2a83d8e8009131df5aa7 SHA512 56ac698f9a70e53f7250fa6e196db07a1962916298b93b80a55157251738fd45d2618e530e1abb10779d6460f861b2c94708c8b4ec25881f6b3e2ed2f26609c5 WHIRLPOOL 8516033394d9f3422f2eb23054ea4175368e18ae247cd50f1ad0eb534b293fa86cf628cec481bc122ed3c664dbfaa9587dad79141e11782f0d03676894fbefe7
+MISC ChangeLog 6171 SHA256 c84b0e215cc8bbe441059a4dd3d6b8dfbdafaff5eb413147c6bae05c55ecee65 SHA512 233280790085ff124bd1558ce7ee8a92dd8d17a4e7dded89ad6cec3ea19d037fd12ad45e6bed2f0e6a2d30c1151e6122457e4086ff1bc37f3fd14b8c09b40097 WHIRLPOOL a059eaff3177d67d3bf51ec156f9d579af208d4b88a95b2a5236188a2b4a2424dd734b383a3aa196161b855472aaa33b381d0ad28aa959af8b65173fbbe68c8a
 MISC metadata.xml 910 SHA256 8c5480b992515661b30d3bd566675afae46a075e77f9303372678cf789e07896 SHA512 bc54e8203416838312a16544d5e1e0008325cea60431d491ebf36c28e892ec13f2e6a98873e9f10aba8bdcc3aed42f75e138dba013c5cdfb22c4a9d222ca9942 WHIRLPOOL 412382d424c3aed875d9b928951b3d0105a0a9735362a86b57e63a134a0fc984bb49754eb97b44807d31b3a6e9d5225a8f367e4beba0df97b50ce4327dc9b51b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUymz7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZORhAQAKMcUvS3IO8ufor5489pSzes
+8rxpC8xqse/oS003PMMt2TNFVkJ1X27JeYEz0sik/6ss4hWt1zvOIwyhj9laLo+R
+49fJVmPt7vjh4cHfjxP+1G9l05xlGlYL1PlHVE15WEUCDiq/p28tpMuW47qgb/JK
+wwDtjxwN0A+z2sfXo+aC0/nyqYsRA20hyj1eUwi5jMU2UL0paRR9BwdRYdI7E5iE
+DDDI/OLrV+uX+U+68N/gms3RBQ0i4mo2bYDkgAUfuiSa+I7XJTLtduZU5lidxZnC
+wq4wHDAblcE4hGyDyaThfxH1HjrxWn0JajtpwrWgF4dCky1xDHdAQCcv2Zse3Neh
+ESA9flf2tzUO2SvLrLp/9n4ckaXVa2D28erICae0pd9oFwjcNCZdYu5kuUeE8VPs
+kXiKZljvcCcVNkBEr9iYCPp6sTao9Uh22fiVNnS2OBgkqsJFQP3+aJNsckVcFJfX
+8vHiZzXTq25uLJTBYpwZ0hyGBrwIzqo7Enn/H0borSVOWTuz9P9XMdgrP5IE5m5P
+wlTahTmA60+VWjbmXojl5I+jrXG0eq1j1asYdpsoUUZ85n2iszrngXJ7pOum2H4O
++GrjVRG7rIHXJpfJguXRC2MJaowFXBV7cgVSB58BTzD7pGgzJJmyDuYe4xjpuzOy
+/K8AnNMnEEhji1K62B0A
+=6IYV
+-----END PGP SIGNATURE-----
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.2-r2.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.2-r2.ebuild
index 8154c3cdcef0..ce42bc69eb0d 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.2-r2.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.2-r2.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-libs/avidemux-plugins/avidemux-plugins-2.6.2-r2.ebuild,v 1.3 2014/08/10 21:07:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.2-r2.ebuild,v 1.4 2015/01/29 17:25:10 mgorny Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts fontconfig jack lame libsamplerate mmx oss nls qt4 sdl vorbis truetype xvid x264 xv"
+IUSE="aften a52 alsa amr debug dts fontconfig jack lame libsamplerate cpu_flags_x86_mmx oss nls qt4 sdl vorbis truetype xvid x264 xv"
 
 # TODO: Figure out which dependencies can be moved out of avidemux-core and avidemux into here.
 RDEPEND="=media-video/avidemux-${PV}-r1"
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.3.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.3.ebuild
index 2b917e92b560..9cf4400b8677 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.3.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.3.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-libs/avidemux-plugins/avidemux-plugins-2.6.3.ebuild,v 1.5 2014/08/10 21:07:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.3.ebuild,v 1.6 2015/01/29 17:25:10 mgorny Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts faac faad fontconfig fribidi jack lame libsamplerate mmx opengl oss qt4 vorbis truetype twolame xvid x264 vpx"
+IUSE="aften a52 alsa amr debug dts faac faad fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss qt4 vorbis truetype twolame xvid x264 vpx"
 
 DEPEND="
 	=media-video/avidemux-${PV}[opengl?,qt4?]
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild
index e9e78592af06..7cb3c1be48d8 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-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-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild,v 1.6 2014/08/10 21:07:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild,v 1.7 2015/01/29 17:25:10 mgorny Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 KEYWORDS="~amd64 ~x86"
-IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vpx"
+IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vpx"
 
 DEPEND="
 	~media-video/avidemux-${PV}[opengl?,qt4?]
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.4.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.4.ebuild
index a0e49ac29c73..d3c3d83ab960 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.4.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.4.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-libs/avidemux-plugins/avidemux-plugins-2.6.4.ebuild,v 1.4 2014/08/10 21:07:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.4.ebuild,v 1.5 2015/01/29 17:25:10 mgorny Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts faac faad fontconfig fribidi jack lame libsamplerate mmx opengl oss qt4 vorbis truetype twolame xvid x264 vpx"
+IUSE="aften a52 alsa amr debug dts faac faad fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss qt4 vorbis truetype twolame xvid x264 vpx"
 
 DEPEND="
 	=media-video/avidemux-${PV}[opengl?,qt4?]
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.5-r1.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.5-r1.ebuild
index 1cf93c14db55..5dfce8f13f79 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.5-r1.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.5-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-libs/avidemux-plugins/avidemux-plugins-2.6.5-r1.ebuild,v 1.2 2014/08/10 21:07:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.5-r1.ebuild,v 1.3 2015/01/29 17:25:10 mgorny Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://fixounet.free.fr/avidemux"
 
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vpx"
+IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vpx"
 KEYWORDS="~amd64 ~x86"
 
 MY_PN="${PN/-plugins/}"
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.5.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.5.ebuild
index b377d5866541..a837776b9d9c 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.5.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.5.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-libs/avidemux-plugins/avidemux-plugins-2.6.5.ebuild,v 1.2 2014/08/10 21:07:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.5.ebuild,v 1.3 2015/01/29 17:25:10 mgorny Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://fixounet.free.fr/avidemux"
 
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vpx"
+IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vpx"
 KEYWORDS="~amd64 ~x86"
 
 MY_PN="${PN/-plugins/}"
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.7.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.7.ebuild
index 6c3b4fc712ca..4c5a5274b53f 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.7.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.7.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-libs/avidemux-plugins/avidemux-plugins-2.6.7.ebuild,v 1.2 2014/08/10 21:07:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.7.ebuild,v 1.3 2015/01/29 17:25:10 mgorny Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://fixounet.free.fr/avidemux"
 
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx"
+IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx"
 KEYWORDS="~amd64 ~x86"
 
 MY_PN="${PN/-plugins/}"
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild
index e1ba738b1abb..89ec065154ae 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.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-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild,v 1.2 2014/08/10 21:07:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild,v 1.3 2015/01/29 17:25:10 mgorny Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://fixounet.free.fr/avidemux"
 
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx"
+IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx"
 KEYWORDS="~amd64 ~x86"
 
 MY_PN="${PN/-plugins/}"
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
index bf42239b7640..dbf31ea75ab8 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-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-libs/avidemux-plugins/avidemux-plugins-9999.ebuild,v 1.5 2014/08/10 21:07:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild,v 1.6 2015/01/29 17:25:10 mgorny Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://fixounet.free.fr/avidemux"
 
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx"
+IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx"
 KEYWORDS="~amd64 ~x86"
 
 MY_PN="${PN/-plugins/}"
diff --git a/media-libs/babl/ChangeLog b/media-libs/babl/ChangeLog
index 9c1591ae5176..79b803885427 100644
--- a/media-libs/babl/ChangeLog
+++ b/media-libs/babl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/babl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/ChangeLog,v 1.62 2014/04/23 21:13:40 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/ChangeLog,v 1.63 2015/01/29 17:27:42 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> babl-0.1.10-r1.ebuild,
+  babl-9999.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   23 Apr 2014; Pacho Ramos <pacho@gentoo.org> -babl-0.1.10.ebuild,
   -babl-0.1.4-r2.ebuild, -babl-0.1.4.ebuild, -babl-0.1.6.ebuild,
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 19bb7a52743d..949bb0bbb89b 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -5,14 +5,26 @@ AUX babl-0.1.10-clang.patch 1602 SHA256 c06a8f7daad0b918fedc6eda01e70f94cb376eae
 AUX babl-0.1.10-g-ir-compiler-crash.patch 705 SHA256 6085e0eed4951f548421e00cf3eb957576bf6126955ca2eeddef499bcd2de2e4 SHA512 5bd7f2815b0df6d65fbbbdfde009483108f2dc018d4b4e966eb73db1be25b71f3e09cd416691ff0451f601dacc268daf59b9b0582c79bc8e153d9744e867bb1b WHIRLPOOL 578185466c06e0442295109461a9f5417c617d450b0ce50de6ede41f6c91ba3d57eb96c508cb8c130a2d6264938061dc28d425deaef5de7dfb9bb0e5445912ee
 AUX babl-0.1.10-introspection.patch 1153 SHA256 9b367f4662835df0dadd2a50c8a382f0177751fa25bac7c3db7355afcf130688 SHA512 7670031fa6a901d9491754bf333aa954369df1768bb8ad81fc114a0bfd08fc6e16681da8ff365898fdbb82acdef344508adda6ed574180b1a473d9b2f47ff1f9 WHIRLPOOL 6011f46aa636376c6b6a542627cf0ecfe35c0cd8dcaca35d876b0d7eda95c5a640e046137c3954abdb292c5974737cbf35bb27d60f510546a08274c684c50ca2
 DIST babl-0.1.10.tar.bz2 449537 SHA256 943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4 SHA512 2950d94c255ee05d405e003a46138da0f4e0cad65e2d2a882089b788c2deac0524014f7c5758c3097253bdbebaded433caf0447c7d218c9cc96798df9e6f0c92 WHIRLPOOL a71907a531bc71c7ac0c84a197a559c50321a5d96b5d846083935390890ef116780d49bd458577aef0e948395dc14897e6fbbc75478b2a59d57d4381cf7f8db8
-EBUILD babl-0.1.10-r1.ebuild 1890 SHA256 24eafd7a66ee5d0bda50423e718507ee7f63c121de8dc5b76c4a8c3e464349f6 SHA512 d7e16f5df175f81ce6cc3659f0b3f08de0029bbba3f089387fc89e5199fc94b5bec3f2d69e265d05e72951f69a5eb95e25ac872595d6c560f9fa4c42ee68e3e1 WHIRLPOOL 126dc6c4e6c1e3342b396081f2908eceb5162715c5173c17aefde352c879a3380fee39c33d938b3bd0b2a698ee5de6b0375bca2c67f223e29ed9928bd4d373e9
-EBUILD babl-9999.ebuild 1455 SHA256 7b8b0b29ab96c0395c1902c7fae9755921e7daf304a50f1d3887edc68a0f9233 SHA512 f2f16af9e5852707fc1ba22e7dce226e240e29942d777b7b43a8517f6833bcd954de8aaac13fdcb1e5a3033e2b7ee3dfe3fb1cdf245c5cf9c56864a05ec2b455 WHIRLPOOL c999b43d7b9ec9efd9629a5c632cdd0cf552d0a21925c2c39e84b31c75ff822cb2f20c430f7d2f9a35f9586d6a166160960ad618e0ccb025bf8f1981cfda0f4e
-MISC ChangeLog 7788 SHA256 e1ef37648c4db8bbce8383c5c9d4811b21dd9d0c48a803ad5a34b6b924874df5 SHA512 ea6ecd90acfdf5a0b2b5667f49e3e0af3f11c007968448d5e4c82360ed81e0e77059af9856db9c74608a98dac747197c644742b97e95dff74ffa178ca1893d44 WHIRLPOOL c86070649a5fee9c5d2b944f5f97db2afd44f4165918e41deb30e1aea70b2031395c7784b51a14957452b3a5d0676a0c7a393b6eea69d756a05b20b9ca73a267
+EBUILD babl-0.1.10-r1.ebuild 1953 SHA256 35b566ad030ae2c14c2bbf0335997e68489cf387122f5a8ea35e57d609d82604 SHA512 d5f11b5b0c9fbab03d1ac860abfe8a78dffb60027838ecd7b66c4f4c03c74213f778f2c3b7aaa7681a6d61841aa9b5bbeaac828bac1782492b465fda60f60c68 WHIRLPOOL 77e681acfe9bd1706afc4647b472df2ae705fa08a52d381caee24d81026603a681de012af774ed212325dc5fa2abbd53395bc114018bbe6bd080e87c69c48ca3
+EBUILD babl-9999.ebuild 1520 SHA256 e5179b70585a4e2ffccddb9434561bd69d1940a8d5f6525cc9bada291feedd5d SHA512 ee1c62c43bee846afc8eb4213b3bc66c9795f73ba4085d0a3eeb67ae8a63811698d8e3a67b9e7716bf46044fd658ce417f854848fabef1d7dcfccfb1c779a752 WHIRLPOOL cb01c5a196864c266db77a8839f2a84d5c5b4dfb1129434f5bcc3e2a42b07cec3e261f7cfa3b9e1f84dd77035c732b1c489dfe18ba2277f4d9468d2778d57b27
+MISC ChangeLog 7911 SHA256 adc0dce11f76ff6ef81025626427e9301972d347ddb8977a6396d5858ebe44d1 SHA512 7c81fa0c5bf90f48675db75b582e1b7bd593f601b2c5e15a39fcea39dfea977821b2f58c30e02daa172871f9182892216c12198ee8c3def5a3adfd4579763d05 WHIRLPOOL 10e2f95cb4d319b63606d8adc48ac5186ed0842970f5c4b94ae5d2c9045504223bb354cc4442c6c5ed19368aacc7b49cb3b18c8cf9f786dfe4250b75c4da8a96
 MISC metadata.xml 391 SHA256 3df30b3fc9c861ed6cf986f63b269dd11c63713ff36b234af2c31adfb78760f1 SHA512 38ad0ecbdce22d342844dc0ae2772935cf5d3cfd1dc1281aa69f6ccc640b58005af3f41f33687a30d2d86fa1722a5afdb79add27cfb46f4cd9c9e9485eff9dd1 WHIRLPOOL 843c6f2c2797b04471132fd3981b1f66cd59a0f206169a833af8965f8f1bf7f9412009f583e74d8edacda4c294d33b5560bba846e9a4fcc546dd10f710713db1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNYLQUACgkQCaWpQKGI+9QfsACePtykBcKzJ3TK+p8yHnG0Ezt8
-or4An1x4pwgl6xr/v+lDf3ud/kktzKgl
-=Qsx4
+iQJ8BAEBCABmBQJUym2QXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOpJgP/1w3Z8Xmd3rGKMFI4DrPT8fI
++L8qQwAvIqLbxfBC7l5K5RCUlVWcDQSGRqLcn9RasvZ69kLHG0rv7/xblq/Te5ep
+28TmRVs1da8pibGnjBxwV0UGgwyimFCeQP0KWEar14+MxSfiKzswvRQbwe31xwfx
+30Pr27cusU5pezvG3lBoNDFgnH3+Rhyqs1aAb8EtsVdFai8rrztha+ZrSbzSAH0r
+TvbpdfPZ8ONOuDQDz9RUWw1KEBXFP4JkWgvHAdbxMeILPMpLUH+M7fH3IRdsWHfl
+xhA/YlAgXoL+/X6tOu9SWeTu9flOgNM1VD+Unchcwz16H9geViYrnLLRg3MA+//n
+oN/maakKtHVrxwWpFb3culEFtvO2UtbNrc51OFB+WGtCkwVFGwM/Ro+8lmMMImVs
+SDkpgGaSnH0LpLl62IbB14v1axDc7g6/Pa+oDlEEhWQUyNv8JvbGfmpFz5Wc1NG4
+zTiy9NDQVBSlkwY+w5FXQ5MiM4SHGVU8n/2LlBtxT+9o9X6OpA9sr5/p3wHZDsBU
+jNHAXMNKQuYvO67/Bb/eK97tUUgqaL6tDY/iLjyUB+bQhgEDkJRMXwt5gyA2SfLM
+MS4mNGdFQemlHxRygumHBSu3Kb1Dd9VAysbaQ2JDxkzJj60c4DN+a3DZp8rojVmi
+d/7h0ekbDvBt65JYRue8
+=KMhY
 -----END PGP SIGNATURE-----
diff --git a/media-libs/babl/babl-0.1.10-r1.ebuild b/media-libs/babl/babl-0.1.10-r1.ebuild
index ec11f6fe9b83..4cdae9b76c09 100644
--- a/media-libs/babl/babl-0.1.10-r1.ebuild
+++ b/media-libs/babl/babl-0.1.10-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-libs/babl/babl-0.1.10-r1.ebuild,v 1.11 2014/03/04 20:02:39 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/babl-0.1.10-r1.ebuild,v 1.12 2015/01/29 17:27:42 mgorny Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="altivec sse mmx" # +introspection vala
+IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_mmx" # +introspection vala
 
 RDEPEND=""
 #introspection? ( >=dev-libs/gobject-introspection-0.10 )"
@@ -52,8 +52,8 @@ src_configure() {
 		--disable-introspection \
 		--without-vala \
 		$(use_enable altivec) \
-		$(use_enable mmx) \
-		$(use_enable sse)
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse)
 #		$(use_enable introspection) \
 #		$(use_with vala)
 }
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index 7baa1fa47428..9c2acd29d8a6 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/babl-9999.ebuild,v 1.2 2013/04/30 20:37:44 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/babl-9999.ebuild,v 1.3 2015/01/29 17:27:42 mgorny Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.gegl.org/babl/"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="altivec +introspection sse mmx vala"
+IUSE="altivec +introspection cpu_flags_x86_sse cpu_flags_x86_mmx vala"
 
 RDEPEND="introspection? ( >=dev-libs/gobject-introspection-0.10 )"
 DEPEND="${RDEPEND}
@@ -43,8 +43,8 @@ src_configure() {
 		--disable-maintainer-mode \
 		$(use_enable altivec) \
 		$(use_enable introspection) \
-		$(use_enable mmx) \
-		$(use_enable sse) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		$(use_with vala)
 }
 
diff --git a/media-libs/evas/ChangeLog b/media-libs/evas/ChangeLog
index 2a75a5bdc7d1..4ea325d41d02 100644
--- a/media-libs/evas/ChangeLog
+++ b/media-libs/evas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/evas
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/ChangeLog,v 1.31 2014/03/11 09:17:31 polynomial-c Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/ChangeLog,v 1.32 2015/01/29 17:30:44 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> evas-1.7.8.ebuild,
+  evas-1.7.9.ebuild, evas-9999.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   11 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> evas-1.7.9.ebuild:
   Fixed compilation with >=freetype-2.5.1 (bug #493586).
diff --git a/media-libs/evas/Manifest b/media-libs/evas/Manifest
index eb45b45b1084..46e99ce7533d 100644
--- a/media-libs/evas/Manifest
+++ b/media-libs/evas/Manifest
@@ -4,25 +4,27 @@ Hash: SHA256
 DIST evas-1.7.8.tar.bz2 9453923 SHA256 9ce94f5da82aeb6fe571d9a648d8c4749ee86a7fb02c4132e3a2c145316d531c SHA512 e915beb930d9906ba6b2b2d768643aeb45f7cbf23786e3f7972992380b6f3a4a2bc08b290094f352c494721db74db6aac3c547ed11a8878a976c8e4fad8158b0 WHIRLPOOL 41151ac770742c27cf785c5e30d0f526fae1331633ed310514e0506e7d090e19cea9ea41da65de6d7eca1ba6a86e72a539ba89f520ad2a490f9b67ec9510f0fd
 DIST evas-1.7.9-freetype251.patch 593 SHA256 6a4e17dd9c591b635acacd6886515a6d6978c0c67c5059853d598ef22c62d331 SHA512 ccf8d9a58c2921cc49b53ef62e70c709ca32d266cf41dd17d68fee5a7cf60228f4503a57ffe117ddceaa2042ebd778685aa3ca8e3d389ab146658bf797389ad1 WHIRLPOOL bc742e705f1c2fef5ae805378a5e27231e6e09988848fc3a3abf6c647c6a40f4403b84e2ec1f7d7f74031bc63935c54b168fff68d09298d583d00f788c848443
 DIST evas-1.7.9.tar.bz2 9459596 SHA256 ae3065ecc16158b45e83a62042ac7d577c72fb6427123a126ec7ed8abe8408f7 SHA512 ce526fbb7c897d27b0bdb7ebb4e5107e3705df0bc13cfd72b747982278858e7699d6df73bfcc17f48441e3c2fbe6b005a15b9ee2ba2631d322de08d61ffc854a WHIRLPOOL c1412cb4193339fa227459adaf426ea968de9895368ba501ca41b8fa558bf07ce9465359e60bc2aa004eca311d3b9bb1097e505f59a005afa25359939a1271ae
-EBUILD evas-1.7.8.ebuild 4076 SHA256 c285d7bf092b5fb87fd1d2df61a789ad73cfb0f2b25fe3fdb59a7dc798f88d95 SHA512 eec2a3d4d68593644eac5fb4b0c6b7569328dd6f310c68bd6430ccc39429064f61354cad21098acc0e1011db25248ed3f8345b211b237ccc6abfbdb6ac34eabf WHIRLPOOL 3c932ff97a7f92cacdc9b548dac605440f54616a2101422d04aceb959023a6288b793670edd2c6dcd44b41c73b215652b863bd5ed8fee39a8d2ef5c05c5305be
-EBUILD evas-1.7.9.ebuild 4309 SHA256 186f412e48291453dab55e6645d207e0c044c373b77c8e0617f6753f6543dc64 SHA512 89a600f0c6c9549b091a4f1e9edc25dd19bb7c1c60a6db063097a5e5a39f057d29f086b51653733e7903a867505b474b1a7e3536203610f5febd0ff64eb2a7b9 WHIRLPOOL eb7176e39fc9aef89dda2e25ef29b07aa6fd7b66407e8b1601fe0da4160a7a1619547049fc38015dbb45dab1c7301f7f74f33df2774b066f68a006614f6b3ec7
-EBUILD evas-9999.ebuild 4075 SHA256 7cf628c8a0331ec3101fa4223edce9fbf69b1b47cf92b350ed04ad60efc297cd SHA512 75216027ef894cf2bc2158d603db6244219f0065941cef31ad7f10cc65310d79df19df09818a15187c98f78609bf8644015dd541e0bc49a964bc071533f8d430 WHIRLPOOL 63185e3b35c1411e682206614cae071ad68cf7f3e615f954cfec209c8de0ff1ce0023f34e4573facd1a7dce6abfcfc278543e75ff93efb1e067021e111216ef2
-MISC ChangeLog 4967 SHA256 43ed953004e3dd47ab78976e4b7fccfc88acce37fca1e76ca9ac6e406dcb4314 SHA512 c7416efe3ab36e602ed28bcb090ac1ac4bacc8529be66ed611d1011c51af0522ec0b55246fb2d48f30e59338ff2e12413782d94cebe1bbc47d3e602376591198 WHIRLPOOL 340451064198d0c72ca8349d0bfafecab0295cea4a94d0b2f050977fc960dc9bc7af7dac995a61e0759d91f2358a370e295043b6cb5c9a688af833af28a2d31c
+EBUILD evas-1.7.8.ebuild 4160 SHA256 b59d1bcf4be1d1d3abc2a3dc76d8ca4a878fa32e560e44713424899f8a1830a4 SHA512 57a7015b893a2b0c1d9c34d1c3397dc77c430624120b380dfeff467bb435d991ebccc98abfa74ae91f312270e474a1ad13f2b9e73be759d644158ecf802a4964 WHIRLPOOL 36cf453855f5290c1a4f5f4ae5ab06cc9746e7cdfcca2c6a51faf221432aa739e503d8bf7e59daaf8163502de1925999041af4044c586370f5444b51f829938a
+EBUILD evas-1.7.9.ebuild 4387 SHA256 b410ef7f3949ad44dc6b95a1e5bbffe825525983c4b1c28c9520ef80ba0434ed SHA512 ed97d13152ab77b4815f85f2af64997b32909e1de33edc1b4fd2451e6d4f633dfdc62d1d9127794a6efc052b7713635d32c0eb53bd32e94382ac5c44ed86f4a5 WHIRLPOOL 1d0181c3ed9dd5bbf32a96dca705c90179105eae26fb7f360782a27a89fb83d8d7ffd54be6ef4a5307aa0cb939490dd7c80ff98d1b2f5477894a516487ef6dbe
+EBUILD evas-9999.ebuild 4159 SHA256 406ad4186aa8657ec05fe73146db2f65cad0c4719ab828e47ac00067c117cfe5 SHA512 c154245a9fc0a71f19c270aa0baeb08ca7a26a0c1ec535732842f7eb2189f56326f0a8ecb4de6ef0a68a37f7bba9c03b037b79d30e557ca7ee12ea874635f903 WHIRLPOOL 2aa570e6ec64f6bdb4c4fb7db5cbbbc6588d92fd283597ba69e9904119c77e849bbabd5e2e071d6f90cc15d6f46f54d4f8f49e410387dc3e5951387333a17df3
+MISC ChangeLog 5098 SHA256 8d51a12aa8acaa72348391ccf7f47b44726967b6383a47aef086d13213f1cece SHA512 edf254608dc967d8e8f8bd1a812cd5a09e8a41855bedced0be748d21cd4948b05dff36221286dddd5c40d85258d7682d89a7690dad60dd56ce58bd5a1998128f WHIRLPOOL 9cc93dcee8e095145c419ee368a96154a1f0f34f774f077d08d68b09d4c6d282f1a1970e205dca7844c0c8997ce7197590481972a670fc5b236ebd2ae62dc570
 MISC metadata.xml 1703 SHA256 1d57b9419e6394389114428a96747ee6b099a5b80bc2e126351cd9a867a3039c SHA512 e8466b93faeccab1ea06ee9a6e13b1ec8c26633fa7ba5c62165248da0f01d461d089e7cccd124b6da48ff1a2bf9144bfc96c5a48226189df27132691aeaec35e WHIRLPOOL 89f39e887fa5983b30a2c7433d673b350a8da47284cdf54c4f7ed01e25c73fd7394914133f74baa269d46783d31f654d0ef7a4c7d98f5e947e41040ba4864df7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTHtSsAAoJEPiazRVxLXTF11EP/inkmI5HzXXmnS4GxhblVOK8
-OYsCo8zBXKe3g9L8xLjzQoX9tM6P5bF2zGE4yhs9sxDB1wa33RdWCnIKVPBIuWpw
-EuzW+Z6mlAZ8rLSRKbU+H1qO+o3scWGxDo1spJBQGfUhE0dI78Nw0lhBBtOJHojp
-0DPBilrwDu8i/8UC2RXnCyqyt/24D1PgMfUQhCr2s2+nw6Fbqq5TEgSlbWRV1j9i
-DAxFrE7BP7NlEMvdFqNazWKwI9dyJCwiU69Wsuylt7Hk/5dI6hqlpADYSpotrnDK
-z0AaJu7zSrVIoH3gAR+4A7Yv4bCP5mqSW/vUraFMn2+Libl1zW5PIaqfBo6YiOkZ
-oapFwyT5EtzPlRSmaZF+qbT1KVWjJcLOySTMrNGEWAIi4qK1xA1yR/GuEfNB1a5k
-g+0VERF8toecB80WYmQnfvgQeKAmQ+5EAoPzRmuTUEAE25RKQEOh5G55BZUwQa95
-b8Il3nnNC9taIOU89xuNqVXWf9vAW3BKin0XxRzgBhCyjfch/TGfGi04wUiJ7jME
-cQS8gu3Y1EPpEtZEkPsPS8WYI/5iy+fI2F2oB1Vz8OQ/BVMIZnkH5H+2qSbbu5Q1
-Qm9JE6yZ0a9nGPfI5WqJuPJ5wP7IHQ97ubfQBDPuzYm3lgn+e91yzBPUEraA4l0D
-Y6B3jV1iVg2sz/frC9Ma
-=Idmh
+iQJ8BAEBCABmBQJUym5FXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOaFAP/RbgfTZmOVbcFxlr4SUARzwl
+38mQQhw1sRi4PhZUNTuhLRibwrcuLklqEHXp/UxaNZp8ml2pqJd1KXwGRL2NKvsC
+gq46E6CRYdp9fJn7rS0+ME3uXWRh/dUnPuwfmkB4xop7SmgP+SoYKcbBqNYVMSmM
+hWb2mWi2K3rrkpFGXo8tP0ymKErlM3dPQBl4VH6X86A0SG4fUZYwakAOcLu3N5dM
+hiaHpheiR7NgRpAkSxBBDaPmy9EUMVsQxBz5IcgVBmmHSzRLgMHZRcEPzw9TKE6a
+IikTXruID2WpsQgMV9nrHh0CyBBOOALJP3v+UQjRmTckB0gsR66B6HJEt6BlgAuB
+llGNQP39nZxUX6TstpRKnUnrigfX/VuJag7pGktOlxJzoccTGIVHdLsdXH9VBFGB
+3QiuOjyEJMoAKopqVI1zdL0KWruP4XauWIfeKQvhK4HX/eq26db17Rw608/3fFKt
+oiek1z1vY1rFCJ9LsGh9DEGTu8zcmlIdw25DGaSq3RL9YtSPywmNlkEnj9nTV6b9
++RDDHfIaq3mMlD75N3fkU369WrC/YijB/dHWoHukhf938NkTxU+KRnqMEVKXHWMX
+P4aj/GcnMVx6omy9/Kcep3uU34+3SAHW+NeBNFj1ckRzKDklaWqZBq+nCWmabmUw
+5obPYBn6V596LjOb8qmP
+=oTXo
 -----END PGP SIGNATURE-----
diff --git a/media-libs/evas/evas-1.7.8.ebuild b/media-libs/evas/evas-1.7.8.ebuild
index d8d521300ec7..1270cd5a9c81 100644
--- a/media-libs/evas/evas-1.7.8.ebuild
+++ b/media-libs/evas/evas-1.7.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-1.7.8.ebuild,v 1.2 2013/09/28 09:26:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-1.7.8.ebuild,v 1.3 2015/01/29 17:30:44 mgorny Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ DESCRIPTION="hardware-accelerated retained canvas API"
 HOMEPAGE="http://trac.enlightenment.org/e/wiki/Evas"
 
 LICENSE="BSD-2"
-IUSE="altivec bidi +bmp directfb +eet fbcon +fontconfig gles gif +ico +jpeg mmx opengl +png +ppm +psd sse sse3 static-libs tga tiff wayland X xcb xpm"
+IUSE="altivec bidi +bmp directfb +eet fbcon +fontconfig gles gif +ico +jpeg cpu_flags_x86_mmx opengl +png +ppm +psd cpu_flags_x86_sse cpu_flags_x86_sse3 static-libs tga tiff wayland X xcb xpm"
 
 RDEPEND=">=dev-libs/eina-${PV}
 	>=media-libs/freetype-2.3.9
@@ -105,12 +105,12 @@ src_configure() {
 		$(use_enable gif image-loader-gif)
 		$(use_enable ico image-loader-ico)
 		$(use_enable jpeg image-loader-jpeg)
-		$(use_enable mmx cpu-mmx)
+		$(use_enable cpu_flags_x86_mmx cpu-mmx)
 		$(use_enable png image-loader-png)
 		$(use_enable ppm image-loader-pmaps)
 		$(use_enable psd image-loader-psd)
-		$(use_enable sse cpu-sse)
-		$(use_enable sse3 cpu-sse3)
+		$(use_enable cpu_flags_x86_sse cpu-sse)
+		$(use_enable cpu_flags_x86_sse3 cpu-sse3)
 		--disable-image-loader-svg
 		$(use_enable tga image-loader-tga)
 		$(use_enable tiff image-loader-tiff)
diff --git a/media-libs/evas/evas-1.7.9.ebuild b/media-libs/evas/evas-1.7.9.ebuild
index f17079b6682b..c29f1fdda5e3 100644
--- a/media-libs/evas/evas-1.7.9.ebuild
+++ b/media-libs/evas/evas-1.7.9.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-libs/evas/evas-1.7.9.ebuild,v 1.2 2014/03/11 09:17:31 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-1.7.9.ebuild,v 1.3 2015/01/29 17:30:44 mgorny Exp $
 
 EAPI="5"
 
@@ -20,7 +20,7 @@ DESCRIPTION="hardware-accelerated retained canvas API"
 HOMEPAGE="http://trac.enlightenment.org/e/wiki/Evas"
 
 LICENSE="BSD-2"
-IUSE="altivec bidi +bmp directfb +eet fbcon +fontconfig gles gif +ico +jpeg mmx opengl +png +ppm +psd sse sse3 static-libs tga tiff wayland X xcb xpm"
+IUSE="altivec bidi +bmp directfb +eet fbcon +fontconfig gles gif +ico +jpeg cpu_flags_x86_mmx opengl +png +ppm +psd cpu_flags_x86_sse cpu_flags_x86_sse3 static-libs tga tiff wayland X xcb xpm"
 
 RDEPEND=">=dev-libs/eina-1.7.9
 	>=media-libs/freetype-2.3.9
@@ -113,12 +113,12 @@ src_configure() {
 		$(use_enable gif image-loader-gif)
 		$(use_enable ico image-loader-ico)
 		$(use_enable jpeg image-loader-jpeg)
-		$(use_enable mmx cpu-mmx)
+		$(use_enable cpu_flags_x86_mmx cpu-mmx)
 		$(use_enable png image-loader-png)
 		$(use_enable ppm image-loader-pmaps)
 		$(use_enable psd image-loader-psd)
-		$(use_enable sse cpu-sse)
-		$(use_enable sse3 cpu-sse3)
+		$(use_enable cpu_flags_x86_sse cpu-sse)
+		$(use_enable cpu_flags_x86_sse3 cpu-sse3)
 		--disable-image-loader-svg
 		$(use_enable tga image-loader-tga)
 		$(use_enable tiff image-loader-tiff)
diff --git a/media-libs/evas/evas-9999.ebuild b/media-libs/evas/evas-9999.ebuild
index 1e607b92b0df..1e33592225cb 100644
--- a/media-libs/evas/evas-9999.ebuild
+++ b/media-libs/evas/evas-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-9999.ebuild,v 1.1 2013/09/28 09:26:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-9999.ebuild,v 1.2 2015/01/29 17:30:44 mgorny Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ DESCRIPTION="hardware-accelerated retained canvas API"
 HOMEPAGE="http://trac.enlightenment.org/e/wiki/Evas"
 
 LICENSE="BSD-2"
-IUSE="altivec bidi +bmp directfb +eet fbcon +fontconfig gles gif +ico +jpeg mmx opengl +png +ppm +psd sse sse3 static-libs tga tiff wayland X xcb xpm"
+IUSE="altivec bidi +bmp directfb +eet fbcon +fontconfig gles gif +ico +jpeg cpu_flags_x86_mmx opengl +png +ppm +psd cpu_flags_x86_sse cpu_flags_x86_sse3 static-libs tga tiff wayland X xcb xpm"
 
 RDEPEND=">=dev-libs/eina-${PV}
 	>=media-libs/freetype-2.3.9
@@ -105,12 +105,12 @@ src_configure() {
 		$(use_enable gif image-loader-gif)
 		$(use_enable ico image-loader-ico)
 		$(use_enable jpeg image-loader-jpeg)
-		$(use_enable mmx cpu-mmx)
+		$(use_enable cpu_flags_x86_mmx cpu-mmx)
 		$(use_enable png image-loader-png)
 		$(use_enable ppm image-loader-pmaps)
 		$(use_enable psd image-loader-psd)
-		$(use_enable sse cpu-sse)
-		$(use_enable sse3 cpu-sse3)
+		$(use_enable cpu_flags_x86_sse cpu-sse)
+		$(use_enable cpu_flags_x86_sse3 cpu-sse3)
 		--disable-image-loader-svg
 		$(use_enable tga image-loader-tga)
 		$(use_enable tiff image-loader-tiff)
diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index 52db0d14fed3..e0eebda4c3aa 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/imlib2
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.138 2014/11/20 00:09:49 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.139 2015/01/29 17:33:53 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> imlib2-1.4.5-r1.ebuild,
+  imlib2-1.4.6-r1.ebuild, imlib2-1.4.6-r2.ebuild, imlib2-9999.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   20 Nov 2014; Mike Frysinger <vapier@gentoo.org> imlib2-1.4.6-r2.ebuild:
   Select automake-1.13 so we can run just eautomake #529740.
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index dfdb24ce238f..f0b890e966a7 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -7,26 +7,28 @@ AUX imlib2-1.4.6-no-x.patch 879 SHA256 546ea92a9ffada2e4ed9b711bda7822202622086d
 AUX imlib2-1.4.6-out-of-source-build.patch 818 SHA256 f00f7a6320fe3b44b9dea34dfe4a74968ac59477ba2a4797adcc767a64567402 SHA512 d75e4f7732d198f78d9cbbfb883a9b5e625831e69f71ddf2853ab826c1571d2f4994420fa3272b07133380f8bc99222b65dfd7c43845ecfc02ee1dd4bee33537 WHIRLPOOL 97bf67dabf889c4e0a1a41af075ee417b7b10f3e045bb8cddd9bf620f06282a1291074f6fbd62849e8c288cfd31840c349630be9263ecf9ffa73c47a0d2cdca5
 DIST imlib2-1.4.5.tar.gz 986785 SHA256 6e809413a571f82b9e67aeaf5577a1245a034c866ae5fa83c191a227f60cc7a0 SHA512 6c3bceec39ffcb7515925c3eb4199834295732a1cc9cfa307aa8610e2565e770edfc5464ca983d1d95570bd9bac09c989e0751fa39b07cf794c0c5dce4262edf WHIRLPOOL 53c003601ca6f89927794af0f0ba48f31cce31504061b71f68f0d67b0c4266d2617a24df467af2a03d485d129ad6de745382338addf39f70810ec71db6b0833c
 DIST imlib2-1.4.6.tar.gz 971792 SHA256 17cc128c0e61974d59c423b59d0fb5cb85c97169adf5b05184cc58f7c87b4f4e SHA512 8c49f2c9a4b997b536ab7553ffd80b764eccf95c6926a90c10390463e353df27c0e52345bdea9ac8fbefae3e29274022e6a8c0944f406a449293a06192a95fe5 WHIRLPOOL 98ff99fb216a867f60287b369a0b05bf5eea2da23ee8bec14f105f1805f12b035f3ff03ede0bc5909eec178b09e285b5bb0ab0c394487502aa893a94a34da90c
-EBUILD imlib2-1.4.5-r1.ebuild 1777 SHA256 0a31e394a6f507a23757023afc933894eab79cb20d6f5a96d5a988e086d04bb2 SHA512 f204428f402c698bc0cdca2985aa8746551faa3e880a938a754d38fa6ae03b4c24b819d59df3eda542d518dc1ef0b06f82543df224ec8387c7e450ab7eee1608 WHIRLPOOL edb8d980511245bfe35d5e1429bb00476ebd542b0746ac752a8c516a36505d9611ee4c21c8a3289f2ebdf1fafe6de4c8bc5bacdc98ee8b67b22c9669fdfd266b
-EBUILD imlib2-1.4.6-r1.ebuild 1774 SHA256 f27cedffadd9768c0b5ff4d1f8d5cb9653c1cd94fd380afaf940c233951f7479 SHA512 c4b133b05da40487a326f21456bf47ef83c25b108fd068556ed4144aecf2e0fec91ca2da5f6d30568c5d7611447b371aad3e4cba488bb4c89a0d0ab8f2094ac1 WHIRLPOOL 8a2aa70271484a4024fa64f3b1849a5ed9717254da1f58c92052b9a10f112b68e5a28e652059d5d58ae4260537a82cf60ffb7cdc5b0f18da1d0a5f74de236854
-EBUILD imlib2-1.4.6-r2.ebuild 2511 SHA256 db2a7f539daabed8d441a03dbed66a5ba49679280276a50790def1f8dd0134a9 SHA512 d98a15adf95ddf4a5664a44c81ce1ad3b6f55fc77d55794e08c30c72d6df0029f9c4820a84c6bbe38cedc780d3528bea4c2bc8fe3da97fb580f040ac4201843d WHIRLPOOL 8871508682b25fe491c79cfce53c6835c01d21d48431b929c80b9989811ee50d2f951ea69f162d5f2d2345760b96e06e6a2c07e9ab0e29b5288dd5c0d8432d2a
-EBUILD imlib2-9999.ebuild 1951 SHA256 da015b2e8a4bfcc1632743c3224de4ebbf776bb1c201efe4f5004f1eebee3faf SHA512 f10b6ba36f0d4a53cf4030b565acf58f9f23295d9505813cb99fd6364896e95b9a67b701513f8967b7476f088310b7bed164dd2301d0a31e21254d1d49d521ef WHIRLPOOL 3ed8a647aadbf359b7b90da573e840631dff860148f8ad17b491597065056dd6335f94075f76a953b0fbb8bf734f70ebfd7f3f206ce537d33d7f0f150f7ba577
-MISC ChangeLog 17242 SHA256 c49c4f915dd90e18837f77d14a0c8315c460bcb290e97f0d721d51605dfd82ad SHA512 daaac2e3d9bc50692071fa71d33a67bee7301fcec5f2e33dbd2276d7cf93018029b7f4a17d773ce5f09b2303adef26d9dee4c682f395ff7388c5ca55ca95c7da WHIRLPOOL 097fb84ec5693106c7c8ba1d0f2724ebfae5684dfa7606377dfa1604a1eab36e9e8fa1df547f0e12dde584c576b7111c0dc735bf051aa146b85fcc6705a8fb5f
+EBUILD imlib2-1.4.5-r1.ebuild 1823 SHA256 ddc29a729584b656314b50f6f356a6f27b9f165ea8be8be28ce0297875d1061d SHA512 f04cc1ca2e3d87b4983e26a2c7694bfc80fefbb9db14a68a0dd6997802fad59597a395b60c069df4aa7c9ef66ca77199a1cbcebde969e64e16e66b76361664c3 WHIRLPOOL 5677795ecce8b3c6acdd1d7433b1842317ddb35e171ceb45d166352a93eb645038de1577760bd3b1305b2ef5c230497baef327abce63001cb120b5de6a902a42
+EBUILD imlib2-1.4.6-r1.ebuild 1820 SHA256 100a5f178a21b943bcd4408a4d85da32fa239af4b27a9469eacb298a7065e4a4 SHA512 e94f2a9b91c2be4f8f5ff337db8cbb3ae27023a47906ec4d83f6e8a10a1ff4ef6a29e4afed47984cc1c9b6ff0c162d33912b62bb8e336fb0d729ad4192fa9d12 WHIRLPOOL 9c1a2648e2abc7bd7283720f61ede0e114450f6f5741ed8e87ebf7f90f4459693af3a6e469ba4bb85ab0f1fc720f93bac498cbd08e5eef2597498b13fcaef23f
+EBUILD imlib2-1.4.6-r2.ebuild 2557 SHA256 eb73c8a24be548b8e4220b158bbcc7505f683dff0746297b421c259ea5e2f0b2 SHA512 d7e451785433ee7525c562276d505757a8f0c6179ad578db170e4c2f1ba344cad8e10449891e0ca31bff9d413ddcd0e291f603d95b4bd845b9463b7c92eccfaa WHIRLPOOL de9002f8ca4bd51a03c6d8d27cf2ab7b5642181aeeb8fb43e4e14d4410226bec7b87791e74538426033b2559cbcd4e98c02743e8147935cf625fcb3a515b5354
+EBUILD imlib2-9999.ebuild 1997 SHA256 61bfde6e9645e361d4e60939975f25ef42838f5e171a539c5fb984e7c44d4321 SHA512 8eefe20b13105f0c13972c94a029004177e520301a4a670ceff260a377081c39586f66d15589f9d0c0e4dede48b34aef98a2cf3c12564b4d2dc2ece48e7742c0 WHIRLPOOL 2b2c114a18be92617506c4f92e55978379b38775b1fdfc7ad285e6d66552ddb6dd52d6d29569981616bd2d7fbf1dcc587ac84da8e3fc3925f217b3f9ac03d9e8
+MISC ChangeLog 17415 SHA256 8d6af44b9f70853123207d306e0196bdaec042beb3b0cff1192a545eca89c2c1 SHA512 a54fa16a96330edd0549daad75af1e85140b9dc4a343e66bb6bc4c51a1e1566c25f0efa05cd28c14543bb1e8cba8b0d225ac00eafceb78da0ed22c57ac2c1401 WHIRLPOOL 8879e5f8f7986fed0070c15db42a75d4328c534ec316b263c09ffd323db3c4152dbbbe2c7f62724ec39c77b6f444094544d2dd34de93ea822a5f669bb9b97989
 MISC metadata.xml 2200 SHA256 343b4e61546c7f2a89249bd63c4018975cbc53bd8622d641d27dc05f8aa5235a SHA512 1993bd9088534da0122db66e83017259423f79f4dd9de442f4f4dec6fe4398979813ae83f0a7640630da1f6fcf2b8ab59d64ed5cba09144cd243f232618501f1 WHIRLPOOL bbd8aafa47c63e0b32b888e89a62d321591a2c43ea0b3d816206c62f2a0381de89c554a84479727a281957c8b707175c8b125c47135ccf17d707928cadc51ff8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUbT8wAAoJEPGu1DbS6WIAMYcQAJbuZBvhfn/G+5vdJSbiv8uU
-KXrt9H9aXXkTboQFBJOZULFJO2elmJ8hnPZQ6lADvMMXvLjlhHV4wmD3eyW48ILx
-I++8aTbef6dJk/ufQjbOjO4i4ggF38gIDxai2oxCMiu+y2cjD73uAvoj0PlU2xOb
-XaKKBZGXIdp3kXO4ejqOkTVxovb/vGJgDdLeOI5i1y/lYH/btxvaERKbZVKVWE2K
-S6atgwOTAbK/JkSR73e53HpPrEmzILDUouZMLZjjG1AQz/vhSKeQw3GeUWhI4SEx
-IngtzSG8V0lMlEmzUosrB0d2POteUl8n8kdY3ZRVjLcwVOmheg4lLnjayFLIaSts
-M2GMDABinoPiBGhCUUGr2qnnP6AlBGGXjPSeXPzakjkjFIHTS6FwdOA/nxWp5dYr
-J/mPuGmyBTg7uDMf/FaMyDegzydgvKtVT7kAJcwdZ9WYBVkjuOVmfp+rF5VfAKjA
-JLpgAjIxXnWBL7CsCIhsnXEyBxj5+kjw98zOsPU+pd5b8NsM30/HDu940i0spAG2
-uyvoz+6ADUlo9lFGFcCGvX/kCqi8nh/FCff6VGDe9OjdKMsA70EW5X0Di46aG3r8
-UYBsV+/fHwRCxPkry14Ip7q6DRhoyEqO2tboxFoe8bJNWRHGVmbewjci/ykzlCHN
-Ce+ndqV1lRdvulSX+kNc
-=hWrd
+iQJ8BAEBCABmBQJUym8DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjcwQAKaXaCu6KpIzkZqMYWejhYkb
+wFMN6sQZRVyYUuli4nBsMgcV+03Uk9op1qBeXkIVt0bALTVGpuWnAnrIM7hg5U/3
+AKzX0UlI9ht9QDnyLC1KvQDVyy9nAhRW6UeuCWSnU9EJlSMKv0cS9zTIpZ3BL1Zo
+r+5qPwJQvZmmftwVI4AMzTKfdpZ8XbRGz51iJayiIdbGRfixsdwgevnFcvq/LKy7
+2Q7P0POMcDd3iUhhTljIDm99AJfsJxlvSV9Sn3R+Shw3LwnVCHSAxhLXhUSMXeo+
+5uBwxg4KGjUEoe9KJ4AX6c4efx4nmoqRih+8QlIp5BkTeaMTWFGV8wSX20ItnKoc
+fM3qu/AuBdfMCs6Wm8bs4gaQqyRJMCDCzSqKOjwwq2fyrtxEp/BE6H5IfvxoItbw
+LzEy1+Fb2SNtyWzo5BS9zCSwlu+sgP1F9hjf4f2IX1+oYSjEzU6Kv4aSUhh5TX6+
+nNFmqU1clDsAqWxoYtne/0T4F9yZkUarJjQGAEAe6q67FsRb7+AP++a+JMi1qNq9
+hED/Wxalxd7c4BCor1MqgTKeZ0syhcayWcF8KnRFhdTi9x02wiJ5h2M+aFtsKx2U
+lTDxB4+RWdXmaT8X5aenaggWwBWlCJamT8PE+NflN5QScTFzq/AGUtY96VesnND1
+WV7nYdP+mmW5mNx8ZAZU
+=NvDS
 -----END PGP SIGNATURE-----
diff --git a/media-libs/imlib2/imlib2-1.4.5-r1.ebuild b/media-libs/imlib2/imlib2-1.4.5-r1.ebuild
index a098a1aa746c..72f47d7f065e 100644
--- a/media-libs/imlib2/imlib2-1.4.5-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.5-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-libs/imlib2/imlib2-1.4.5-r1.ebuild,v 1.2 2014/01/18 20:19:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.5-r1.ebuild,v 1.3 2015/01/29 17:33:53 mgorny Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ inherit enlightenment toolchain-funcs
 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
 HOMEPAGE="http://www.enlightenment.org/"
 
-IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
+IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
 
 RDEPEND="=media-libs/freetype-2*
 	bzip2? ( app-arch/bzip2 )
@@ -45,9 +45,9 @@ src_prepare() {
 src_configure() {
 	# imlib2 has diff configure options for x86/amd64 mmx
 	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
+		E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
 	else
-		E_ECONF+=( --disable-amd64 $(use_enable mmx) )
+		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
 	fi
 
 	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
diff --git a/media-libs/imlib2/imlib2-1.4.6-r1.ebuild b/media-libs/imlib2/imlib2-1.4.6-r1.ebuild
index 38cca9833b2f..c50411545e7b 100644
--- a/media-libs/imlib2/imlib2-1.4.6-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.6-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-libs/imlib2/imlib2-1.4.6-r1.ebuild,v 1.2 2014/01/18 20:19:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r1.ebuild,v 1.3 2015/01/29 17:33:53 mgorny Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ inherit enlightenment toolchain-funcs
 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
 HOMEPAGE="http://www.enlightenment.org/"
 
-IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
+IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
 
 RDEPEND="=media-libs/freetype-2*
 	bzip2? ( app-arch/bzip2 )
@@ -45,9 +45,9 @@ src_prepare() {
 src_configure() {
 	# imlib2 has diff configure options for x86/amd64 mmx
 	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
+		E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
 	else
-		E_ECONF+=( --disable-amd64 $(use_enable mmx) )
+		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
 	fi
 
 	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
diff --git a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild b/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
index bace6350149c..db80db1a8082 100644
--- a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.6-r2.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-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.17 2014/11/20 00:09:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.18 2015/01/29 17:33:53 mgorny Exp $
 
 EAPI="4"
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.enlightenment.org/"
 
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
-IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
+IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
 
 RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
@@ -54,9 +54,9 @@ src_prepare() {
 multilib_src_configure() {
 	# imlib2 has diff configure options for x86/amd64 mmx
 	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
+		E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
 	else
-		E_ECONF+=( --disable-amd64 $(use_enable mmx) )
+		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
 	fi
 
 	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
diff --git a/media-libs/imlib2/imlib2-9999.ebuild b/media-libs/imlib2/imlib2-9999.ebuild
index 7f64169939ee..565651622998 100644
--- a/media-libs/imlib2/imlib2-9999.ebuild
+++ b/media-libs/imlib2/imlib2-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-libs/imlib2/imlib2-9999.ebuild,v 1.21 2014/07/03 20:26:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.22 2015/01/29 17:33:53 mgorny Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ inherit enlightenment toolchain-funcs multilib-minimal
 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
 HOMEPAGE="http://www.enlightenment.org/"
 
-IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
+IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
 
 RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
@@ -40,9 +40,9 @@ DEPEND="${RDEPEND}
 multilib_src_configure() {
 	# imlib2 has diff configure options for x86/amd64 mmx
 	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
+		E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
 	else
-		E_ECONF+=( --disable-amd64 $(use_enable mmx) )
+		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
 	fi
 
 	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
diff --git a/media-libs/libafterimage/ChangeLog b/media-libs/libafterimage/ChangeLog
index 1d086ec1f7cc..45a6135bd327 100644
--- a/media-libs/libafterimage/ChangeLog
+++ b/media-libs/libafterimage/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libafterimage
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.46 2013/10/29 16:48:05 bicatali Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.47 2015/01/29 17:35:22 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> libafterimage-1.20.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   29 Oct 2013; Sébastien Fabbro <bicatali@gentoo.org> libafterimage-1.20.ebuild,
   metadata.xml:
diff --git a/media-libs/libafterimage/Manifest b/media-libs/libafterimage/Manifest
index a00df211ef1e..611e8e1b52d2 100644
--- a/media-libs/libafterimage/Manifest
+++ b/media-libs/libafterimage/Manifest
@@ -1,9 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libafterimage-config.patch 369 SHA256 75a7683211f8d65a6cb1a6ed99b013d7bcc5b3cb3a241e36748a2c0b5ff960c6 SHA512 8d87d55d5d0df765e824418e3d79d2df2512d775f774896274388c28b5c64b8561cb7f346e327bd03975211f6c6a4e2aeb4af6c125766ddfa5c8087ca4a11de8 WHIRLPOOL 54c088cf2c771ee7ee06aa1336db2917c6ea000180bb926cd5e20422d63a5502710000f7e37c2ef60ff7a9382f1f2e30057bcf931356f8595045fcb57e73ac67
 AUX libafterimage-gif.patch 1436 SHA256 d9e681e5fae08dd6e648ee699e3feb617a924ec5c011fdab81a75d4c3949ea9a SHA512 d4f40c05be0174d2cc9f9ec9d4e911697716710d6ba451dc5d9c92581c84ff73c4a8ffe47f91ddd0917e873e3d141b2a1effa556e84f92dd7ff9cbc7eeb865ab WHIRLPOOL e01f58a89a4a6e998ce3c676efca9d3fbc4362c506543c58343536f18ec2bafa9daf3ae74fb227e5c8f39e70b366c5bc010449f72ec41da8528c1280aabe0b58
 AUX libafterimage-giflib42.patch 554 SHA256 a807a4f913a211dd050b9696af3868284dc4439bfbcb19de7f867e2bdbeccf45 SHA512 3b5ae9712b3c0b62026af3201666d0c21900357251670020902122104a4cb696c7e1af0e6d8812880d0f9e85e7191a4edb6ad7f1fbcf502e226e0bc1c0d46bcc WHIRLPOOL 0fd5c61c8a161515f0aedff27a19ce1f20859063ccb24f0ab86bd2133955ca01454bd6cec3c87eb7b2058376f36d58736d272084e74b74c02f7e0b7b67edebe2
 AUX libafterimage-libpng15.patch 1076 SHA256 bbf95bcddc4c48dcde88745dc9cb772ca53b625e8e466b9d565e4183ce71dbe3 SHA512 67fff22ecb8d2027fecb50a6450b90d3be457c69c8d7c3c0cd16715ead2824634ae5b792cf3877585b74a1323c25934ab31d1462ea983557dc8acc4a6d11bc7a WHIRLPOOL 39a12ef06a584fa24b92757e8ce46adc04f7919aa0f38ef99a927f5d33004c4de4f683630dc4ed9433ff0cf3ae4ae215b0cadbbf9c2fa8f80cfb67959cf0369f
 AUX libafterimage-makefile.in.patch 2168 SHA256 44b2f80b7e5f9bef3852d179e247592f3d5a0983de105082d1b5d1667eb4ced8 SHA512 0fab45a672d4cdecdbd792eb966a31d3ea7e7be7fae52b1e7080d96a513788502099dac41692b4cadfc062ee7fa24bfaceeed4931811488dc4f7c7c34a1e99ec WHIRLPOOL 8b9af84086ff37596aa59af17c0298ebb88895b97f969380eaed639c0d1c1b08373fc10c654f84dfb015adf11ad3d825fd0ccee11ab4d852de4ff0423728e93d
 DIST libAfterImage-1.20.tar.bz2 1017055 SHA256 6e233253f4d1dd22dfce9f9a245cc036d814fc99ba7f6732f4e345de62cfe458 SHA512 4056c73d1ab401480803a3a932d647a66574df9f65efc0d30ba80800e1a3424b4fbfce8e9cdf82c4852862491d92cbb42392f8cce8d6ac21d3b49e4ffe1808c4 WHIRLPOOL 27ee6236ba9b84bb736c9caeabedf0f872fc4223d198f20c530d804d5ace1b91e2f5c26e2015a547899f1cea482a7ea5fcc91e84123ee7390eb38caa3460dd5b
-EBUILD libafterimage-1.20.ebuild 2407 SHA256 12629282bb7c75bac6fed0fea4c75f97b55b8eddae0105a760aec5645b6b43e2 SHA512 d55198c0f7c111a1fd62551ce26fab68f2cc021d08c4b9e707c6c413194847c16b09052335c10e435f31b8704bf0fddce2a3ea8aa56a71271f6042ce70442afb WHIRLPOOL 56c7e4a8756d0dbaec89682a3403b2f7bac0c5723d17535b49192111e91c21e66ac7c3fcdf62bb5c312f919ef16e932d72004713c0f364720eee0be1b57cacc5
-MISC ChangeLog 6596 SHA256 a22a7eb416a56f934b3f7aad1e9f2207c29c836ecf96e39a3b53f5b4db8ce5e2 SHA512 e7d08ec9cd3a9ec750007ad9fb08ee7d670d247c19c1830ab81a9012be2f8151f6f0f98edce597ccefe12306410fcdcaa00406f332d93b9ae26ba3bf036b3454 WHIRLPOOL bbb18454e55587989da18bb4fcfeb79390a9b05cdffc592139f6b70504013509beb2f9854ddcae429da2024ca879f4e5f79507f82abdeca0842c1c8322288821
+EBUILD libafterimage-1.20.ebuild 2433 SHA256 97e7328ae885a4255d21b1d26a0629b4a5bf804126f90152a64f1ca94e3b1090 SHA512 9f9664521fa63a9f95b690d29a245bf403f69d2bdf56e594323da4ad8b6d7178d3916d6a32b7042b054e776f97915f2722681781a93d2cb0ac8187dc853af7d1 WHIRLPOOL 189eb73bb20cb487e7afb871df8b9e8d34ac0c8bc7036bca7fba22978a9c144df024b997042ec4926fbc1de6d7b101a38ae35b0a407cbe80e6cda25b723af3b0
+MISC ChangeLog 6700 SHA256 a39147fae97fd06ae2aaa7bf07772b6edc495269d75cd7ef33eb865664123210 SHA512 e7c8d12bdca49795d0d44f71ea6588f823e8687dd0e54ed76d6703ec8e323279c25ebd47d6d95ad3380f8e0e532b156364458782142a56abb2db27c910937008 WHIRLPOOL c3a21b6a641168921d420cae1ff9c2676191c9cf2322c6d29cd7e44b90f978f0b732d9f60a87759385af578ec92ee17bee9f18c10fdb8673501c7c686b6ab02f
 MISC metadata.xml 833 SHA256 48884af573559b3ff3e38771c5dc02969ad2311bd255221ef0626ba411ab8ed8 SHA512 260825aa6df0523a7fbb22039cddeb7e2386ac852a5ee783bd65439c94b0ee1bae386d057ce6461f0fbf92026815896bb64e8c338942c9935ad9add20d527a5e WHIRLPOOL f7722c7e9e20378d9a8f5c5d7383066ed22f8dfb7fcfa929f63519caf713ae21cbcab92e0645649e99706ba09085fdc8184b5f6ab8a866773a7dd62bb9a2ee10
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUym9bXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZONP8QAMmh9WelYysbB2kaHczunFl0
+kUY8wUGRBlJuzfdyx64JkCJ+rVyW0uLy6eC21S8t1QiptTizdYriv/chcetpHGEC
+qMlKROCX6bg+6hjE6TxkLjGgF6Q93Z0BNBUQNSxdbwTO9n60fA7c6KuBI4IIOuGy
+gue2LHt1djOEg0Ljo9ZbUDO6OB3I5D9EKa+rD9XRLm7YGYeLo/ejREFCRzLg3636
+I03Uged205YsqGBZvf8rsEkMbU6+k9YMUSTSHkvh+FHSJlEslAVoR31TRb/Sea43
+2mOsesrNZ0X3t/Ze9jExoMPYNQIFTuzweNhaA7x2JBmT6DFSSjRBh5dTY7gL7W2x
+1a5ZQg6c926Flq83/75BPwS1vLzzODMj+valNBB5+2L1W/I9IgGx93lpjZgyNX+W
+sN2hwOQ/vjXL4+Bv5hegW8Hc1PdC/3KFWp2Pi6HXp0eo9GACMjq3xYusD+baM4Jg
+x8P1Pf+xSg/MH0TsVnLsNuwl1xw8OdTLmoy1KQsQmgcKe6ijO6UAFFK52vwm/Por
+tQ3n4gYeruNCj2cQcHResYoKIO10PpbUKIerCqr11y3HyFcnqdw2IuUGVbWtB1pd
+rnCp2I4u4Ro6nyJKhstA1ZUk1Ymivoj5TQCmFz68PP8GcosN1YqycTaGAEN885Er
+IIofxcBTRL4jGYzu+qqs
+=DJ9X
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libafterimage/libafterimage-1.20.ebuild b/media-libs/libafterimage/libafterimage-1.20.ebuild
index 2fa7d1bb0f08..4867c7a794f4 100644
--- a/media-libs/libafterimage/libafterimage-1.20.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.20.ebuild,v 1.15 2013/10/29 16:48:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.20.ebuild,v 1.16 2015/01/29 17:35:22 mgorny Exp $
 
 EAPI=5
 inherit eutils autotools
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="examples gif jpeg mmx nls png static-libs svg tiff truetype"
+IUSE="examples gif jpeg cpu_flags_x86_mmx nls png static-libs svg tiff truetype"
 
 RDEPEND="
 	x11-libs/libSM
@@ -61,7 +61,7 @@ src_configure() {
 	econf \
 		$(use_enable static-libs staticlibs) \
 		$(use_enable nls i18n) \
-		$(use_enable mmx mmx-optimization) \
+		$(use_enable cpu_flags_x86_mmx mmx-optimization) \
 		$(use_with png) \
 		$(use_with jpeg) \
 		$(use_with gif) \
diff --git a/media-libs/libfame/ChangeLog b/media-libs/libfame/ChangeLog
index cc010d3a25be..edd0843a21ff 100644
--- a/media-libs/libfame/ChangeLog
+++ b/media-libs/libfame/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libfame
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/ChangeLog,v 1.66 2014/01/26 12:14:55 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/ChangeLog,v 1.67 2015/01/29 17:37:03 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> libfame-0.9.1-r1.ebuild,
+  libfame-0.9.1-r2.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> libfame-0.9.1-r2.ebuild:
   Stable for sparc, wrt bug #495730
diff --git a/media-libs/libfame/Manifest b/media-libs/libfame/Manifest
index 3bb6b9cf326d..1e77f0a0d212 100644
--- a/media-libs/libfame/Manifest
+++ b/media-libs/libfame/Manifest
@@ -5,24 +5,26 @@ AUX libfame-0.9.1-gcc43.patch 1190 SHA256 383799415714250e2cfd4ff2ab8ff94ce30939
 AUX libfame-0.9.1-mmx-configure.ac.patch 1003 SHA256 a4ce89f4e7f989696217d31a7aa844b8ef8485e7af1fcaa5109a832121d5c48a SHA512 9632ad664682bf420eb4b30c25f4979215e172aaa81fe7ad09b714b36edf124bb3c60d56f63e55267345bd8be52b0ea35f40ce54421d1fc58ca8542915180db2 WHIRLPOOL 7556e72e67732965a3ac943e5c0f61758377c8957f37add41a83e0305aded375f3bd04c01620adfa3b253488ef42a25d3f78a194c76ec4b9e7cc22e49fe84ed0
 DIST libfame-0.9.1.tar.gz 296837 SHA256 7b2c5b883db98e99476ae07bbf4f3aa91615e74a4d7fc918cb79154dd4fc08e1 SHA512 511e7be0bac81482edbe5357b982ad1f4adf2bc784a9f52a3f095269076cd1e42866d2ae24a31b17c38acefc03e2c9d868b17074931e5d320ab5eb52271c4345 WHIRLPOOL bfb07c9e4db74b153d690e63f008613cf21bdca7bfad7dd582953ee25a9b575443b90bda285d145d5c2dd74a6c143940d447208165514d4041a47c98e0178c5a
 DIST libfame-patches-2.tar.bz2 5324 SHA256 abe183ef106198c0023de087a4597a5ef3b2784a456b14509c2c235d50d56a9e SHA512 e4f67b137c3397dd00f8a4d5835a180963c3109c0d239d8f0fe616983a5187f6eaad9f4097cc9eaceb5b9c42de9d9e7518a4174247665a8203a4f69b3383abc4 WHIRLPOOL 82d4f6315d33d573bd4aed86bcae0c1e6363ba2129024936f8fd954dfc0356b6528b00c14a3656b2dbe77b0afed7dfb215414f27e97fac6a9aca40e89bda677d
-EBUILD libfame-0.9.1-r1.ebuild 978 SHA256 bebe444c7531747523902ff46e513287e93a156d3d8bfbc0e74cf5a27cbbc712 SHA512 c24a74c592dd85471458c4c0e817d6fb6c31208e073f0f72a054f2ce153b9049e5ab64f2773a61b8c312a4b561176009bad24b179eca33476c371b44a81839cd WHIRLPOOL 27f6a36b5500df8bcc114fbdcf738dd4bbc6814a8d28af91d7696e4d4d8669c256d0c19d023d7bda6749828de62087362ce429fb4fe0bfa5df7e837f999352e4
-EBUILD libfame-0.9.1-r2.ebuild 1082 SHA256 63fc068b7a43d9e3b49512cc402836c9ccb3069abd1431bb24a6c40d6a5d8315 SHA512 3ade1b54152b62f12ddb0e2639066638733b0080918c379d30d0580e9dcf422fbb4983db35610203b75734def9ec125353ac5165c5e23e71f65abc7483895d25 WHIRLPOOL 9c8b1bb38bf7e7a27e2205bb4d546f4a4fd22faa4d31548e1ad9eb1708b48fcc44b8ea787ec6acde990789ff340a1f6dcda8c579a3dc45a35a18248b5d2f8f0f
-MISC ChangeLog 7768 SHA256 ef9a61539046c15c9e273b5a9be50302be15e66e3d9910d658843013b81f20bf SHA512 a6ea242cfb6e086b90bd8c2003545fc0b4709af3df1030abca38e18ccb8dae2734eb46b1e0445bc6851f71547a1050b4440a21a6485a407561d9490002b93b9e WHIRLPOOL 3307ae6d0969c3166899f7d911110a8339ac5027eb529f74eebfc5f2dac4b2d47568c67e1de273c3523d3cea8472d5458d51dbb4e2327899cf5e826a2b5690e6
+EBUILD libfame-0.9.1-r1.ebuild 1007 SHA256 0a24e855452d06fd5068f2cb91dd26f1455e1076a0094a2ad89d9e090faa0c16 SHA512 1b73b2b48ca440ee2a25fbbf7090bcf15e3848198d9e678b3c25839c403d08e0e99e2059ef0709b4dcfe75e11c3f7649df83ff30efb7b5ad7083e5853aa7dbad WHIRLPOOL 7dbaf42e02abcbe0bdc44681271c23dd8b0f9631215d7c7e5569a1d04b09e698fc26380f0673a2a96f4747a1c498fc9f9e5ad18e736a6f222d1942ec0b45caa7
+EBUILD libfame-0.9.1-r2.ebuild 1117 SHA256 fcececf56602391137369d19186344a8067779ea5701abe6aa67ec9b6e380da6 SHA512 0fa740925336c49e607424fcbc193442deb05ffd688bfb0b846f548b9f6941b697a93b74a8bc935a184764bb513c8f2c0b2c6c39062c296baf7d74762cbb779e WHIRLPOOL 454db75c50ffc652ee0c8083fbb850d3f270ec391c9023d95b69cc353cd59cb8db467ca119220c3a21ea4671b0b9bd6e81ae84549ff79e4c66dc5c6779b1b654
+MISC ChangeLog 7902 SHA256 684a147259de5242168f5379140b5db3f0f6a98bf1ade79a86f53849d0a4ff71 SHA512 e8c9275e41ab5550fa5694992ec57c74bb27e78ef14fcd872a1779e198f1ac1414dfd1692ee0d3a19a096c16048bc1b4f2aec23d65dd74fa419960143dbb79a3 WHIRLPOOL 5ae99ec6dce3d665d55f81a65650886114eb3565d6728f03e62e7081224b7d53c552595956d4f1bbdf5dd5dfe8b0ecc5640b1a00d9e9cba2975efd4620631b43
 MISC metadata.xml 223 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 SHA512 cacba929b8688a7270637f34d348216fdeb89e725cdee4b40e5577ca3f626c5f72e73c1c125605a284506aff47265f41e3fedaa76ed4074c540fc1f200e6d494 WHIRLPOOL dcd04d57abcfe2704036097ed68500917f74b7024b46580e9054e1c933d55678992c350fe07ff0efd590b9345fbcdd81665b8ce546f786dd31f5a0f4eb654da3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS5PxAAAoJELp701BxlEWfz8MP/Aod2C4en8FuVP7P+xz9IDxQ
-01QJcio2bJW2rOCaxjwPsc5cJNiFzAqk4W6ewqZAARi3f+ksM8f+n6GCnbrxydNh
-M0TNJbJSqYfrT5f+Lj9vtckYCbbiCh+obroLqbQ6Ds99J433Qy4ZWQpGdUb3oDMS
-I5fQb3HTqyzMNoZm0z7rrtfeErR+0cKjPWK2UoKFlitUwykpb+0/b2m1xHZH0F70
-LRHm/6ar4maEtzLrRNOB5OGklDlUFDFzMibCdDiTuo4zu4Z9qs1qVpYzr0SZTYoY
-wLAEPn2bomIesZrU5CwQX/LGEdwIHclvVx6C/t6/ZSrW57jrlTffME1YByTYS+IM
-1Bl/0zt4NQ7Sqv9+2cGtM4eJzfniAwlzGkvfFpxhbXIBGnCCNT2KbuubadGesCyN
-Iv2QXR69Zg7nxU68eHw6FV+Uu7wLFhwFVROCkxFWzpmi+/HmWh0/iBuRnGLm1EHk
-jaSpi9RrxsePpSFXyFuvxKaKhrHws4yc1KjnZzesYynqJ4ytH+g+nzEyeIsP7kSw
-eNC6EOFGyYSl9wYO5APVH3jWpci21lEpG3/0rWOGE443i1U396kvyfcXFzU+xPAX
-3DdbUZ7pF0rjwWwgTjmCr4K5ygqH1enPbTaqbfmEYIIk2RRJj7VEXa5oHKyoSHxL
-YzN9yR2OzDxk48wTAG7f
-=PTTr
+iQJ8BAEBCABmBQJUym/BXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOYI0P/jSgrVDtyBguMf0eqGiDI96I
+B5aRJW43Glu7td53gFHYdM5OLTvtq3otp/ZIfMC14KxVZXn7jtLMCLvhAaPvzeGa
+QW/BCyAL7QJIl8G2WtXPIlL7b14DT2YV0XQXs8HQrvntjkW428vFkO7kj8ojt863
+3uAAqPBxlcvq1MUOIzf4uHz/CEP8ghLu5wHbIOSGSzyAbDaApThtySjNMouthvil
+ieCgIkD7Vafzr3MkErOKGJPgTio/pgf+89FVWdifa7ta4MteM3Tr3tf1jSVXFuMe
+aRDGWLa0Pp5Zr7E7s7QX3gTDbCeReWhkiuXmNg9Faa85x04RSkrf9SZQ4B2EB6/Q
+Mmyo1i2ND2zwOoeugfO8J3M92P/7R02MRgwCfMah7WK5wCdUwBRoUo503RYzBGPV
+w4J85JlTu2tusPcy4NdGG2+WnsoAhAG6oADDOcac0wWm0WCsX2Z7Hlw3xYuA0EB/
+5x5R5k0WsMvLAQGNw8sVJ+0H7rW8oU5cLQI6zdbObw0x463O+4pfNkxlk6lXXlrw
+V8eB+R0VBmI5iGTGuIXHSTiTw3GlJOVq+1sffyxyu5yunEF1jRbO5aadeDfEEeaK
+W90FzUICM+0uSXaXDVUNDDJ7tbeLSsR7Y8ovPgWZb5w2Qe5nx5w4drBD9iPO7gQC
+3d4vdcu2pgHFHRqoZbij
+=TUlo
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libfame/libfame-0.9.1-r1.ebuild b/media-libs/libfame/libfame-0.9.1-r1.ebuild
index fa95d69590f4..e91f0c8b45f8 100644
--- a/media-libs/libfame/libfame-0.9.1-r1.ebuild
+++ b/media-libs/libfame/libfame-0.9.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1-r1.ebuild,v 1.30 2011/11/28 03:26:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1-r1.ebuild,v 1.31 2015/01/29 17:37:02 mgorny Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/fame/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="mmx static-libs"
+IUSE="cpu_flags_x86_mmx static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
 
@@ -31,7 +31,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		$(use_enable mmx)
+		$(use_enable cpu_flags_x86_mmx mmx)
 	)
 	autotools-utils_src_configure
 }
diff --git a/media-libs/libfame/libfame-0.9.1-r2.ebuild b/media-libs/libfame/libfame-0.9.1-r2.ebuild
index cb95343adb67..3de66041a905 100644
--- a/media-libs/libfame/libfame-0.9.1-r2.ebuild
+++ b/media-libs/libfame/libfame-0.9.1-r2.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-libs/libfame/libfame-0.9.1-r2.ebuild,v 1.10 2014/01/26 12:14:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1-r2.ebuild,v 1.11 2015/01/29 17:37:02 mgorny Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/fame/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="mmx static-libs"
+IUSE="cpu_flags_x86_mmx static-libs"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc43.patch
@@ -38,7 +38,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		$(use_enable mmx)
+		$(use_enable cpu_flags_x86_mmx mmx)
 	)
 	autotools-multilib_src_configure
 }
diff --git a/media-libs/libmikmod/ChangeLog b/media-libs/libmikmod/ChangeLog
index 2a50e03a3c9e..102300eb6393 100644
--- a/media-libs/libmikmod/ChangeLog
+++ b/media-libs/libmikmod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmikmod
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.137 2014/11/02 09:06:31 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.138 2015/01/29 17:39:01 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> libmikmod-3.3.5.ebuild,
+  libmikmod-3.3.6-r1.ebuild, libmikmod-3.3.7.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   02 Nov 2014; Agostino Sarubbo <ago@gentoo.org> libmikmod-3.3.6-r1.ebuild:
   Stable for alpha, wrt bug #525550
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index 8520d1de3d34..a924df4bdcde 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -16,25 +16,27 @@ DIST libmikmod-3.3.5.tar.gz 1288856 SHA256 b714ee340a04e6867f60246f679e0f40063b9
 DIST libmikmod-3.3.6.tar.gz 1288510 SHA256 3f363e03f7b1db75b9b6602841bbd440ed275a548e53545f980df8155de4d330 SHA512 708008d162bac1a17b090a3a56e3078bb3ce42cb0d54b1e57963881d060198e841654ec7a72212aa9dc0e5c8bd95ec1c41ddd58e2db8c6e91a29d22d7bf363a0 WHIRLPOOL 42c0a1f88620fffc4099f87ed04fc5ad1d308bce86e2df085365a3d2624d801cf27dc3c28ec054ab7c4763af4af09d16c9f44e848b4ee23b7efd09ebfa4268d0
 DIST libmikmod-3.3.7.tar.gz 1226732 SHA256 4cf41040a9af99cb960580210ba900c0a519f73ab97b503c780e82428b9bd9a2 SHA512 3d2db6d0838a957f073f43f81e8ee20d803e5103e71bcbf7bb08f8a7776a77be50958522fc48e3ea9c20ee20a5a60eda8a66cd403f382ebd6c7910c6325dd4e9 WHIRLPOOL 708032fddc2260e52baee07dc00c45ac3dd0936d1c0f3f3b131dd3627fa7e1f0c699ab8184863f6435286ea4e1f83599cac76ce985ebd92a2d15ab7844d83fdf
 EBUILD libmikmod-3.2.0.ebuild 1680 SHA256 c2a99aa1dda88635078d756acfd538d6bd2226bf08da89c06f2e849b66fa9b74 SHA512 79a577b8f45d834f44132892a2946833850cfcf1e84f8d39808ed5c136086323754532df2e286fbfe798b096c87521f88f0564041a1de9cc0a6b33ca19ab98eb WHIRLPOOL bd5404fe1799a39f7094bc93917c4edab6056c4b9328c426b68870871002ca29e4c1154f5772c9934bda4357c596fb93faf9a6c7c3262f038e387ec688aaed1b
-EBUILD libmikmod-3.3.5.ebuild 2136 SHA256 d15c37b1989c40ba6d2339313bf1597ac27c6ccdbc480bb31d7f32c43744ad8d SHA512 f18094e6c50eb33afc79ea660b25339e1c48b242943d8e40d725cbde7796e2677d09aa53bcf9d25c3e53ef27484781785632acc1246c3d728e3226f7e5917919 WHIRLPOOL fa731d4864de2ae2f62663f3395ea9ffd74ad1eb001218897d6270c5e9ffa24b215af88f9384a8f154332e8ec2960a88b6613b843593614012a45f2fee4621d9
-EBUILD libmikmod-3.3.6-r1.ebuild 2245 SHA256 272e110c3e7c2f6544ce64658044bce547960e6c205b85a476178298910b7f55 SHA512 889070962429b98adee57d0d5abf48fd68f74285eb2f0b7598e4f443be67bdc8c8193dd5269b7f17c38922b526828f7d2c87958513c0f51965ac9b72079bf0c2 WHIRLPOOL 71a345308e883cc103ae95a909783079d9486e95b28b861a9dfc49c62e377e13dde815e855847b81b8c84a70e2e8948efacf64b05a375c492540ae521b2365a7
-EBUILD libmikmod-3.3.7.ebuild 2274 SHA256 7b191f6642c21360633a2c8a19b19c89f7e9e31d83624dd54986d94e492b770a SHA512 037846e58302bb2e9f40223c093ae7814de481b54841660ec1557c15245d76413fa27b843f5a95a6da8050a113343c2dc57f2e77a0ba61a37fcc543fb450a74b WHIRLPOOL 49937527231b19b03b3439467332c747065b87ef5ee11bcfa3baa1b35c8eab17513867c14e24f5b24deacb52f978fb889bc5a41f51c72b11f45c2ce1a8fe9f1f
-MISC ChangeLog 20855 SHA256 eda5e1c2ef60a4d1ff521387060e7426bc6526f1a80495e8bd890783022d0d8f SHA512 d3b05d6134afd7514145500d49c5cfa2c2894b48f834e38b1bd3b1692f80725410c79b5a87ca1d7e1eb86edb599a2c3c688f18b82b70912b457c6a87a85ffe18 WHIRLPOOL a3098382a739269cdc34fb8d1833c7537e73d7186e32d13efb39fa3a2d22761e558686f1cf7ae1db8ef1e597f7cabb64d94b2a3d5e9a904e971ba8c8d8efe796
+EBUILD libmikmod-3.3.5.ebuild 2167 SHA256 b425cdd5c7be995770b556a9721fc4270cda40feeae2ce04e104d60dfcb5b0d8 SHA512 113a4fc5a1f55b4bee5cb4cafc2ac8e851d87c4213695f0c2aef5b3d6f1d369abd685db071d916510ff7f8dc2f8262638b7cc9f534ecd10bb3fe1524bc7651d6 WHIRLPOOL cac32dde2759846c2e46d5012d3a6e54660b89432dec37abc03ac5db108cc31141c1d178bf2abafeb3d4dea0ff663f9b05fca6ea563a6842a7f0ffef2f5dbd68
+EBUILD libmikmod-3.3.6-r1.ebuild 2276 SHA256 8ea03ff5ccef5862bb4d160916bf95905d28f6dfcf09640304c9454a32f63f81 SHA512 5445d13e1f7d348d31c8a8bd35e9915d824cb375e03d7fc7ff844ccdbfd311415e4979846870ed4840d1c583c3fd39bb560b57eff4dc921a087046ce4882a58d WHIRLPOOL 39c660c39fffa731c8d6db3db56c8262f77e751e30fc25b2c8acc56ef0c2d8984f709b7325cf4df418dce752d42ba81d68c2ff754be9e7a9f4e6cc0a717c119f
+EBUILD libmikmod-3.3.7.ebuild 2299 SHA256 72a1ed4303d3cda6444b848098a2a5ba767592356c8c682a41b8c67a2f954a68 SHA512 cdfc4820ca4285f78bbafaca5996dfe68369c69e85dc9e466a20bd36eb9047e2069b3a55ce862af8237e726c8375365d21801e666cc5cf515998faa069f149d0 WHIRLPOOL f90f55b210a8732b1017668d7722e1ec8171f327773764818e8c3ae5fec60fcd6fc98c96d42fa8f300e2663f250cbbf2a910dc42bdd337ed8dd2c3229993d345
+MISC ChangeLog 21014 SHA256 764131f54f601f6ae65dbf0128b6d6b3fa06f500849fa50778f58cb0447f08b8 SHA512 0c593c8da170387422a5a6e3acb77a04f7173ce3d5b3be4935b5b921b921febf8bd159aff409d3062f8cc0341bc9d3db8427d5a7acac6dedb16e9aba97fd08f9 WHIRLPOOL 8fa06c43c2fc08dece59c77fded392403172e353190207ca64dbb2851410648ad115f733aa13ba595ad19c9bfdcc3a8b264c37c6cc2d97994694608a2a20d6d5
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUVfQYAAoJELp701BxlEWfUFAP/insk+cUj9IuKea7MrpX8NrU
-YZttpFkBY7S16pG69mB/F5sPWOAHPLFHja6xmIwn7B8K8T9ZZKgc/26JBGaU+QzQ
-s+4YLwV1OBDhfFjedrM5+ruazp9Q6KzE8G089Cu8Pp/xBGHD4L6XRpyN1a+lCRpZ
-TJvGetZueXggcBF8lnuSeyJNnh2rWFoKSmGw7Uy6JNUQFA2UbbOsCgMfoperLVGE
-tFAR63Wr35zpDOsuF/DWUJ8aB+3r8AehuEPUpd4HPCnqMfxXO/unL/4fneb6Mmem
-DINIZD7QUTLVcXen4jCJDGlFlNrP/RjGp47vnD8Og771oiN174aZJGMlHAVqHXbu
-NQBn2I/5P5xV8fcy08LqhiujoJ/ZTmdsQD+BOq+qXxyIDS6IuejleK6mpRgt9bGT
-Ffem0jn9vQAK29N9BLuvbU5Zg6wXdc7CZeXJNDxDD7DElqAZMmOiRt0qyJSxGxjN
-hguWsd5O12LYeRROZ3twM9YFZaTDnpr6vheLtbJbmrvIAaE+s0yDx3kHrEaU8mTb
-dqCwZqUDfVsOT1jto6jEXYhVGb8KLKPlo/gi6uhOOV2VzOZMOwlo4CAu1BY9GIeP
-iBuy0aqRcBDMZc5+ZZJQm3Vxg8s1ihZfJkCmFApvMfL18h4+hG2skZ3yGCLwJax5
-CBKkBh8asITxgl2jr5Tb
-=tYv0
+iQJ8BAEBCABmBQJUynA3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOdKwP/1PH6SydKfZtBK3U21+yiL+X
+C/NOS4up4e9JsCCVUE5d/hM0omj6vorpY4QnvJsiVU8svnab7gsTXjYlmkRlM4q2
+zoGCFu2LRCjsGTTvpaKVoWrolkZIMn1phOWG0w14+EdJCDbRLEK5wHhb6o2A66Lu
+6z1ZvXvQ8U+8PGyrze0ySuB6BxuHT1bqojPgF5EJxIT+ydhnNg7OBqF2svp/ZpzH
+qK9DArKJJca7KIvjSpl/N7OCYH+RL0rf8dzShyMGITlaL2UkqLj7bNtKMLMqAvVm
+rrlo9bwZF9oMcKQnCz9atJLhm30t3smjmxGi5sUKlAuY3aYBRJoc0B6S6g2H2dM4
+6QFFKaWF8Z82Y/BDLzPEDCmh31c3wsKuQDxlREpDncuC2i2eIPe18pCZM1xC7Ys2
+ov3b7z1Jc3NeoAB3L9ZMaSZk2wcedksrZzwthp+x1ZgCdYLPkciiSyqcdJJQ+dd4
+93fJnScjmw1atfmRlJYw5+tuZEZok7fQi1IkZYHg0u3TCqpm9y7GEEYMx8cBjETc
+qLKVmR/+AOQ6PZWL+pmrEEq7SeykBfwCftUp/sJP/GI+PZiAaA2UXBpqXL9PVjbk
+YK3qds6NQtyuhA38kG7Kv/+lcQ7kb4n064Swgdt6C/A1wpJHxdWeQzxpD9tq+vPn
+ibqVdH7U+VXZQUCdNzJw
+=4JhG
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmikmod/libmikmod-3.3.5.ebuild b/media-libs/libmikmod/libmikmod-3.3.5.ebuild
index a8a0176e153a..e9b56f4a78af 100644
--- a/media-libs/libmikmod/libmikmod-3.3.5.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.5.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-libs/libmikmod/libmikmod-3.3.5.ebuild,v 1.8 2014/08/13 09:21:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.3.5.ebuild,v 1.9 2015/01/29 17:39:01 mgorny Exp $
 
 EAPI=5
 inherit eutils multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio sse2 static-libs +threads"
+IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa oss coreaudio )"
 
@@ -32,7 +32,7 @@ multilib_src_configure() {
 		mysimd="$(use_enable altivec simd)"
 	fi
 	if use amd64 || use x86 || use x86-fbsd || use x86-freebsd || use amd64-linux || use x86-linux || use x86-macos; then
-		mysimd="$(use_enable sse2 simd)"
+		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
 	fi
 
 	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled
diff --git a/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild b/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild
index df66bad54266..0207eb6508ce 100644
--- a/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.6-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-libs/libmikmod/libmikmod-3.3.6-r1.ebuild,v 1.10 2014/11/02 09:06:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild,v 1.11 2015/01/29 17:39:01 mgorny Exp $
 
 EAPI=5
 inherit eutils multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio sse2 static-libs +threads"
+IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
 
@@ -36,7 +36,7 @@ multilib_src_configure() {
 		mysimd="$(use_enable altivec simd)"
 	fi
 	if use amd64 || use x86 || use x86-fbsd || use x86-freebsd || use amd64-linux || use x86-linux || use x86-macos; then
-		mysimd="$(use_enable sse2 simd)"
+		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
 	fi
 
 	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE
diff --git a/media-libs/libmikmod/libmikmod-3.3.7.ebuild b/media-libs/libmikmod/libmikmod-3.3.7.ebuild
index 0ac228066644..231b312603a6 100644
--- a/media-libs/libmikmod/libmikmod-3.3.7.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.7.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-libs/libmikmod/libmikmod-3.3.7.ebuild,v 1.1 2014/10/17 13:08:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.3.7.ebuild,v 1.2 2015/01/29 17:39:01 mgorny Exp $
 
 EAPI=5
 inherit eutils multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio sse2 static-libs +threads"
+IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
 
@@ -37,7 +37,7 @@ multilib_src_configure() {
 		mysimd="$(use_enable altivec simd)"
 	fi
 	if use amd64 || use x86 || use x86-fbsd || use x86-freebsd || use amd64-linux || use x86-linux || use x86-macos; then
-		mysimd="$(use_enable sse2 simd)"
+		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
 	fi
 
 	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE
diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 849333351646..8420ed5e16dd 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.199 2015/01/18 19:53:42 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.200 2015/01/29 17:40:48 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> libquicktime-1.2.4-r1.ebuild,
+  libquicktime-1.2.4.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   18 Jan 2015; Ian Whyman <thev00d00@gentoo.org> libquicktime-1.2.4-r1.ebuild:
   Extend ffmpeg sed to a couple more files, fixes #509300
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 66c8602f48a8..69a0e7e3c38b 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libquicktime-1.2.4+libav-9.patch 464 SHA256 d2ae77357d52e522f56c12fb1409b6d27bd576582122d04177a7433b39538bb3 SHA512 691110dc18f6646e2e17f40c6a42911a6b8eaa8cea20b5595f20d218d51da11d11923a3001b7ad7c3ad6bd0d90e712b95ccee5526fa1bec176cd27813e4a775e WHIRLPOOL 5906f1cc37d305616579084e0e4338f08a41817e51dc66e3d044b0e9012253aef2674c9fb06df48d689dea8e7431f73a8d8c278af723982d7e873d8376f717d4
 AUX libquicktime-1.2.4-ffmpeg2.patch 4046 SHA256 2c7bb532ea8ac3b0e7a9a76ca6ad41127810529e7f7c2faac6f1e2f7c5c4bb93 SHA512 32ddf394aad4ed80e89ec72a534e0466268ab0061b991815e905b78eae55a7d935117b0915faf6f7f51bd7e2d9fbaa4b0e07bfcef1ef1e2f4a7e2061c489122d WHIRLPOOL c22a21bd245f51c457d68291bb86536f7b381fbf01f9ff5ad6e3f4b727938dde9cbe0bc0ba7eb4fbef71dbced2aa02121a097a9cdeb5bdd4c24dac699df48c08
 DIST libquicktime-1.2.4.tar.gz 1028626 SHA256 1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd WHIRLPOOL 8eda1c75d86d728157f4e4c9e07555dd8dfa2a6ad5fc37d022142111993610d8350e54d586fe1c6627402f22ce42a9b9505a3ffb909f9bb530b9ea0f71b6b192
-EBUILD libquicktime-1.2.4-r1.ebuild 3622 SHA256 5253ab1ae927824fe9bb03241dbbf69466cf3d5554fdc739c11f8fb64bb6c9d0 SHA512 fc03c1295e9f25d108ffba3a199d10207aef2beb207c7a860674659f3f076e129cd65de8356548ff4c98cc2979fc3e95c0d5367568401b786534e43e98f62578 WHIRLPOOL 8bbf0131f5daced0ec6dc586ee29ba4f625221684df18b92d7b0600915f408ee1929892813315b40add4f6e33da33fe853f5223710e73d6235bfcdb652fb131f
-EBUILD libquicktime-1.2.4.ebuild 2794 SHA256 dd3e6aeba101accb0e12e09cbce953e6dcb1ebd30e0760cfbcd82a5d82390432 SHA512 98bef72f817ac29710db5951b37cb1bff33537b67b0c8bf4416b6ea6b5fd0c2572b773d0fab85bc0ff3842d7c36fdb38977886467669f81c9f07a17922046535 WHIRLPOOL ad339a8ae6cb545dddaefb060c2021053904f33ea4a6b3990f40caff20303e02b8f99fd0f0a93b074a9f626caab26afc697d155a5258d80c579b5d546f3d1ee6
-MISC ChangeLog 29310 SHA256 254e4c04f1f07345bccb85cbae15edfcb58850d033b30d2ef6284d5c571e5459 SHA512 48497de3e2b8e04ab50a4a38746c8f51f56c4732b4163b8cf58adbb809d37bcff99525d01d5a6334d32c3bfd8e7c32630f476e2ae0ff8cf07a3bf0babc15367e WHIRLPOOL 7afa5dc4cb57603353c63d792fb4d11a5e7f80f34da207bc585856a7fb07b6e097c9c1be3e8efdc889d630de38f1c8bc4c08b42a7db96e335b11974d21059ecc
+EBUILD libquicktime-1.2.4-r1.ebuild 3647 SHA256 c0fa26d68f18e506189fb372e8fa79546e90dbcc0857e525c7fe1384c59b3fc1 SHA512 53371843a88682759e9eeca41494f9d695f341bdb519e14ee5ccbde3a941a2447fbbc89757d8a69c7692ad5db7aff4cba55900a9a1226fe060c5dbd7cbe2c29c WHIRLPOOL 5a46a94c4a3b273c109c2960c44835b349f0cf9b571abdbcc829d0a6100b9484e9345f3cd4e07296e736293c1b5d8852af50c1635c4cec76b4a9ba096c9d4277
+EBUILD libquicktime-1.2.4.ebuild 2820 SHA256 3ccaf3d91bd0bf93537634ccb553829ab6bf59d3ea1e08597272bf69b67a5f88 SHA512 07c844fc5256ee874e9bd9e9209e72ef5fc251e3f0d82b777937daa08b6133c294b3ef0aab677782c33f55d2bbfa2a17814a9e5e512456c299f230cd54bc3e45 WHIRLPOOL c3c5bcc45d7f639eb8c6ec557656330ebfaeb961df485cb0a23adbed322aae140340a23ccdcae9d278d6033d06183e8b9d11c586aeeef5afe7445817869c04ce
+MISC ChangeLog 29445 SHA256 79c0e144a0f0afd7681168e0f35bbca31c27f19afe2d4e371f2a0654f322affb SHA512 c7baeb7c2536e24242afbd00c7051066a48eb5323ae97726c23aa821760c8a907c40a7c054fe5a0c578ab03d3c620afaf022d65d4fe532d76d0a7b764c08279a WHIRLPOOL 545e0a7a0617d4384c6a261944cbd9a6d67e53a6bd2614579e35994a454917b3a9f9b333ee66ad060fc1ebee651c6a1853c1a60a35d394123484630579078d8b
 MISC metadata.xml 429 SHA256 0f34b97b72c8fd6ac971342f174aee213910769a0a45060b188da3e9b98bbfb0 SHA512 03e085e21c5be7412f7424eb900f3ff33f085e9941b8f296356b6a39d6ee2233bfcf01f54ac06fe459ae960f8c8f829969946379a6bd54b6f5d59d51c79555e9 WHIRLPOOL 33ee43277f22fe3d52e05362e1d3a2ceb17f96b6c3acdaa37e58e32418c7039be05e19c87a5f10a261dc4a1592a0192f0e52b1223b34addf6acceb4842e57326
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUynChXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOkXMQANRCn2r9OdXVESzXoqUGA7Rn
+Bp6xkIaEA7PlJua3BW95+BwZXbQs9z+GF2aIXbCQtR9FhVgt7J6WxM4HZVUuO75s
+hXmXIFv/VQTPeDKsANoxC7/WW72CckSpFIc8lyP0rHW2yPSyiMLs/yBfB935LyH7
+vtfcJ4tje7CpS/Sf4GpIw68uvU3M5rq1qDbux/PaJDAz6lnPFOuKo2onY12fvobF
+djPzSnoo1xTpSNk31DIsz2oqkGT5wGinNFb6vdQOiKhoAfNfLNw9SPSr7JQO9Gju
+fZDwxYK/BYirr46NeL5Zz1Nr232GwmZL7nd/A1UJ7E1/vUnd4wZoleN5mSgms4l3
+uz7V1FTt55H3dEIbbpUaicy6hOLcS9KwrKfmAQO53k3EbCMDEZlUtCfrYxUVN1oj
+KA46/v6jU4V9qUgJmzrE+twogdR6cwS+NA0ygsaHX7Of+MFejhpcyPyvdgk5uVmx
+GnCxG5KsQqu7lBz2fiQvPwvhS+G+vqHZk/zzF21pJbEx3/23/D6CQqgxNPKHpJE3
+jy03xbeodoOU1zz8sDP33QR43UgoGi2Hs9CFPAKbZRVnoaBZTG+66eOUJzt2b+zD
+ysixyTVTxuxwV0S+VMf39IYZB6bZFcdy8IC3Rq83n6QImL32zAJ7DVoJuOnGBUnt
+jX0gw1cH4qNyCwgbN3FY
+=AqlH
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
index 239537a3dd37..80fe4faaa3dd 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild,v 1.6 2015/01/18 19:53:42 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild,v 1.7 2015/01/29 17:40:48 mgorny Exp $
 
 EAPI=5
 inherit libtool eutils multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame mmx opengl png schroedinger static-libs vorbis X x264"
+IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png schroedinger static-libs vorbis X x264"
 
 RDEPEND=">=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
 	aac? (
@@ -68,7 +68,7 @@ multilib_src_configure() {
 	econf \
 		--enable-gpl \
 		$(use_enable static-libs static) \
-		$(use_enable mmx asm) \
+		$(use_enable cpu_flags_x86_mmx asm) \
 		$(multilib_native_use_with doc doxygen) \
 		$(use vorbis || echo --without-vorbis) \
 		$(use_with lame) \
diff --git a/media-libs/libquicktime/libquicktime-1.2.4.ebuild b/media-libs/libquicktime/libquicktime-1.2.4.ebuild
index 36bd95a863a0..ce0f58b6f630 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.2.4.ebuild,v 1.12 2013/08/06 22:32:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.2.4.ebuild,v 1.13 2015/01/29 17:40:48 mgorny Exp $
 
 EAPI=4
 inherit libtool eutils
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame mmx opengl png schroedinger static-libs vorbis X x264"
+IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png schroedinger static-libs vorbis X x264"
 
 RDEPEND="virtual/libintl
 	aac? (
@@ -60,7 +60,7 @@ src_configure() {
 	econf \
 		--enable-gpl \
 		$(use_enable static-libs static) \
-		$(use_enable mmx asm) \
+		$(use_enable cpu_flags_x86_mmx asm) \
 		$(use_with doc doxygen) \
 		$(use vorbis || echo --without-vorbis) \
 		$(use_with lame) \
diff --git a/media-libs/libsdl2/ChangeLog b/media-libs/libsdl2/ChangeLog
index c7aa4263f64e..9514ca84ade8 100644
--- a/media-libs/libsdl2/ChangeLog
+++ b/media-libs/libsdl2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libsdl2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.30 2015/01/22 08:22:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.31 2015/01/29 17:42:14 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> libsdl2-2.0.3-r200.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   22 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org>
   -libsdl2-2.0.3-r100.ebuild:
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 3555d9269377..62de0d08c69c 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libsdl2-2.0.3-gles-wayland.patch 2245 SHA256 8cb7b7d7d34d1a490159cfa0b020231c5c54e085df263897b5505d921069704c SHA512 bd90ee1b031e9deb594d0fa295dba956828a53baa5ec4d07503eb83cca27a3728485bae73ba5c0339e57d09ffbfdcd0777552b4a85312c2bbfddd7c91f5bfb73 WHIRLPOOL 769f60c65fec76ba682ec35d09c6435c3135e3bbbefcafa775c50d7881ca4304ee846436f71f59e4c19ccac3c9686655c1a9e8239dbc80ba2e6a43aa3d0ff3e9
 AUX libsdl2-2.0.3-static-libs.patch 4633 SHA256 aa3ce99668a0a504e22b8f4d6d22585592630120335b37d600a208aed29783d6 SHA512 ae43d0530d5dcc5250b304cf83320e45a853bbc17f59ffdc36e03222bdd51c283e55feaa9c1694d373a53ca92487f380934fdee52061ad738c3973ffd034c616 WHIRLPOOL bcc59ca0b7fa84eb5189d7849814c556305cd0b269724f1aab792cdb8012a1ba319dda03df9e535ed3c20c600f12a62008fea221e2509c286eec3e39fb40825b
 DIST SDL2-2.0.3.tar.gz 3871267 SHA256 a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c SHA512 b6d2485154fbc07ab86a4305485e116d35fac25a97033b9e1c65ee0eb8251a18209cb1de3a914d9c0ddc53aa1ffac66c865b111d218e79eb5a10ed00dfec7540 WHIRLPOOL d88658953cb668b8d4167b799b4a2e9b90a426fddd0cdddb4914420063e5768c609c2b4a954b50c14cbc5728894646db6bad0e5244ef6a563d4e2ec3da26298b
-EBUILD libsdl2-2.0.3-r200.ebuild 4545 SHA256 7bca50cfb681d6383fd26a32073c68874bbdcbc8cb48f2c4c4a3c1e853ace4f5 SHA512 06c6d0d694c3c62015ab5da97bf1b8d8b2b2bf764fc7e101c3d9ab863486fd79dc88918f35099ba899db11dc56e0be8763c7efd8f3dd5a821175b16c58a78d1a WHIRLPOOL addf38f456747e2bef45c2b6c56c72fbaae8d744984ceafed9db9fce228a53b65a59e332afb158d16f667ccb9a9b7524453343d1089feb3dd234aa377d5c0abd
-MISC ChangeLog 4898 SHA256 c9a9def6883711949ddd2f3dc005ecb85f6cc2644f0f144415638b2a21b22ce5 SHA512 1e7fadb7a861d46eb6440fa048afb60351f8c1cff040648c0b8f76c02d7052696f9ff45a619862bcbf35c02f35852a1f97c2c4f6255c2d8e024127ca58a328d2 WHIRLPOOL 58fdad197cfbf331af5592cf0d07147c1d860ae6612aabdd891b4f96c9c5baad46ba434f22d88760c2ca271b2cd7e2c76f890ff3d962009ca0d81234656eb81b
+EBUILD libsdl2-2.0.3-r200.ebuild 4690 SHA256 88551c592c0824468adf72cda1a4082a9a1ecc9c4d8097d0175bbbaffb270574 SHA512 47ffd03c01b88e183e2d6bb077763921689bce71cc6af66ae0f221ec70dece4b8ef4edbf86813a66aa79cb7b1838d4050572d34b188349a0639e1e31f1ef3bf0 WHIRLPOOL fdf45352ffcb5f790f2f8dda9548a50ac1002b810f273d12d62d7c4725ce4d287e17c1c0ee10c3163f1ca4b8928573108f0c64cd4a066ff82824e4b92518c2e8
+MISC ChangeLog 5001 SHA256 7fa64b5d52a99af9f5393dc28e1eb99474a48432f9302c57723f9b823f7059d5 SHA512 a36e8c2334e2b4846554e8f85da92224380e87858d9855b2ff14de2da899a8df56669ad7be6e4a66e308c23a7c60e8e4a93dc7a57991b3c1afeaee8d1002ed2d WHIRLPOOL 9fa54806c8fc22f1740d5811ba2327e59556a21123b74f77f5b4ecd207376cea5a819a123f7a6f058d778971edbc7889752d0cbe35337bd51a6f78af8272f17a
 MISC metadata.xml 1532 SHA256 ead452636f1a7a15434b332e243cadd8be1f9e85d980f5fb03a306f9d0e6d3e6 SHA512 a5a50d8e9ed9afd6b4408441f445eb65dc55ac24bcc4d5b6e9da8a1655981bf1fe5bd8e0c18b83e8b475f541596586050de312f03b2c0322772714fad687647c WHIRLPOOL 8a4c2b4c86a0b1dfc075200a7d96a2f23df1c402ba215fe3f6806af51b683f6e9ab77d3564a993f7fe6e533562af3f0e8af8f2f9984e8f926f8799ecde076fad
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUynD4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO8jgP/A/d+7w+hSIYWq/Y4x1X2PFY
+5Gj5z2RhWqSYfhEjl+0OLtSaD7WZ5ku6uya1NZUW+r03pNBgWB4yi6JC/HWOKgkW
+mRRYs4pma4BOlM0a1sCGDafsDOfIAzYUgdrw2qSVRnbG9OHQRmAqQWXhtYT90Iy6
+s1hOR92vqXZurm3hT7eb0uItHkQlzukXbi48hWKj3Xr24E104jF5o4igTiG6LSWo
+eLZV21YT66jSpbkrMUU3kQoVogjqMSxSZ2+yjQ0oNb20wa0/26ORLkVnyKklSFIC
+rsqatMJDdr88t9/TKUEKsUU44n5KjCjeqJlPA6yzwjT1blb3uhYConzwjqJ+KyCZ
+zkQn/p/BZIbCdt2UzbMDmaHrovyyowPsqY5lORy9M5wyeKfVEkWfY6V/ai5z56Uh
+zgdR4d+VP+Xg7laGWSbUgI8XH7TYLNhyFARNHCBaKJc/5KSQ0aEaL+Ef1z0TRh6P
+KGrZZN19e8yWrU6XCJbuMZQeYeQ2oSvd+RhVr0i6GzXQQLlx+Xz8qwQu2JaLUBnn
+LMv4ngBOaQQKM2Wahqgfg0Uim0EyDqz/XAN519TBIhkqkccMtEb5ArMmNyTg90zy
+w+2Vdp7CwmJ8yxkCIQ6aTxLSSaK8FAExliryHfjniJqgOGR1NlZoWtv1ZkN79MXv
+Hlr5btOfwfhxh++zbzQx
+=Aq7v
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild b/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
index 0e33b95670ed..862b6a62553b 100644
--- a/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.3-r200.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-libs/libsdl2/libsdl2-2.0.3-r200.ebuild,v 1.5 2014/12/26 17:51:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild,v 1.6 2015/01/29 17:42:14 mgorny Exp $
 
 # TODO: convert FusionSound #484250
 
@@ -16,7 +16,7 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm x86"
 
-IUSE="3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio +sound sse sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
+IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
 	alsa? ( sound )
 	fusionsound? ( sound )
@@ -92,11 +92,11 @@ multilib_src_configure() {
 		--enable-cpuinfo \
 		--enable-atomic \
 		--enable-assembly \
-		$(use_enable sse ssemath) \
-		$(use_enable mmx) \
-		$(use_enable 3dnow) \
-		$(use_enable sse) \
-		$(use_enable sse2) \
+		$(use_enable cpu_flags_x86_sse ssemath) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_3dnow 3dnow) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
 		$(use_enable altivec) \
 		$(use_enable oss) \
 		$(use_enable alsa) \
diff --git a/media-libs/libsoundtouch/ChangeLog b/media-libs/libsoundtouch/ChangeLog
index 8dfc6936a0b8..f36d85e63c70 100644
--- a/media-libs/libsoundtouch/ChangeLog
+++ b/media-libs/libsoundtouch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsoundtouch
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/ChangeLog,v 1.82 2014/12/10 08:42:24 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/ChangeLog,v 1.83 2015/01/29 17:45:38 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> libsoundtouch-1.7.1.ebuild,
+  libsoundtouch-1.8.0-r1.ebuild, libsoundtouch-1.8.0.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   10 Dec 2014; Jeroen Roovers <jer@gentoo.org> libsoundtouch-1.8.0-r1.ebuild:
   Stable for HPPA (bug #526018).
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index e4244139fca6..f003602cfff1 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -4,15 +4,27 @@ Hash: SHA256
 AUX libsoundtouch-1.7.0-flags.patch 651 SHA256 b180875611c8474f5642196cbd02588652ab2f06703aa9ff268c89f35ed5557f SHA512 10ce7ad86d442430af3c2bee3cc1358f98e54ebe205c1eb50c817fb687da21dbfe2db4499a8b623ff5d2d2bbbf04d4d7d9c4856399bcd3934ac7f8b6b8369b60 WHIRLPOOL 9798d8c1b23443dd3c09b537734875fd44ac0e88cfd51cec002f0ce5b8e94bfb6de67221c2520fde98513cee41f98f2a8a1a9d1df19d5c43b986c5df8b79f9be
 DIST soundtouch-1.7.1.tar.gz 101274 SHA256 385eafa438a9d31ddf84b8d2f713097a3f1fc93d7abdb2fc54c484b777ee0267 SHA512 92a9e2fb5e47f573771620f329e9193f559ff25ce21f16917479ff94e2aac1e3ebb79cb0fe1ae55d6505b40f694792e493b388470987fbe7a85505fd88e947cc WHIRLPOOL 0f36e93236747bbcdb3c4557791db55811c00f3171db2a386cbfb7d6f4a1657957f27378bbf22018931ce6c856d19da9db411fb8a190d46e4599db7ca6d9d0e1
 DIST soundtouch-1.8.0.tar.gz 106229 SHA256 3d4161d74ca25c5a98c69dbb8ea10fd2be409ba1a3a0bf81db407c4c261f166b SHA512 724e6ecc1727ee4c4f2503d183717dc1503ee2017b176677da6f0268e82254a7cca3ff9a27dbb9cab59e32d002797eec1b39d2b729f741e5f2ea77a147af4d39 WHIRLPOOL e4abc67aa23448a6ef8230794d1e6b9d3f4c33db1fc4fd7c784ab60953d6b79fd850b3cfbdb8ce983b238e7dc249ee96824160bb6e4683b17fd521a4b12b1b1c
-EBUILD libsoundtouch-1.7.1.ebuild 1241 SHA256 3ae37e4ee124534ebf74dbcbee338a2623ccd7d639099ec27b69ddc581a5cebb SHA512 75743121afa70a2183100633d08058fea611c4cc62703857555a705dcd485c5c4af2cc8f120974bc9f7368bdae36ea5f6a437b2ce6edff8bcf0b61e00179576f WHIRLPOOL ee6960ad3636306712028acc6d3ebe83640df02b3bb908c2d798e8bea8925f4f17174ae45fed75c7b73829ba2b0469e0bcc42de3cd0eabc9f88286161faf8330
-EBUILD libsoundtouch-1.8.0-r1.ebuild 1369 SHA256 ef40cecfaa135166bbe58dd3be8adca5a98860409798f7e0d9ff1208d82c1d8a SHA512 d49bc28f828c7f7f0690004360a3a5309f497c4e0571af18362dc3467de8ecbb702c75607ec0f175abfc9ca78c8d8b9a2b0ac82e39eeb647c01398de6e5528e0 WHIRLPOOL 5dcbd52f828be2f3cb4b4db550857593035e98e0a665410d62924e7def0221f42d2f850d23cd1e6e7b5e4bb2813ce61bfb47bf1dd2c93336e4305f06237d77a7
-EBUILD libsoundtouch-1.8.0.ebuild 1241 SHA256 2c1bb39d3918b8b09a4f4b386b3c5a1a3ce9d23891524c240dd8195038261e90 SHA512 3209a69e032da0b52bec41ed719466e645f8fa8ca3189089c0d4ec6e29e370d05c6e9ca0f55faf121220913608f451c9e9e5bcbce49bb51a91d0dec6e0814008 WHIRLPOOL 9798f01d2253ca922d81e09cbd42d3c1c6bdf597b3a3b06226c529571254fd095f19b411f5e4179e820964e19a1ce7781c0bfa438296d8ce6c476e46248ca83a
-MISC ChangeLog 11050 SHA256 8f255eef3674eeb667235b1af15da6f4f59669a21876cbc7aaa5e0b303f98d98 SHA512 cfd12c3888cd08710325a98c9dca1424683aa0880410cf4462a9a9c2d38e3d65e0bf9ba3c1e692f35a6426658044714e96c1474467db74b6b0382a3a5e2beb07 WHIRLPOOL 7b1e96c46f5320839063650319d5ecd551dd119bfd0d43a69562a9210d93a3bb5e154ff8a5fdc22ce9934f6dfd4fe6eea3d4ede66ecce9d5c3e5edd2bd9c528e
+EBUILD libsoundtouch-1.7.1.ebuild 1275 SHA256 5ca84b481bdfc456a114bcf38e4abbb818faaaa5fd833418809560cd08af1447 SHA512 869465478e2c23efbd13b825924690fe489b72c5f10c27851c23067b897cddbbc56dcf8f8f397ed3a51dfc47fe302638d7bb1a6ef835614d873df153fdafc8e0 WHIRLPOOL fd27be2c2404bb7aab2dd78f6eae5dd0770f1d6eddfc253a873a63044faf8352e08714f9ba7091cc823a7c3df281e5665b17b313176b941bbcc93d6ecb2a923e
+EBUILD libsoundtouch-1.8.0-r1.ebuild 1405 SHA256 b22834272fd975b235f0b3941b1c767392e58bb5a9bd1bccc06a57514cb548ca SHA512 cbe9be6558332275327337fcfe308767997d60cb707cb926505e442055cd4423ba0f6e6e53e8a29805721c9039ff675c09668bc1de12d00704e5836f976d6f4b WHIRLPOOL 8cc2af253e3cb3057ff47849f80fdace96fbc7aa0ad4f5407566444c5f9d55096938fc9fc9d17e45369376da6ac799c5d3d998ef78cdeaedeb07b3b3457c1c04
+EBUILD libsoundtouch-1.8.0.ebuild 1274 SHA256 77f435dd7c76d654be1a0e374969ffa2d25f7e91301e20d45a5f6423bd544005 SHA512 0b459e063fddad515123f833d29e010195aab373cab62760250a280fd9af51bb65203f5114025fc3e6fcb335bee386183a0af700e673a8e87cdd7faa15bbec4c WHIRLPOOL 32cbb637c3774952e31d8306615bee2d06b1f92e640109d1e18e227c9ab8f55ae62791a28d242ac55ec7997324e4c80954f4759f743b79be8ede966ceb2f547c
+MISC ChangeLog 11221 SHA256 2118023376fb88db89c9f25712710c814c3a2d60e79e7f1913dce8f5b6af0ea9 SHA512 5de0438a991dcc28b28011cd1d80aa550abd7ca4421e1089c955827ba09168989fd8ea6ac5ae49215adfd716fa47983a8ef88092dcaf10a3c66d030b8619fbd5 WHIRLPOOL dd45d22058270e8c651c7b5988fee7797158fa8b1a1208db15ed77d57636ac0bce33bd8f63d824844861080a35c12ded95ac01ceaf0bebf949b9c03dbbc8443f
 MISC metadata.xml 159 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369 SHA512 a77b80f2ab1799aab052edd575ad80daae01c717af7bd5bf3dcda15714b9afd2e9fd6553cc20b000bc3157915b7082641a92fda56de3a9b8362ae2488925e4b1 WHIRLPOOL 913c53cb00341537eff621357b1c5b8379bb63df52d18b88fdef0173cdfd7c60f6d1ece1d42b5d0fcda69ed73ab4138f4268c6394851b07a9411a8306fef9173
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSIB3EACgkQVWmRsqeSphNuyACeOR/RUi0mBFjg22JUChjPJAFR
-xAMAnAyOiaZhBrdGmDEDbXBe6HwxQJmS
-=b1vm
+iQJ8BAEBCABmBQJUynHEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOqF8P/RTOOQyq6IuHICmjnSe7fm5v
+rke+Dhzx4FgMTLYKj99Nn3PaSCEcgDmAsNNUi4NDAgkkCO1UDckqRJu24qaN/SE6
+JGX+E6Fa8gPDaaLSkZ0WvbuoKGRSZw9eUSshH0Qca/aLcIQdaGwZMwi71v3GSb08
+uD8rOPFj0idOn10AbIx2wjrjBhbUwo1tW5+qPtNhtn1/Hu1a7LR8ZclxEccnzwwl
+0nVj44Ya/GYKK/7Qg9aghfoZJAqfl5HCGq7hU/hTWRm9+Cva6RGysT8rx+9ayGfH
++kJsy+hZVbq6sCml6EXfOGLv+qNa7jbDyTrEZ1vgR06UApxeW9M2B1fpBsceAUvi
+ehBgD2I7tyinO4zK8yVUlhjaYr9jLEl0HHWmzkq+ZH4r4tq+FQ9v7bKT6OOvSEcO
+0yJEcd6mtQBjkw8XrDWNyhAJSY5mbVwkVdC/WBtazX3Bmf/9acFyEZC1u3ScCpWz
+qJPHEyuBx2q179aHVeFRk+RvroQA6TGwf7IbAiBFHwIYCS3PbOm3LCiZmrUyJq0f
+H6moFfpg7FCWpHgzLOFcaPV6qh46n5X771/iQLKR2piYAHRGLcteD0snpZfAPaY0
+8zy6kEfIWvgDtWd9pfE/TIwf/F4TW48eGRN2MSpj7vvFZF1TVG15k+vHefTbuvNu
+w/fxKPxxEsJrc2RkIR1T
+=gPr8
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsoundtouch/libsoundtouch-1.7.1.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.7.1.ebuild
index 05a6e42c10eb..678c769ffa7f 100644
--- a/media-libs/libsoundtouch/libsoundtouch-1.7.1.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-1.7.1.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-libs/libsoundtouch/libsoundtouch-1.7.1.ebuild,v 1.9 2014/08/10 21:10:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/libsoundtouch-1.7.1.ebuild,v 1.10 2015/01/29 17:45:38 mgorny Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic
@@ -14,7 +14,7 @@ SRC_URI="http://www.surina.net/soundtouch/${P/lib}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="sse2 static-libs"
+IUSE="cpu_flags_x86_sse2 static-libs"
 
 DEPEND="virtual/pkgconfig"
 
@@ -31,7 +31,7 @@ src_configure() {
 	econf \
 		--enable-shared \
 		--disable-integer-samples \
-		--enable-x86-optimizations=$(usex sse2) \
+		--enable-x86-optimizations=$(usex cpu_flags_x86_sse2 sse2) \
 		$(use_enable static-libs static)
 }
 
diff --git a/media-libs/libsoundtouch/libsoundtouch-1.8.0-r1.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.8.0-r1.ebuild
index 2aa70a3811a3..f539b26d8673 100644
--- a/media-libs/libsoundtouch/libsoundtouch-1.8.0-r1.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-1.8.0-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-libs/libsoundtouch/libsoundtouch-1.8.0-r1.ebuild,v 1.4 2014/12/10 08:42:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/libsoundtouch-1.8.0-r1.ebuild,v 1.5 2015/01/29 17:45:38 mgorny Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic multilib-minimal
@@ -14,7 +14,7 @@ SRC_URI="http://www.surina.net/soundtouch/${P/lib}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="sse2 static-libs"
+IUSE="cpu_flags_x86_sse2 static-libs"
 
 DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
 
@@ -32,7 +32,7 @@ multilib_src_configure() {
 	econf \
 		--enable-shared \
 		--disable-integer-samples \
-		--enable-x86-optimizations=$(usex sse2) \
+		--enable-x86-optimizations=$(usex cpu_flags_x86_sse2 sse2) \
 		$(use_enable static-libs static)
 }
 
diff --git a/media-libs/libsoundtouch/libsoundtouch-1.8.0.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.8.0.ebuild
index a7346b5df748..72d32a83150c 100644
--- a/media-libs/libsoundtouch/libsoundtouch-1.8.0.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-1.8.0.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-libs/libsoundtouch/libsoundtouch-1.8.0.ebuild,v 1.7 2014/08/10 21:10:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/libsoundtouch-1.8.0.ebuild,v 1.8 2015/01/29 17:45:38 mgorny Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic
@@ -14,7 +14,7 @@ SRC_URI="http://www.surina.net/soundtouch/${P/lib}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="sse2 static-libs"
+IUSE="cpu_flags_x86_sse2 static-libs"
 
 DEPEND="virtual/pkgconfig"
 
@@ -31,7 +31,7 @@ src_configure() {
 	econf \
 		--enable-shared \
 		--disable-integer-samples \
-		--enable-x86-optimizations=$(usex sse2) \
+		--enable-x86-optimizations=$(usex cpu_flags_x86_sse2 sse2) \
 		$(use_enable static-libs static)
 }