Switch to CPU_FLAGS_X86.

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

26 files changed, 217 insertions, 155 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index a0d595507522..de009b646da8 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/audacious
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.299 2014/11/07 23:37:15 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.300 2015/01/29 18:52:25 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> audacious-2.4.4.ebuild,
+  audacious-2.5.4.ebuild:
+  Switch to CPU_FLAGS_X86.
 
 *audacious-2.4.4 (07 Nov 2014)
 
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 64fb48a1b514..0b76db0dc6c7 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -16,8 +16,8 @@ DIST audacious-3.3.4.tar.bz2 473345 SHA256 671cdbf9b6b722b4ff4f43bcf85da0bdd1dfd
 DIST audacious-3.4.1.tar.bz2 474755 SHA256 57ed4d8378b1e753e266a82424c3ae595b6c0e88fc3e32957720cd6cc14ac971 SHA512 2a9e203544861a0b902b720823202ef1038927932826847dc9b9a9c321dbecc19e2187afbdeb62a22ee8e6348c7df609ad671c8c63da2abc003a37556df20ac3 WHIRLPOOL 4b8facfb9fb3187286a59f5ddbba4ec784a3fd42e2fcadf322ee27cd8d1ae08ee3d5e23cb5c56875d3d3a879c1dd7ba21407cf19ef400693b8ab7a0adc176087
 DIST audacious-3.5.1.tar.bz2 446632 SHA256 df380e1ade112c703f57bc3883c71a1025e8d77091a772b86c0f9072efa69507 SHA512 b9ae3e0647b2fe76856a79d014db53ccdbce9524b62522c626032cf4a8d67b3828c280dade79a0327f4f279ece39d6aa600405a018aea0a11707c1903f479fad WHIRLPOOL 9f3a0c4f894aeb7a7274cfbfa181f25c6e4fedfd302c6b79c1a2fac47195ff73250229477278da704240a1259f9592966a0b07afaede41c5f424fd1afad61a0a
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05 WHIRLPOOL b7a4409629a860021477f34f8886c40c005ea2ec34373d80e6a696323866e54f361e38c76b1ac536775ae5912308f11416e613dec791f21473f01a2fad35bcfd
-EBUILD audacious-2.4.4.ebuild 1753 SHA256 9d54bd5f1bfe1ee960b7d058f47aefd2e01ffeceb3207ccfec445a4dff1be328 SHA512 c3ab71480af58cfc89ac082ccf19c9433da2681d7ea43061863975861ce18d2541ba47cdf90ac6d950b8dde1a70055335a55d1e8171702a5a7de5e3d12ecc6e8 WHIRLPOOL 9b8df6e4670859f8f3b3536dfaae7dedda77e8858ba21726c993ede25c5bd7f7d42e16de583ad524a509d3daee124f876cafb6e073523ab83702da4dc0c0e302
-EBUILD audacious-2.5.4.ebuild 1749 SHA256 e0291c2b3ebc6d8b8b0a4918382ab25f1228bf047e71101d097ce5848b69a64d SHA512 2569fd55342bb62c013f75b5ff40fd6612b066f481cc39b21985ea215752110c9443b6599459b264538ef4ee25f65e16a87bd2affa896844c09bdaa6217adce5 WHIRLPOOL b2953cdbd5ddc6e8413ecf9fd97693fdc8115981d214bb29af106511d55549043715541ef875c578ba46e7ffb80160d80fa8444321664cc5c3874a97506c853c
+EBUILD audacious-2.4.4.ebuild 1783 SHA256 54f6b706cb95cd563d72856ed54c9bd76fa886b0ba057878e136c6b51d977bfa SHA512 b257737bd89039226f759da638b64c2aff87faaff610bf83f6bd4f8fc5e00fa453e854508e2c062e323b105b1c8674ed69a7552ac63bb649d4f4203318c93d43 WHIRLPOOL fd2ff1b77363349535e3e40ed1612c64f9e6f12956adfe5c3f56bf944ac3c040415494423c5372470dedf1c0e478d3224a922f2e3c28ed752680e9309f755c85
+EBUILD audacious-2.5.4.ebuild 1782 SHA256 5f3ed2c900c0d2df5aae203a268c4b9421b792be0b16dc2382fcafbd48e1354d SHA512 a89a6c0ea3dd05fbf85cc479a491511024ab6d6372d29465756619e39962c9c89dd8db1cce39a72044a2de3998d14224867d66332d26e06580bd23d5660dd8fe WHIRLPOOL 50f9e508e1701ed93ceac3d826d1dc19fc7dd2393b12c4b3917514b1f6f6a0ab574cf45c21bf521bf3c337c7961d9e3f25253c975f42232b3d433163d4740428
 EBUILD audacious-3.1.1.ebuild 1909 SHA256 a62663ba95888ac6cad2fd3818db4c5323e1254dd0976945b3f30586196bc3bd SHA512 53288d581a017b370805da5964327d18b7d3cd9e36b3a6a0cc2572c7468592bfc6143542d99d1149a2bf5effb5812d1095de9aaa344012a52af7bfb875ee6b5e WHIRLPOOL 22403027b4bdc36d3036ca4d13bf4f7f0b84890c151bed664439c4582925f3fc7d54afff51e7e3379504a6026139ce2814b687eba093c81786b2d5fba9ed5321
 EBUILD audacious-3.1.ebuild 1893 SHA256 c862886099cb850aa8dedc22ecd42883eb4f9be4bf68bb99e5a34a126725f4da SHA512 422ffc21082975c084e530fefc422762b581163a521121cc08e73056ea98388e143b355b79081146f8b4027c63864511a008eb08a6e8fef625b52c002deb48c8 WHIRLPOOL 878c314f93e19a9cdd3cb4b114d7cfa3437a33b07f2d293a8cb893e66526412844c7f0a60e15258eb9fe9077208d6410ac75c6e6ae4173a800face2f5a5eee1a
 EBUILD audacious-3.2.2-r1.ebuild 1903 SHA256 808ed8914c4324ead3a9c4134945f2b014eab4a434986d718cb53cac66b71246 SHA512 1938081cc1b6bf6d419437be6f73f0b4886841f533d179c33c71de23f3402fe5bf60dc63151226246518f096e16d1d24cc562ef47d9a76c9a23a022420c97327 WHIRLPOOL b3afd0db2b5045198b669848aede211072e36a441d318728ea7ba41efeab23539e9f082afdf8f93e679af53b754261d8a3b0c07ae38a5cac9d4ac6d74c67c8bf
@@ -27,24 +27,24 @@ EBUILD audacious-3.3.3.ebuild 1561 SHA256 7125be643c7b5b98e61f32379934dfbc5226d9
 EBUILD audacious-3.3.4.ebuild 1559 SHA256 7062ac3079481a4be45a9acd6ba0daa0ee448f1576c5b8e54be803d0a9afbab5 SHA512 22e9fd0a7b777201b50b32dfd9c95b08590fdba716d85be573f59d6f16f4cd23d14c13bcbf849b7f376e90b8abfef08a4e8d005ddeb4803435d5280fd57c6ba9 WHIRLPOOL c48b4b0c611df6fbbfc1e42e4f0a7aac45551f4931170f2892fd6172e0dc650d303de12463d3bd48b83ed6f7e023e7c3a08400b1794b26d04950d55d314db8c8
 EBUILD audacious-3.4.1.ebuild 1554 SHA256 c6ec140fcf2f985b7de167d1860631cf8585dd463bca35648c1c0dedb6063899 SHA512 918ffe34657116ed71f611723e3db46e1c16b8e2b289f9cfb5ac91a21fbb71af343e17a68d6eb60acafcc566e9ce85bee152e7a8b1ab2af1a41e35c0ed506417 WHIRLPOOL dbb026ad4ad6eb1276fc3c378149885e003da70a5251e1f3925d68de77ca8fa27aad21dcdc1b84083c59add5498401a2449f61da95950bfe1f00f47ccf596545
 EBUILD audacious-3.5.1.ebuild 1566 SHA256 0e5cb5199e6f8b00d88467c5b0173fb6fab30b0db1cbe5da0aed389b05e288bc SHA512 454c75ad37c78f15fb5bfdc388383c5f07b23d11d13ce9c8adf836338828b980121103732112f677957121f7db7614f1139083356f7c678f7d2c280eea70ba04 WHIRLPOOL 85891ff167a4ff4e4534896ed605e2f122eaf259aeb19ecfa351c823e27bb8dae4709442e47e85f71c46f3df3f74c990aaab45d07380caa38b077f56d914fdc0
-MISC ChangeLog 51009 SHA256 06660643ae94857c84ee6b807a5c2bd32526cf5137fd162243faefad2d85b0f5 SHA512 2a9285bd29b42fb75957e828014add1d90399f19d38f29955bf2e301bb421a582945538c651f7fc371216a1756734f0e54e393c81a1c41e388ecbe8808771ce4 WHIRLPOOL 612f75cab2177fa8babd8ef15596881cb643b0a361bf9adb33186e32af6f14d70be139e1664a2682b5ea5864bbedcfb69e3a045dd0f158a1051a848cd960eab1
+MISC ChangeLog 51134 SHA256 1ce1b1843b4d9fc8f0233aa1d0bd715f45e3faddb4c0aa5489332727f28b8b77 SHA512 9fda4f63fc197168c42728524d067902890c723e1065010b66b16466df784e8a080436acb035de34a8b00bda472974304e7c93b4644bd77c0e9f72142ed7a409 WHIRLPOOL 7068bff144dda7bdcd4099eb00dc07a16c4aeba97500f8e45c048c1dfcc2af860f0344280e9a9682d194e5ee95df38c2012f7db18cb430c367302ac4ab6047e2
 MISC metadata.xml 469 SHA256 90d3b438aff3cc1e9edfba42465edabfcfc5beeb1271bb80cd39e119f34e5aea SHA512 8c2f78f58c7cad68dbcd64a63248fe78bbc2a6b6b6930039c30357a78693d78ebc72614e7c47f800ccee279cfac93060e53af48e824efcb2e2150e62209b7c70 WHIRLPOOL 9b5c6e4f5d1e1a6afaae570fffe0e6a11947d3ef87f973aa280be321918f5943e50b95444ee3cd55c48d9d70f68d40e08fcb0ae8ec998aa24ac33757fc16a5f2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUXVesXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcf5QQAKo8ujw+zX90FCYTbCD+PPta
-t8fw+LpYEEdiUayyi0KtFcWnVeE1aPdLlZIZDzfrfssxSS6t+N8kHRkjWaWq6DRu
-RBBA3ibxwE23cWmsRSeW+BoCPv9b7F6gJh9ERJPKXtgNOEImDZxSwYsZPQAtsP8f
-/68XI+6OkPcDtZ6rx2Q1OuXhSaTFxXa0S1Xkt2LWym4o9L1Eyl7NMuGX8CiqzNk3
-df6JzqDmNSZGvq5hVkHUbVHQPECGx19dX+EPIBkKYsSbiUo/22NdngQ+v23/DqUV
-KS0cXrQfMsdncQTFwIs7fXk/NFfW692ph1Hjj1rKY/c73NZS2dI8vT6iJmxfz139
-xd0tzw6QZw/kDsWCHzHXXvYPI7jcmBXZm4ysaTTs5GzxSQbErXR75qZTPLzAuaPr
-ZhlmlsGeLJgB0HsRw37q/+shx55p2VvrxwGFR3sJC569XTjkENNG1XCVZ3mkGHCp
-xrnHTgrXKi1x2Qsn6HiQSbMSLDwIvPuZ4KcKKthOle8AcCY4nRqq1+IDpe0vDf9g
-XRfmMl/7XamHkCqcUkXKtp/7KyOeCbn9P+s7VBgdgY5GgxVa55WxXJ+AzptRxtSA
-GzTsdgfrd0zHpYjR57HUcrsaoRtlEMaExWNAt4p0+1y9vLHDR082YRCfreflAXQv
-W6CocriRwN9rIgK+xpvg
-=ClvF
+iQJ8BAEBCABmBQJUyoFtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOTgUP/iBSlF4ymYotWYvQhA3SdW+A
+b1CxYX3lZfthOECvrrtx06cL/7XOi27IelikrzwVKpGEOhpM0FdYW6uVFUfLvt0t
+W7ukfCzM28KFIJ8oKldR4cS85kjI+/jjTHcrFW904rYUALr2va7Qe4+PB+4c8AK3
+mAXKAN/JOUg1FyVeKn7THfDWLmXgagdstRBJacdcnPyoNRN+bECHVrAE5z3OSS2J
+Azpx+y09xVeiAHr2slgokFUYzI9K/F2hElcLYfnwwsmArIAMCy02cRK34qGwznqG
+OA/kdAfvE3DsF3QNn/z5yWXGOHWVVHat3sW/uWhg9LpqGTXBUEd17SvNZvIHqnny
+L5q8JNlfRXFPc/tNlHSCM5N4ZuLbwBKoQNinAjHCM7KliMUdSkhr+9xu8e0htyqO
+8Vp42mCN3LHpYRx1V7eql/8uUsfkeWTBIKOqHF8e5px0hKZD7N9+3taj5mHjOd5T
+T5mKjw6SogoSZubbJuug5wk9Nke2Og+svDV51Z6Xq/jnOdU8DyMKOSwbEdZj5wHF
+5I6MxI6iyZuatNizpPzyzOFJ0InxMu+MwjIVKzppQV0Wf3/q/Ojf/J0/pnG6vIm9
+/IGcU85eUFqwggEfhX931jff2ruS/dFE8ulPyq01BuawrwFoCkJ4BSHgyODwIN5X
+uqd/1YnmJUbQDfDtr9Ld
+=xO4o
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-2.4.4.ebuild b/media-sound/audacious/audacious-2.4.4.ebuild
index 6390f23a08df..588a217e9ade 100644
--- a/media-sound/audacious/audacious-2.4.4.ebuild
+++ b/media-sound/audacious/audacious-2.4.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-sound/audacious/audacious-2.4.4.ebuild,v 1.12 2014/11/07 23:37:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-2.4.4.ebuild,v 1.13 2015/01/29 18:52:25 mgorny Exp $
 
 EAPI=1
 
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="altivec chardet nls session sse2"
+IUSE="altivec chardet nls session cpu_flags_x86_sse2"
 
 RDEPEND=">=dev-libs/dbus-glib-0.60
 	>=dev-libs/glib-2.16
@@ -44,7 +44,7 @@ src_compile() {
 		$(use_enable chardet) \
 		$(use_enable nls) \
 		$(use_enable session sm) \
-		$(use_enable sse2) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
 		|| die
 
 	emake || die "make failed"
diff --git a/media-sound/audacious/audacious-2.5.4.ebuild b/media-sound/audacious/audacious-2.5.4.ebuild
index 68e7acc557f2..3ad9a17863b7 100644
--- a/media-sound/audacious/audacious-2.5.4.ebuild
+++ b/media-sound/audacious/audacious-2.5.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-sound/audacious/audacious-2.5.4.ebuild,v 1.8 2013/01/06 20:53:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-2.5.4.ebuild,v 1.9 2015/01/29 18:52:25 mgorny Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="altivec chardet nls session sse2"
+IUSE="altivec chardet nls session cpu_flags_x86_sse2"
 
 RDEPEND=">=dev-libs/dbus-glib-0.60
 	>=dev-libs/glib-2.16
@@ -45,7 +45,7 @@ src_configure() {
 		$(use_enable chardet) \
 		$(use_enable nls) \
 		$(use_enable session sm) \
-		$(use_enable sse2)
+		$(use_enable cpu_flags_x86_sse2 sse2)
 }
 
 src_install() {
diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index 34a01155ead1..b132bfaa510c 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/jack-audio-connection-kit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.163 2014/11/02 18:02:05 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.164 2015/01/29 18:52:33 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org>
+  jack-audio-connection-kit-0.121.3-r1.ebuild,
+  jack-audio-connection-kit-0.121.3.ebuild,
+  jack-audio-connection-kit-0.124.1.ebuild:
+  Switch to CPU_FLAGS_X86.
 
 *jack-audio-connection-kit-0.124.1 (02 Nov 2014)
 
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 163a7a55686b..f6b63715b5ba 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -5,15 +5,27 @@ AUX jack-audio-connection-kit-freebsd.patch 496 SHA256 7834f5ec198f8e69e2ac119fc
 AUX jack-audio-connection-kit-sparc-cpuinfo.patch 659 SHA256 256d48109d32ce8af89042401508392fbb90c499d4cf8b056104dc1a47522fe5 SHA512 c5964413c99fb1dd20dfe52dd40f857dab1cef123b26f74500e2f5607eda870b563595d39c4e4e0684428971e7295c847253d045b2d9ba0183f358630cfa9888 WHIRLPOOL 01d88bfce0394628fab10c48a4b80f0a025b741c5785f05bd22658fd95594e472439f569a450043cf7cc53700149d0d8b785bb7adc74711474fd3f6bcbc6d66f
 DIST jack-audio-connection-kit-0.121.3.tar.gz 1083545 SHA256 b7095d3deabeecd19772b37241e89c6c79de6afd6c031ba7567513cfe51beafa SHA512 57323393d5209baefe73cc0cd9a0e818b1cfd260cf9aa36cd6ad800252e22e3ddb7fc46649c54b8e840696878147c2d06c8d39fd7300b5bb92aeb69f44ed710f WHIRLPOOL a256cfb7c3546cb06d6003313802b02812d8da9c13671be9b0341a10442cd348a8b3f7fe65e8d27cc47b4e29ded799fa6cc0efa51d81d01f342c7c8eefbc9c55
 DIST jack-audio-connection-kit-0.124.1.tar.gz 1113456 SHA256 eb42df6065576f08feeeb60cb9355dce4eb53874534ad71534d7aa31bae561d6 SHA512 9c885da516f2ca246edba94db26c851229d063f1557ea91ec76ca57d675a510d16cc4baad5adb316cf46aaaa8b8d7579b484a53b9a803b34fc9bb34c983a8fe2 WHIRLPOOL 41232400d99a72b29a75f4d781c373a7f453c704a52b0a669cab71296574881b0a99b21b86628d02db8c3d7a64bec6a259ae1ba0a4c721867e19283139cee824
-EBUILD jack-audio-connection-kit-0.121.3-r1.ebuild 2444 SHA256 20fd45e7c6736e5ade5c088927a3fdd3618d59144c5a9bf837602ac69e884b15 SHA512 c959085b7b463ad9adbf509fa8aedb67dbb7f934947c134d21b33b090fb5c27e00c573cce21a2b5d00251771ef797073f2c75fd4a0b24875ea33080e3b887789 WHIRLPOOL 9ee8a416f131da46517e9329a768f4a7e3e406ff3b889ceffb6742e9e3830f5a037ead50100353c6d696552adb282d343fc73fb00c8d01f1d51b3b9dd29caeb4
-EBUILD jack-audio-connection-kit-0.121.3.ebuild 1982 SHA256 1ed513a508d4605dc554c6c02756e78658446e2263782b0e8e4d8ae66e8f1f6a SHA512 d9eb6a3cc1f341842ebfbe0052f71fc3bac23da6cfbbf04b6da62cc66984b2d40dabd66a698162806d2357837933f64b95d8fa305b009909963283833963e6e7 WHIRLPOOL 6a8c50df585c7b198bcb19ac3a9000b4fe930beb9016c4d92184a1282cb4ca22f91c2080b71704aeebef9a9089b2f7e93e6a2bfd99e061ba1afb2d6c0642d497
-EBUILD jack-audio-connection-kit-0.124.1.ebuild 2417 SHA256 e774340fe5d0894dab96bc23b465accd4ea3f34c8c3b52455598110de4142f5e SHA512 0aa23ea70ca2193a2c7e52cb6bff265364e15edd69c6d517e77130a81db2d92f2eea8912099bc8dc2cae19affa679e6f718ff82ea48fff2f3557bef682fdd612 WHIRLPOOL 30efc863142696d2c7e09c1b6afc5f7cad4aa7f441c025862d5da3d006872e04b9284890ab08330da49ba2011e297b7622ce61957023c6da89de7e84518e01d1
-MISC ChangeLog 30503 SHA256 20e63b1ef6d6b9842efaa044bbf0de0541ac80afa24d65b513b8971986af364f SHA512 2b894394154f10f4b5666e0c361df15e1d48b8ef231ffc63f5fc5670f21d4e2b2d21358d115707eaf490b66ab0e1c2584afe05bdb7fca382faad8ac319b5af40 WHIRLPOOL 2baced2ee272a2b1ab3ad2b339533435eed260a8c3475b38ac5b1de39cb868959e80f7db1b39f8d4f2e03f16da828f20586d4d44ce49e346a53d43d9d70012d3
+EBUILD jack-audio-connection-kit-0.121.3-r1.ebuild 2567 SHA256 c8b427c29d34c31c36b83d49808b6f1e79aea8094b4ba2c8ecaa71f3ba0fef32 SHA512 fdc9951763a01b78358a89eba6ef3342731f274dfa9035b1d34808807f99d9b45b1432162c98b9e0c5836951f849e82ed8972d79aada6c782dc8bfb3c6196a35 WHIRLPOOL 06cafada6b49f266bc2e1d14b38aa7dac934b88db57b4a4aa739cab22e5136c9785b0069a4a334f7f348f5442a494f4f776fc94d38afcd731f2c6d9bf6b386b8
+EBUILD jack-audio-connection-kit-0.121.3.ebuild 2100 SHA256 5ff115357721bbd353c6a7aeb94bb8959aac8f70c1866ef540fa0db980da4223 SHA512 4f1bc69296b7adf57151e6f4c41b0fc431d7bc635f42ebc596417b7ca86e3f052d1c000c7287c106181768102cfb44c210e5fc9a30cd8641a9cadc339e7c5e0d WHIRLPOOL 1c3ea8158342194467bdb030ef933c127625765372bffabec5c0a948fd5d700fad06332a4c7e628df8f2065fde9c55ffe49104f93c3efbef6085ca4d4757d292
+EBUILD jack-audio-connection-kit-0.124.1.ebuild 2489 SHA256 e5b7302813371da5cfe809574b0c568a3ec4eee88a2283c077655345940be5a1 SHA512 f0167fe397c37332d7fd996e79655df08c82aaa8ee67630d178fdcea91b564f81bf71085740dedcb56749dd8da669af9e20da22a0a0240f7814438d811df9dba WHIRLPOOL 2c0e2a91387c90ce1598db7c228979f2610d94b69eac29c5b75558d483f20ca549ca4e0336da976f0857afc4297aef993b13451a32c0c6e07a436a989614460a
+MISC ChangeLog 30714 SHA256 feb4229eb1b9de790547a7fd72121e8ff71e12ee722451130d3e96cd854db714 SHA512 0c8378ff7df29e910754b93b49a76b52535be8e42847e32fb93ec78af8cfda0aa2a30ecae920abbbe08c63c56784cda833c10fd59cee5109f7c3cc3bf0796750 WHIRLPOOL 5e2ea30efceea3d6dd56d26bda755f5ae1e9a6f334e7ca0bb077e5c7c07a99a62322524ba313b8b8c01cdd5d507b3338a44bf0344e57371354b82cf557eac378
 MISC metadata.xml 422 SHA256 5a942b307034ee9603ae709e346c2d3ebabcfb79644ec0fbd2b61ca443a3f041 SHA512 c24ed7fae069cd355ba4e6fac0936c86b9712969d9d6861b35ceedea59216c1dc1015adc36b369680bc98a0bdce98b24d3d17707e3968d0beea8364a6deb5319 WHIRLPOOL 59fd0d8275a0d48ba56f91e783311ee4c445bb4d6cc69f099f7c7ff34f811daf5879845e0207b80e78560bb5404b40e9a29d05ae03b4b03c7770a477518bc02d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRWcZ4ACgkQvFcC4BYPU0pIcwCaAyXyaFGYcO7qKuYYzGSk26DH
-9hYAn2ZzqMUu1Jc0z8svi01PGY5fUlPr
-=wc6D
+iQJ8BAEBCABmBQJUyoFzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOptcP/1lZ4pdkjRKtHBtd9D/N7+66
++6MWA13+RyQQUNxtH+I7W+hyzWrK1mrTGpjyWEahyN3cuhjRo5tprV7vm51qkas7
+iZ981gG6vG+EOLax6+ZRwZznyeH6MJ2ejTjk75iv89K3frf0GPXc/bYQnoqIvy+0
+lYzCGKfJnoC82xOkkn4HxRQ8Z2OzXz0Qg68fJauMt7kHWaYrktXDA9hi3LfyXA2x
+qM1m+SMj/Tqx2VUXUyyiq/KyC6AKYIsT72gpyUN7/H3LdGxOKo381tY6hF3LGCQy
+Y3kdxdt2J0xSw/2nuSYddBUZUKwkBpPkUdSKS3YmiHN0Rcq2KzOWy1WuZYy0x8S/
+rI4zeajVm8sYyRKW8Ly+tE483rIC0Hd56nv54IubqmlAFfwm49hfK7KaxgFckDE8
+0Tb41BHLgqVp57fCzxfS9kBWxRHpuUNkIkliRfjCOO/HoxFPB/WEwzQ7jfb69mdL
+hZLrGBX1vFsqbB/HRuvytY/B59oP2gaaYf1tNCcboihuyx8RVOXHgxzu6px3XuRC
+UrkwwZiqyzxkdpz3uDoQkLgGRO/X+B1Qs55LJYVZ4xe61Jyu5AlMMcJI25rZZbez
+sk6A3rO09W20Nrah1Ia7vX0zjculqvJiuy+3tcw4tBcDqMqiN1ygQeFs8NEOrIMC
+HNUrQIG8BeC6CwMcI2Lf
+=bvHf
 -----END PGP SIGNATURE-----
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
index 973c80429dd0..54711f7d6bfd 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-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-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild,v 1.12 2014/08/23 15:33:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild,v 1.13 2015/01/29 18:52:33 mgorny Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd"
-IUSE="3dnow altivec alsa coreaudio doc debug examples mmx oss sse cpudetection pam"
+IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples cpu_flags_x86_mmx oss cpu_flags_x86_sse cpudetection pam"
 
 # readline: only used for jack_transport -> useless for non native ABIs
 # libsndfile: ditto for jackrec
@@ -43,7 +43,7 @@ multilib_src_configure() {
 	local myconf=""
 
 	# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
-	if use cpudetection && use 3dnow && use mmx && use sse ; then
+	if use cpudetection && use cpu_flags_x86_3dnow && use cpu_flags_x86_mmx && use cpu_flags_x86_sse ; then
 		einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
 		myconf="${myconf} --enable-dynsimd"
 		append-flags -mmmx -msse -m3dnow -O2
@@ -56,10 +56,10 @@ multilib_src_configure() {
 		$(use_enable alsa) \
 		$(use_enable coreaudio) \
 		$(use_enable debug) \
-		$(use_enable mmx) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
 		$(use_enable oss) \
 		--disable-portaudio \
-		$(use_enable sse) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		--with-html-dir=/usr/share/doc/${PF} \
 		--disable-dependency-tracking \
 		--libdir=/usr/$(get_libdir) \
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild
index 245fbed38ed1..42c4d43b3a1e 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.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-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild,v 1.16 2013/05/13 03:40:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild,v 1.17 2015/01/29 18:52:33 mgorny Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd"
-IUSE="3dnow altivec alsa coreaudio doc debug examples mmx oss sse cpudetection pam"
+IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples cpu_flags_x86_mmx oss cpu_flags_x86_sse cpudetection pam"
 
 RDEPEND=">=media-libs/libsndfile-1.0.0
 	sys-libs/ncurses
@@ -36,7 +36,7 @@ src_configure() {
 	local myconf=""
 
 	# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
-	if use cpudetection && use 3dnow && use mmx && use sse ; then
+	if use cpudetection && use cpu_flags_x86_3dnow && use cpu_flags_x86_mmx && use cpu_flags_x86_sse ; then
 		einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
 		myconf="${myconf} --enable-dynsimd"
 		append-flags -mmmx -msse -m3dnow -O2
@@ -49,10 +49,10 @@ src_configure() {
 		$(use_enable alsa) \
 		$(use_enable coreaudio) \
 		$(use_enable debug) \
-		$(use_enable mmx) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
 		$(use_enable oss) \
 		--disable-portaudio \
-		$(use_enable sse) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		--with-html-dir=/usr/share/doc/${PF} \
 		--disable-dependency-tracking \
 		--libdir=/usr/$(get_libdir) \
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild
index fea3c3d1758b..475629a5eb9e 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.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-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild,v 1.1 2014/11/02 18:02:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild,v 1.2 2015/01/29 18:52:33 mgorny Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="3dnow altivec alsa coreaudio doc debug examples oss sse cpudetection pam"
+IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse cpudetection pam"
 
 # readline: only used for jack_transport -> useless for non native ABIs
 # libsndfile: ditto for jackrec
@@ -43,7 +43,7 @@ multilib_src_configure() {
 	local myconf=""
 
 	# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
-	if use cpudetection && use 3dnow && use sse ; then
+	if use cpudetection && use cpu_flags_x86_3dnow && use cpu_flags_x86_sse ; then
 		einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
 		myconf="${myconf} --enable-dynsimd"
 		append-flags -mmmx -msse -m3dnow -O2
@@ -58,7 +58,7 @@ multilib_src_configure() {
 		$(use_enable debug) \
 		$(use_enable oss) \
 		--disable-portaudio \
-		$(use_enable sse) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		--with-html-dir=/usr/share/doc/${PF} \
 		--disable-dependency-tracking \
 		--libdir=/usr/$(get_libdir) \
diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index 002efb2cad3a..413195d68a4c 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/lame
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.175 2014/08/10 09:30:20 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.176 2015/01/29 18:54:46 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> lame-3.99.3.ebuild,
+  lame-3.99.5-r1.ebuild, lame-3.99.5.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   10 Aug 2014; Agostino Sarubbo <ago@gentoo.org> lame-3.99.5-r1.ebuild:
   Stable for sparc, wrt bug #515234
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index e1a531182160..2f4c85382a35 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -7,25 +7,27 @@ AUX lame-3.99.5-tinfo.patch 764 SHA256 559e6635c7fd2d45b499e20713c7764a7b53076f6
 DIST lame-3.99.3.tar.gz 1443843 SHA256 d4ea3c8d00d2cc09338425a25dbfeb4d587942cb3c83a677c09aeb1e850c74cf SHA512 13f01790b4ceb15824e3267955e15b91994c6350f7a59188ca331c24b29b4613953860b6193bebc6a1d7c6a71072d92604c1c0d09b443952ebed1d3229d09955 WHIRLPOOL b27782ed141b1c2a8730e44bfb15f57e68ba4c9522c0ca8d716910ffaccc8070b4c4efc091ea17e0babab409b52a8927b0a8163b4273e2ac3424171aac9a4a7c
 DIST lame-3.99.5-automake-2.12.patch.gz 536 SHA256 49833b952d846405fdcc8d87de55f60dda5fb2268e1b36861c53dfd39dbd275d SHA512 9d6211e257d573ced5c29c43ba5d5cc98a231b213d6e0cfc352b14776c06c9e656ed1873d5caae466afb27dfe753eeac0842c7221a8538ccecea8f4ba0f8bfe2 WHIRLPOOL 506e505cbf8659c3f67084565fc581e4dee3ba2016db3d835e3e63d9eca0d4383443e7596229f51b349c1f8c53ef42a581761d27778de4c1e5b698c85418b401
 DIST lame-3.99.5.tar.gz 1445348 SHA256 24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff SHA512 ce62d7eb9fc8c53c343374ded30f11153a296910f0be7e649197bca7412c6660aad1aa6143d56b750f866229eb492cf7bb4f682535c383fb4aa57d7077d8b4d8 WHIRLPOOL c238107bfb824c67c639875547e24b64ceeeb22125800af753ca42de129138f480574a6cfe132bc2c9cffeb39e54b6d57059be69cb41bdc164cdbf29bd95afe9
-EBUILD lame-3.99.3.ebuild 1722 SHA256 7065837133d8453b32126a927cbd598a14a3f6697ae8087d9ee12ae191f02511 SHA512 60d490a007ed2d138b05d0839a8ee41054deec7bc39000aa7c4a7f50a7bb9a1bcec1b1ff0045e7682310a6ea86867168b6bd591e5ea29054934c6ad1f25a4fc2 WHIRLPOOL 6df45695c561b9f2c703e0083695ba4d5194c379a075b768b54a55ffb6e35ee86f933be3c1fba732312a94e7ab6c182c379ec63a1d7b6a95950ebbbf960533e4
-EBUILD lame-3.99.5-r1.ebuild 2348 SHA256 e421903aa6d6aee04b683a1b2605c3b0695082dc4e03edf39a76e76cf7f5abd4 SHA512 b674865f61106b8c285450c18e8b35e4c79fee0b61335f6099c4af64790afe715866837e794d554c20a032b97b8d83d22b07d19778d792c775bc0065faabd914 WHIRLPOOL 32f849242bec4e5dbe40bc5e895712e0cea92fac5df941b6c11cfd1179f3854da64c7baa7db2d8c4dc3b52d2dabf33b2350403cc514e8b5e853d4f33057a9855
-EBUILD lame-3.99.5.ebuild 1860 SHA256 4995394756b8b42f7d1dc7251cd627e9cb8e64c7269b403093f6d2a5f9979ebe SHA512 3fe16dff4c1ed6cbdf864ae05f0db677645e372e000a76602c1629aa3713b2ef5d607c0e4e01870b6660ce7f16f1c97c10505f6859b5a2a46133cf9727ccc1c8 WHIRLPOOL 9fc129539e8a49fb251e4f93ebdc8618b960ff39c5a32f739d4ad7e0c8b3397534435679428af7493c3fce4c2f3fc41b543264ea804f136768e7b080e335e98a
-MISC ChangeLog 23195 SHA256 d5eefbbb461612b5906e6dc7bb5c82d130b5ee2ca29b3cc79d0c5762ecd13a90 SHA512 edc767369c82d3458a3f437a0c963492c51ab1eec50e9aea30cbfbf6c93b5853b1c4f4d0306024eee3093a077ea96bb0199551d52ddde90633283a81ff8b68ed WHIRLPOOL babe066ac248ca14bcec926724710aede38d6473e618265a805be83e427f44880303a711f88d6cbc0785055eb3f6d7e3881e6e6b0a4aa03b85274365450cf86a
+EBUILD lame-3.99.3.ebuild 1778 SHA256 cf3f15efe2476238acf834a6c4bd8b36320450813e99114d84d211bf4d21784e SHA512 32e3e3bec68bf518a7c6621c5e7cff0202ddbdf536024735f943b3dacfceaeb83d4afd52a69b3c6704d7fd2562dc3248404c035e5baa653a546d48b1ecff38b8 WHIRLPOOL a11ee993e04e0acb710f831f2a2fa7c286ed052ec0ca89439bd862353c85802431375c33188de66f9566c63669991f10526335fe07f45fe9a42c75d2b71f60a3
+EBUILD lame-3.99.5-r1.ebuild 2407 SHA256 50add2799cb91d16f89dd53f35672be6d2ff25f84c67802b935d6dc265fe6e12 SHA512 da7c2ea49e7d153887829af62b6ca1468642315963d7c5c2e9118afa9440945ffc83079cb78e73e069295c620a58c65d9cb67d20e6abf7b19605a94de17523d1 WHIRLPOOL 11b952a696ac6744352c6cbc0b5d97a4ddc849a3cc3b5b0195299caa017b84e25595a103eba7a3a2ca66da543d73a0dad40a12067310a1e5f5d62387b57068ed
+EBUILD lame-3.99.5.ebuild 1913 SHA256 55e38c18651c417a0f22dc2aa63f04ade4b4adbc86527595a6dde8859722acd0 SHA512 fba1507937f221ad5dcdd8bbdff537221dffaaa394bbcb8e95605ee61edf9549c34c92360895770e4f4f803f7f8e035b6fa8a3942c59b39d71ebe89edf402379 WHIRLPOOL 582ad4d123ea0b93030394afb32fd8b7ced454bb948ac10017517d1b858890b40895e9c34fe4e3cf4cf33001215d7a398cd2ef742e9f7115291ee0459549b5ae
+MISC ChangeLog 23341 SHA256 d275b2762420a52827eaafcd4fea3c4c3ec52f32d0c06ec62aba48d408cf6817 SHA512 084b9e0d4ffc5eedcffe35239d1632232755f2f6604d9e6b12763f380eb06aa8886a5787143d3570f5846845a2cd91654ae2e20dfbd24faa11ca8738aaf9d931 WHIRLPOOL 951a28e8a998711e9c340f129b32ad75122bca2090d25e894d7c92cab90cca2b610baabb5ce708a755c7e6e15782c9e68bdb83df8ddeba5820c6e8729e4b75f1
 MISC metadata.xml 264 SHA256 69ff3c8176be87b9e058cf261280c392e026742616602914b8ee3e3b6eaa2280 SHA512 bf40a711085ca56a9a88c27f5b4387aa6dd5bf9315b9a09e795116e7bdddedcc1f390dfb125090df7525749821980ea61f3457af4b19895a8a09debc1ed8e5b0 WHIRLPOOL 24230bee523a72cc630e8c2d818befb38f54575b04e7dcf1a7501e23b939c8c06f84db2fc687771bc6e1994cc2059626a402bca3237f289aeb274ccccabbcd65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT5zutAAoJELp701BxlEWfT4EP/2AIGYPH3fJSNuCGpMDVUIAx
-jAKZcimd/6NQB3woZTcSzGKxq8JNVMGt7ZHe39COZ8HJX0zEBGFUXNU3qdVZxDmu
-RvpMd90Aa1yFfzN+qBzcvKTPu/R9HrGUZvesf/yq3jdk2BPHH3urLp5wavzzolno
-6jcFUg56OrSYvktj4h1pzfO0sSEY+l8CKfT0Cv+z4+YkEBI0vMe8EVBjjRYjVGkq
-9P3oWxIxqOpxEGUgi2anLIqsVrDMnaVMDr71D2KGrwfaBZlzyoBnO9/Bi7hsJoIk
-Ek01b80jx6D1AYVihsnCktrD9hmTg6Fi3EOyesQSGXavi7oznqT9j93GDJYCsLzA
-AL/C7LxomV7Mn++/i3M91kEN+7yRD0hyTZY9fbc67B6ropr7hZyHw6q9byFcbUbj
-RArG5+s22d93FG2kEypZWR0xpCAIa3WPpqd5/M7umY2JpGIvYc8G8WqTHBonN+Pw
-tFWzylht93+1i5OhovSQbafev3575zO1ZJKU6MhfSHIBjMSofRjCy6oB0h0tBzzZ
-xMk0OXykTyH0hVZg6z+w/T1C6rkOcqmAixsc82KmXzvCD8bHbXipZe8PUPwv7LSl
-KvOkVw/qAWJXpmYjI7sOKaVqSA8hX2oM1Xq2MjZ7q/COynX7uDnnQ9jfh9f6WTYB
-n1KpZPZXA8pYwsYHVo8E
-=tabj
+iQJ8BAEBCABmBQJUyoH3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOAI4QAKh/XBulqd/vqYxbYKLEDW4g
+fV3b5WTHHSdQ1ocR5xN1PG0mLZG9Qy7lDSXJEXNQRN8ylf+9e/EoWkM0ovERMk36
+IGP34SiNwkWaO11Gp3OWtW6ytSPuy9Iht1GovMdwlx4FDxRM5z6M4ejmAd1rE/qT
+O1aETBwG6+Iz3SlsINUa0S/mUIegG8P4jSIykgU2Wa8L5/8O6trY4a51laXPEs1m
+JhNDIZVmXhbG5fIw5HW8aRTtDAOWIoiURgNXs/KWDjhBz+WyBqddI17hXCy6/iE8
+1XgpPY/rVR7d774SC69pYKuwJN0SjlAPlcZaz1fGQ+bafAjjvFYXeRzSN6STIp6H
+hRt7YrriKux+n/CzmoRWN0sFPIso8576VPG8YHEVPFrnywJ1WDc0ZiG7K/JMidU0
+wMFCiXhtDULIit4MPbkZoo09bNrp2e68WNv+ElP9UhpdtAiwmcJM/dtwtpfsp5hW
+7kF0UtKaR91pn4KoxiclgTEv68hnMyR6vtvaJGlmxOmbKVfCksJR64NAqDNNDZB5
+vOW5hfiNHtR6lteZR/2b6A3L8FaeUfnSKkMlPxFZDI3E1oF6nuBc05grSO617Sql
+xt5EBJjRmw/iBYaMj6MEUnwx/FS0SuHnrnIcLIV0Y22aqthVcMcI9SmDOzHtkSJL
+maGSpso45jM9FZgIuBev
+=Dcsl
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lame/lame-3.99.3.ebuild b/media-sound/lame/lame-3.99.3.ebuild
index bbf0cd40fae7..fd36a6ca4da8 100644
--- a/media-sound/lame/lame-3.99.3.ebuild
+++ b/media-sound/lame/lame-3.99.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.99.3.ebuild,v 1.10 2012/05/05 08:39:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.99.3.ebuild,v 1.11 2015/01/29 18:54:46 mgorny Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -12,13 +12,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug mmx mp3rtp sndfile static-libs"
+IUSE="debug cpu_flags_x86_mmx mp3rtp sndfile static-libs"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	sndfile? ( >=media-libs/libsndfile-1.0.2 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	mmx? ( dev-lang/nasm )"
+	cpu_flags_x86_mmx? ( dev-lang/nasm )"
 
 src_prepare() {
 	epatch \
@@ -29,7 +29,7 @@ src_prepare() {
 
 	sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
 
-	use mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
+	use cpu_flags_x86_mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
 
 	AT_M4DIR=${S} eautoreconf
 	epunt_cxx #74498
@@ -37,7 +37,7 @@ src_prepare() {
 
 src_configure() {
 	local myconf
-	use mmx && myconf+="--enable-nasm" #361879
+	use cpu_flags_x86_mmx && myconf+="--enable-nasm" #361879
 	use sndfile && myconf+=" --with-fileio=sndfile"
 
 	econf \
diff --git a/media-sound/lame/lame-3.99.5-r1.ebuild b/media-sound/lame/lame-3.99.5-r1.ebuild
index a3e9d1228ee1..294555e57501 100644
--- a/media-sound/lame/lame-3.99.5-r1.ebuild
+++ b/media-sound/lame/lame-3.99.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-sound/lame/lame-3.99.5-r1.ebuild,v 1.12 2014/08/10 09:30:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.99.5-r1.ebuild,v 1.13 2015/01/29 18:54:46 mgorny Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug mmx mp3rtp sndfile static-libs"
+IUSE="debug cpu_flags_x86_mmx mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
 # libmp3lame for multilib and these deps apply to the lame frontend executable.
@@ -23,7 +23,7 @@ RDEPEND=">=sys-libs/ncurses-5.7-r7
 	abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	mmx? ( dev-lang/nasm )"
+	cpu_flags_x86_mmx? ( dev-lang/nasm )"
 
 src_prepare() {
 	epatch \
@@ -36,14 +36,14 @@ src_prepare() {
 
 	sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
 
-	use mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
+	use cpu_flags_x86_mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
 
 	AT_M4DIR=. eautoreconf
 }
 
 multilib_src_configure() {
 	local myconf
-	use mmx && myconf+="--enable-nasm" #361879
+	use cpu_flags_x86_mmx && myconf+="--enable-nasm" #361879
 
 	# Only build the frontend for the default ABI.
 	if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
diff --git a/media-sound/lame/lame-3.99.5.ebuild b/media-sound/lame/lame-3.99.5.ebuild
index 1d8baab9a1d2..8ef7467faf4e 100644
--- a/media-sound/lame/lame-3.99.5.ebuild
+++ b/media-sound/lame/lame-3.99.5.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-sound/lame/lame-3.99.5.ebuild,v 1.15 2013/03/03 15:08:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.99.5.ebuild,v 1.16 2015/01/29 18:54:46 mgorny Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -13,13 +13,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug mmx mp3rtp sndfile static-libs"
+IUSE="debug cpu_flags_x86_mmx mp3rtp sndfile static-libs"
 
 RDEPEND=">=sys-libs/ncurses-5.7-r7
 	sndfile? ( >=media-libs/libsndfile-1.0.2 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	mmx? ( dev-lang/nasm )"
+	cpu_flags_x86_mmx? ( dev-lang/nasm )"
 
 src_prepare() {
 	epatch \
@@ -32,14 +32,14 @@ src_prepare() {
 
 	sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
 
-	use mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
+	use cpu_flags_x86_mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
 
 	AT_M4DIR=. eautoreconf
 }
 
 src_configure() {
 	local myconf
-	use mmx && myconf+="--enable-nasm" #361879
+	use cpu_flags_x86_mmx && myconf+="--enable-nasm" #361879
 	use sndfile && myconf+=" --with-fileio=sndfile"
 
 	econf \
diff --git a/media-sound/mac/ChangeLog b/media-sound/mac/ChangeLog
index 3247640fcd9f..b9c6057c9e6c 100644
--- a/media-sound/mac/ChangeLog
+++ b/media-sound/mac/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/mac
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mac/ChangeLog,v 1.30 2014/06/10 19:48:42 billie Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mac/ChangeLog,v 1.31 2015/01/29 18:54:47 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> mac-3.99.4.5.7-r1.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   10 Jun 2014; Daniel Pielmeier <billie@gentoo.org> mac-3.99.4.5.7-r1.ebuild:
   Use prune_libtool_files from eutils.
@@ -100,4 +103,3 @@
   06 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> +mac-3.99.4.5.ebuild,
   +files/mac-3.99.4.5-gcc44.patch:
   Initial commit wrt #94477, thanks to Thomas Kuther and others.
-
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index 53c561f1f07a..befa0f524f26 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -2,13 +2,25 @@
 Hash: SHA256
 
 DIST mac-3.99-u4-b5-s7.tar.gz 450981 SHA256 9a735af2c56f05ee06b6e2ff719e902271299adf9e25cd3c9e4b28e8df3e30c5 SHA512 fa7ca8cec0ba6c0fb78dda6e964b17e9331184fed656a2458d0e3ac12fc375a661adfd36c142ef63111f31c6b63e8c00fe40e7babe84f0cefe5433940be628e0 WHIRLPOOL f4df5bccad06b7313348e9be734e926c1d511a2e3ca40162bc2c6a8cffb38c1455543fd7dc0a2352efa91945ae5546364085bd05888e906eb9e1c49fde7f743d
-EBUILD mac-3.99.4.5.7-r1.ebuild 1199 SHA256 87e8e5a80fad36d39afce7f1dbe89fecd7b09df2de91ba95af00fc66e7f4f84a SHA512 576de862f34a99ad67c49153da3e72e7a2d322d5d3545662628d44274a31a82e15f14e026c902a9b925d169cc4eff7366c336fbc1c1da7a40ceb068562733a7d WHIRLPOOL 8b203379dff87b6adaf10d82262b9d1ad9d5a2a4b283bb269b307d777b60cafb98c9abc0d43e544d34523dc8e9906fcb378210e3fac1163d31cc1a6b95f65693
-MISC ChangeLog 3669 SHA256 89e74e89993daa7acad41e28ded36e59a49dab526c9476470b32c3da1a055dcd SHA512 e8a453195f9b4a141685f7ff53f23c1d9694ffc1e2903d82274873a42f193a0b07e7ede921748ffc4ddef2f79f1997318a9b26c1cf3d9dd65c8892358721339a WHIRLPOOL f0fe72bc510652448c5211dc17f230d924ed66299101b4486c014af3bc1e502ee70a76f8f581647ef466f06c4ca5b12d6fd1ab65e9f8b086eb401fde7ccdbbbb
+EBUILD mac-3.99.4.5.7-r1.ebuild 1255 SHA256 18ba53c09983ec75c991e04656ea39f2003e18269773a30a9fa635243a9f2374 SHA512 1635c77bd599ea5aa30fe07e6fdb72089ebf4317246cc90810ceb38b72f7ab4a611d185c6fb0437232a4c3dff35e6879225cd4a9203d335110c4c75117d1ca14 WHIRLPOOL c73e6056aa933cea2048e62e50ae8bc5b8ddac4ed1be281480934de4f156eba2fc592e6431b91245318b602e31e655ccb2e7ce0bc7a8eacf85b9a1877b1d4054
+MISC ChangeLog 3772 SHA256 fd6090b0e38c8da52de9d4791dc06ecd2bba3ff59da1c951083e091cd78a2a75 SHA512 c149c600fc0c475049067d65c4cf943cd9de6b56e6111526c24553da09839bc11dc36ca26e32bae270ad8584cc0363daef3455217e84fa9f330f6bd8d589431d WHIRLPOOL 51860fdd909b424fbd2b4c9006966f90c5cef0f31a8fdfc1bfbcbc347e1504bd221d513210fe1bac90f20bf5c4011b4a4eec7dc3ed0a9374a9c0f0ca9dc6fa1e
 MISC metadata.xml 262 SHA256 71631c43ff95c55eed0c208ecd6ac838376db9c69993ad0040a2bf4874e08ba6 SHA512 73c96fe51e7ca0b2906e39d60e82aa82f6a21f968d25849f6e5f6f02009af55ccf19983fcf7aadd0b5fef3ee453fed446bac64a907a6284f3d33f13f2d199f75 WHIRLPOOL 388f1570c463e792e909b86c27daa05f89429f2c956e653284c35bac5b22823cdd8155370d9a5df3fb98ad9e633924cedcbbc814444c0ddffeb7bfc94566ecc1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOXYRsACgkQlcuUeyFa0U3pUACcD/S2odjucOz0GSi9eysczk6+
-zCwAn3ZjSpiAYBTik2Uq3sak32bVbAj8
-=alUi
+iQJ8BAEBCABmBQJUyoH4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOlnoP/iLvj02MB0BqJo3/Ikhp+58a
+2HsTgo8Gropvf/cYfKtLCwajTaHu4CvCSyDIDGPNXSjDSTEuN+DQqHQIRJRWf3gx
+DazKh+tgLmj3bpHDG3hwH1Vacfz81B5UX4XHF9WS9jG2CmIVILN0hwaP3SFEadE4
+8J8sHNKlcnqIa04nTsCb+pBEzTOFFONuE3qRZkHZxbkIVmSAcTNGIz0aZ8SssI99
+crDJBFoCubkt6EG06pm8XPqTu/qMB6Nir8IL+iMREWwHvRThmCNH2z9tWt8smzih
+W8cfru0m29JeWQVkdzZ6+F5sS/4223tcBXtTUi9OainloCC0BEpDHcaeMzF44oj3
+OBKEjltB1mlgWD86Y9B8ZiijLAZILZCVVAJKZnF9DCdwPV3PE1pTlKBIwRYyLS//
+UOu8ovIqzfMWHaMrXLsqBQkMi+g1JSLLzNk2hUKzekC7oZcihxGZeZ4vIG/AonjS
+b5zM8IF3r4yCsno+JGpj3q0pErxM8IvLqhsm5HoBUmkgUqDdFGKdJZ4Ne7LmmT1i
+o5p7+ok4+mSsABALNe51wOKSSLO3DibWfqJflmCdisaG7SVMyfZJNW3SRwslPP/i
+1xvqMObfK5NSLnAYRO81qHgQNV7Exwi1vaHRRECKzJ+lH04NgaP4cDl2T2M9HVci
+Lx1PjoA3U11cedc/ETkM
+=KjD7
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mac/mac-3.99.4.5.7-r1.ebuild b/media-sound/mac/mac-3.99.4.5.7-r1.ebuild
index 40d3e51cce51..0fe70a854870 100644
--- a/media-sound/mac/mac-3.99.4.5.7-r1.ebuild
+++ b/media-sound/mac/mac-3.99.4.5.7-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-sound/mac/mac-3.99.4.5.7-r1.ebuild,v 1.7 2014/06/10 19:48:42 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mac/mac-3.99.4.5.7-r1.ebuild,v 1.8 2015/01/29 18:54:47 mgorny Exp $
 
 EAPI=5
 
@@ -17,11 +17,11 @@ SRC_URI="http://etree.org/shnutils/shntool/support/formats/ape/unix/${MY_PV}-${P
 LICENSE="mac"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc x86"
-IUSE="mmx static-libs"
+IUSE="cpu_flags_x86_mmx static-libs"
 
 RDEPEND=""
 DEPEND="sys-apps/sed
-	mmx? ( dev-lang/yasm )"
+	cpu_flags_x86_mmx? ( dev-lang/yasm )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -33,13 +33,13 @@ src_prepare() {
 
 pkg_setup() {
 	append-cppflags -DSHNTOOL
-	use mmx && append-ldflags -Wl,-z,noexecstack
+	use cpu_flags_x86_mmx && append-ldflags -Wl,-z,noexecstack
 }
 
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
-		$(use_enable mmx assembly)
+		$(use_enable cpu_flags_x86_mmx assembly)
 }
 
 src_install() {
diff --git a/media-sound/qtractor/ChangeLog b/media-sound/qtractor/ChangeLog
index 6b4bd5e5c2e6..dd98eaf8c79a 100644
--- a/media-sound/qtractor/ChangeLog
+++ b/media-sound/qtractor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/qtractor
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/ChangeLog,v 1.60 2014/12/03 16:53:15 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/ChangeLog,v 1.61 2015/01/29 18:56:04 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> qtractor-0.6.3.ebuild,
+  qtractor-0.6.4.ebuild:
+  Switch to CPU_FLAGS_X86.
 
 *qtractor-0.6.4 (03 Dec 2014)
 
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index fa256941d3a8..0407e4fef459 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -3,14 +3,26 @@ Hash: SHA256
 
 DIST qtractor-0.6.3.tar.gz 1380485 SHA256 82e96718964c8dca8f7f2a08483e4500fa5c6e37110ae0d658df3db8076a55d3 SHA512 4615a10f6a223d20f2a8e7b1b2ac43285d96f47fadd6d4e9cbdc07d115e94651568ed942b8b5825a687d78bfe47b8f84b998ca6cfba0b8048b71b5f2913f2ff0 WHIRLPOOL 0f8a97caed1736b603b74513608e3e89c4a4f3237323c4e5f943ae9d1ee89aff2f4511d7536cccd400c8a784c5bcabe9f1d19f8fd8840ae6eecbec7f668c5176
 DIST qtractor-0.6.4.tar.gz 1377713 SHA256 e4f3c792b72e96a0d323b3b4bb1c849edab1363a70a9369369afe79a3a4bf5f1 SHA512 75e7a2bd831b3a5f70dfb21b16111ac61cc06d5832a49f13c16b8ae59079a950ca4242a1cdf3d0c082419fbfbc2f67dfeb9de8e68a604ec9f732934a16203a43 WHIRLPOOL 17ee3b9549089b2b2feb30984f054b3d70acc5eaccb1ae4dee04258693d26a87bdc814478f4f481eb179c3be2196dba78bb18bef778527bff802be1a1f1b04f6
-EBUILD qtractor-0.6.3.ebuild 1429 SHA256 e434675fb8280cd9992c92d477fad6d2b6b0b896428323daeb30b69f4f419dd2 SHA512 0236b9490b57d8e1512a472437048dbb55c23376eecc59033d4173126750b1c291f43bac44b3c3319e6ac2cd0cbbc71ada916068151da4e8b813848cfb2a91fa WHIRLPOOL f4e4e29e89ddcffbca29fa1e94022fbdd9a746f3ae73c46a7d0a952b8144871c405e18cf62f18c31c2ac5453d11163e0130117d809ecae8b0b976b1bfac288af
-EBUILD qtractor-0.6.4.ebuild 1429 SHA256 56e3fed889cc50e04c64f81c719b60a68fac3e57f45ecda6522b8bd1838df17d SHA512 d9c62e9ff15611127d4b164b204bd228fce070c139d2b30ddd999217cc24b73bc9b1bad83bbd4b16940c6f4576ab861f10f6400173e2223537cb070dcbf0894b WHIRLPOOL 0d01f0bf02e80d3ad310bd1f85ca174ada06e774373672624aa5934f6759b3dbb6290798cde422b714171ce27a1c7334194cd37d85f76048ae984d1a8514306e
-MISC ChangeLog 8641 SHA256 2923975b88d10c0d696228263d89f3a62160acb45a3187e304dbe603c27ef4d8 SHA512 f64d1e5b5c2359f08b2e5d825a9724f01049821954eed430dc6a4534c9cdc609cb82b9d303623befcd0e3af6487706a1758da7299fb2bbcc18f9e69f20037659 WHIRLPOOL 11d8620d95429e8e469f2ad170f1439456c9f1c182e1b2678affb99506e0d4c661ad7377a6922dc795fa64888c931f4252c6b59400abd0b1e3417e9e25d97ae9
+EBUILD qtractor-0.6.3.ebuild 1459 SHA256 0d2047934eec38e92fcae43b784be63f3c3832b7215d187e4f7e039b93a6c954 SHA512 d2da7fb61550914dbd098a58c1aa9cb0dae8bb3ea54a3523ad3c22184d17337cd01af9db171e671db0805460a8b0db7967f038cba57e271492576a40e25d34f8 WHIRLPOOL 9e394b67127ed20a266c26179c24e8e0fbb5f58d6f82b20d4cd91499facbfb06a76ccd985e64da378069a34fa80a6db3f31ff32a608e09de2d02220d62a344ec
+EBUILD qtractor-0.6.4.ebuild 1459 SHA256 ab7e0fe4ddcfd06484cab6186a60ff3b6de4a96961c6e60241851b8e4f2c56ad SHA512 0ebf8f81b587731502a6844ff0ddac8a5e0c6b51cef035aa3950e66b14d25c9a45c6aa4524668e9e019b336a3e53a66d42db18eb7bf2c3f15af9c44515ebe92b WHIRLPOOL 7daea0ed94f1b249844763e3d1eef53f15799e0aa7307ff1ea9398593d01570eeea166b3525d2027fc6a21513b1cd97001cad639ecc4bd39aac6a0085b6a80c8
+MISC ChangeLog 8765 SHA256 7557ed6829b4ec5db9ab8d304c5016e5f283094abb2e2ced19fc86d440354b07 SHA512 71a420a3b6fd014b4c6420ae2cf6aa184168dcbd79d080b42c4d3ca9efad7ee014f68f4b308270e3eaba6c987ce9f3413cb583317857fd056bd469fc6e3b0eb1 WHIRLPOOL 881bb83a12062d3f95faa3aa45dace0e083a913d54dcb261ebba61cfc2e0f7edec73137891c4be0b95be0a6716eb67357cf57fc13760dd13a66bce1d8c6dcce6
 MISC metadata.xml 374 SHA256 7a5f1a60b6ea09ac7331596bb1da9c53bdd13400bbba3d9491f8fa726c78b22c SHA512 ef9cf813a1ef381b966c16b71eb7aeb854c9af416df5ccd6d1684ffb309973cbc39ea4146ad87f2cd47beeadaaae0f7bd0ac6f5902a4fcb5f66abca3af158a38 WHIRLPOOL 9fe922bac4f89449dd702cf181510a57d435dcd2c6e61c4bcb6a22d8d99066eb82ca4542472594c323d924439ae8f9469c28615796d0f52df2a140cd80b424b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR/P/wACgkQvFcC4BYPU0pt8ACfSsQLqMW7LA2G2JHuy3jBVQ03
-XHUAnipt69zePDpAAllAZhn7++ZzzUXj
-=x2W9
+iQJ8BAEBCABmBQJUyoJFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO07cQAJbPpsanPWL1Pyb1heAew8mu
+HwvvRLrqOW6T9EIfx9btX36VAoOjH0LYg1wMXd1VrZpEGUfTrbR+VLgreLhENEFQ
+jksVsJf/XS4hlEQb/5LXPa6fV8HWhmF33x+K6apheNC1cOHUvq4UJsLIpT66NGG0
+NQoDwOfrcwxgW9/PpELBY//ZJnW6StKLuRaGbcj3ikapOZ3NVQGbJsSLPVq24tr9
+E6NQBOI1nHGenBohlj7d68BjMRGvFG6u3GlB1/J7Q0m27JiFNZMBYaUL2acRqauy
+DUL8T2Rw2dHLWFAOC02x37jSjHCqH3WOGKuNEvqWsnzS5kF39TnJVAJtuENf5B0Z
+rmHmBV75HKTQAAEwlsfdnJgUO2d520MfLpZaeUIBWQUyBwjAbpY6iq2LrG52tDcq
++vcu8e3AhL+OCGG/oDxHzViurutU6K4zTkLbckAZ7kGGZJwhcPjPAj+ufZpyxnrE
+DPa/gUeU0TGlSQG1onbofbQ1z6iSgyd4uJoIGT1WFulIZpZ0JHV+Pa5zlyqU20ig
+Dt0nnfsaS/Vxs1fY+gCGEMYk0nxVZtGQr86z55Iom9A3l8CvxOdwERmTEBmOWsbp
+ZYm5oFJr3AHjmcQi9Z3zlBZTfuYMPugYyjrM3O6rV6ph7E1ZEPNReonsz3MWxA5L
+p7PbQy1SXKwJas+RRZNV
+=nQ+r
 -----END PGP SIGNATURE-----
diff --git a/media-sound/qtractor/qtractor-0.6.3.ebuild b/media-sound/qtractor/qtractor-0.6.3.ebuild
index 4287469012f0..f5ab929cfe4c 100644
--- a/media-sound/qtractor/qtractor-0.6.3.ebuild
+++ b/media-sound/qtractor/qtractor-0.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-sound/qtractor/qtractor-0.6.3.ebuild,v 1.2 2014/12/03 16:49:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/qtractor-0.6.3.ebuild,v 1.3 2015/01/29 18:56:04 mgorny Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="debug dssi libsamplerate mad osc rubberband vorbis sse zlib"
+IUSE="debug dssi libsamplerate mad osc rubberband vorbis cpu_flags_x86_sse zlib"
 
 RDEPEND=">=dev-qt/qtcore-4.2:4
 	>=dev-qt/qtgui-4.7:4
@@ -47,7 +47,7 @@ src_configure() {
 		$(use_enable dssi) \
 		--enable-lilv \
 		$(use_enable rubberband librubberband) \
-		$(use_enable sse) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		$(use_enable zlib libz) \
 		$(use_enable debug)
 	eqmake4 qtractor.pro -o qtractor.mak
diff --git a/media-sound/qtractor/qtractor-0.6.4.ebuild b/media-sound/qtractor/qtractor-0.6.4.ebuild
index 4937b5d20bab..00154f9d8384 100644
--- a/media-sound/qtractor/qtractor-0.6.4.ebuild
+++ b/media-sound/qtractor/qtractor-0.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-sound/qtractor/qtractor-0.6.4.ebuild,v 1.1 2014/12/03 16:53:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/qtractor-0.6.4.ebuild,v 1.2 2015/01/29 18:56:04 mgorny Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="debug dssi libsamplerate mad osc rubberband vorbis sse zlib"
+IUSE="debug dssi libsamplerate mad osc rubberband vorbis cpu_flags_x86_sse zlib"
 
 RDEPEND=">=dev-qt/qtcore-4.2:4
 	>=dev-qt/qtgui-4.7:4
@@ -47,7 +47,7 @@ src_configure() {
 		$(use_enable dssi) \
 		--enable-lilv \
 		$(use_enable rubberband librubberband) \
-		$(use_enable sse) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		$(use_enable zlib libz) \
 		$(use_enable debug)
 	eqmake4 qtractor.pro -o qtractor.mak
diff --git a/media-sound/wavpack/ChangeLog b/media-sound/wavpack/ChangeLog
index 22bb25d7ce8c..714c8b02896e 100644
--- a/media-sound/wavpack/ChangeLog
+++ b/media-sound/wavpack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/wavpack
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/ChangeLog,v 1.87 2014/06/18 20:29:37 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/ChangeLog,v 1.88 2015/01/29 18:57:06 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> wavpack-4.60.1-r1.ebuild,
+  wavpack-4.60.1.ebuild, wavpack-4.70.0.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> wavpack-4.60.1-r1.ebuild,
   wavpack-4.70.0.ebuild:
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index fb2081bb01ba..271a04bc1dee 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -3,27 +3,27 @@ Hash: SHA256
 
 DIST wavpack-4.60.1.tar.bz2 394434 SHA256 175ee4f2effd6f51e6ec487956f41177256bf892c2e8e07de5d27ed4ee6888c5 SHA512 fae00bba5c6f9c487d5dd4cd4c08ab4ce2a255c12ba3a47614a7b896d7706999b8ebe70c77e9083e943f0fe05b5ddcef206fad1801ce7a21698d5350514ee814 WHIRLPOOL fae37e8c5882a8cdabe81e72ac272ce128056f0101beaad16020c127f466707819542a2c9da7934d43da0fbabf13586747e99443e823682feebde5e170b76e5b
 DIST wavpack-4.70.0.tar.bz2 411878 SHA256 2cade379b0aba99fbc4e442ccc6dac6c609f6212e46516a083e24c8c364430a4 SHA512 6a93e36b3bea5b410142416b4b0329c5f65031418cdd303d395ca2aaad2a1ab02987b9a329dec6d14fe9387a3d5978caaf6345056eece24c5ad0ae9273349449 WHIRLPOOL e9b34aad74e183814f710d038c30946dcf43c6472e25778507494c4c40f9adf166e8cda81916f670150876adcf34979bd88e40fc81ee2a7c036db1b3a285e69b
-EBUILD wavpack-4.60.1-r1.ebuild 941 SHA256 96091fb1729c1d91987bf6b8f92f5dbb3f9081e74f4c1563dc8bc2a7072cd4b4 SHA512 54c470b3497111dcb5160b5c503e1c67875eea433715bd15ea398425630ede91b2f13ac3a55d1a4506c5935f69aff58e53f01efb7351c204a9812d71348512bd WHIRLPOOL c4e6f6b34341194a6fce45f4ee78e65313303b149d0b37d18db2558ce4e8074b0d685bedb8f74b5a4d0cafed4529483f105358bfde4f871027533e0dc39c6959
-EBUILD wavpack-4.60.1.ebuild 747 SHA256 8499db8b6f4e4d21d19fa7e285931b9dd0087d64f480468e90e8ca1b7accad4c SHA512 30e06710de3ec15f9d938954cb053294cdab8c90b8839a3d87dcc8a6cb25035691a93eecc8b0085ba857198583e64d3a6f74eacf777e3f668806616f0113eb12 WHIRLPOOL a28cd97e762253b315e0eb7935239a07f0289575a2a13e737088a01f486e6600d9bd0d7a6bf7783f565744893c224febbbba9687294d96adeb4f55302d0a5141
-EBUILD wavpack-4.70.0.ebuild 944 SHA256 38cabc5188474a3f292ef77c4afc49dfa68e4f12bfe4f9dc8a2c4d56476523ff SHA512 6b9bc32ee7b0fb2f935a9b3bf45b5ce736fbfc90e3891176e031b67c472a25ba83675a0c14505fdf4b803254176a5d9c31db3efd658ebbf1ad514729ffae39e0 WHIRLPOOL 10e010b45499bf61d145c6b502ad8ccca4718f24526d3c933ebc36c7e4cf0df8bda8ce993ff2e6676d16007ca9da6e03998868969bece9268208d3ce364475a5
-MISC ChangeLog 10413 SHA256 51dbf254ea66065501579581118014934d55270645022946e69607383c3ea076 SHA512 eae1a218bbe15bb35f2d8189f6c36fd73d4b812331fa446491274c57c1cd16881af6ad96b91fbd2683cec064be43e298b29f02f4d1a1695f9ccff1817e080fb7 WHIRLPOOL b4847735159038c4d190f24925431321a84407c5082a53142fb810cd38a98e8fd817caf5cf77b13b5ae01c85e58e3784e1b4ed7a15dd9261cdf53b98cd315d69
+EBUILD wavpack-4.60.1-r1.ebuild 973 SHA256 94ed026fd93d137baf251483f0f3594bf1ab1f5431aa7be75dd07cf825f4c9e4 SHA512 285bfef996ce0d0af7c0e964c6340474e32dd1917f9ed0b82e066fc7ba5fc6c9286efb598f9ab983e6340e92bd48cec0d69cc58175c72fd2b4e6bf2e5477bb19 WHIRLPOOL 844869ceb332e8df74b50855b4ec0cc95548e55c53c017e32ff65aef4ed2f40c2456ddfdaea18f2178895b0349032081be14fc8703cfe35febe472b90b982cd0
+EBUILD wavpack-4.60.1.ebuild 777 SHA256 93f2ce8b4d8c6543eb7debd850ffd51d828d5c0592b4bba136c6550f72789eca SHA512 f1b133277f9c4e02018333eb7b3e12926eb79aeb62e218227299e7d550da017145e3acbae24e2feaf63ae837337d30651451358b16a02d4d95b035b8c8fa386f WHIRLPOOL aea149eee88798036db1577e3a2f4bd9b972234e9199eb4a59bc0cf4a4dc609caefc49d87c0ea367dcb29bfdeb3d59736aeea1a1ce343c1a84e368a31260459d
+EBUILD wavpack-4.70.0.ebuild 976 SHA256 16b529f33b0454f8300b3a4df7653f8381795be7aa8ceee481ae2df2812c7e3f SHA512 252adddbb9696be4cd8cecf1d8401924092f86e768c14c6d2186a4aa4f31e0d025c8caab5d53bcc44bb78aab56187e8d641860e5750fbc79c7d260bd37ec72e7 WHIRLPOOL 3118babdc70589a60b65d0a6439dadd7e924ded20a1e9e057956997a4040ac01c73bcf449aa9601eb0c8b01036ec013e9f7d0472596d8c663ca24eeffd4f9ab6
+MISC ChangeLog 10565 SHA256 77125cb9d3249b27b789a974ba03eb36a45553e6a881ec8013ffd6fda9cf2e0f SHA512 41d7c038ffc258918e29e9fbbfc24f6e48ba815bc88faed728058541dd792158ad6058181e6164cf855c2877bba02896e8245afeeb84c21a98116f28a62ab027 WHIRLPOOL f608bacbf03bce080a9b1b2a6764577e736fa4a3b96cc4e90ca06b104a6877d1bba8924c7b2f878cef3b33ce58f85a0df840c7c92c569b20149dcddae05716a8
 MISC metadata.xml 159 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369 SHA512 a77b80f2ab1799aab052edd575ad80daae01c717af7bd5bf3dcda15714b9afd2e9fd6553cc20b000bc3157915b7082641a92fda56de3a9b8362ae2488925e4b1 WHIRLPOOL 913c53cb00341537eff621357b1c5b8379bb63df52d18b88fdef0173cdfd7c60f6d1ece1d42b5d0fcda69ed73ab4138f4268c6394851b07a9411a8306fef9173
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTofa1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUyoKEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6HoP/AsGs5cRlpH59JPQ1FKJOzU3
-s/GaLsV0we7wn+oyNa0u8shJGuLcHXHUWySlXv+IurjqzlWg3ls8k+dwt8u0L0Ct
-74g29+IN2/dCsIqXKHqTuZRku8oku0c3suCN44W4VTmSsVofSG6o1gF4ssuG+g7B
-I7Vg9p2YakF8cP5gxxa7JcGuA+EhQad2iwv8wZjF10Fw1bf52G897zaWXMQMgT9j
-V+MPbaQ0f+V8L+GD5UpPqlUmyqgc38Hc6BHYwdhkGgLS8uVU0si6I4Nn+RoKXIDO
-WcAQbZfkaIWGEBa8cOHUGJ3FyMkqof0CLvJqlIyqg3zuQvCDl2OqmGheoxrhtb7a
-BOZCCJCgfG/kNJ82eNIqs7faRPdmGxCZH/uP/YqmG5ZWDmH+IBh8q6eD/5OVUB8P
-CsvCIsJy6yhg4NC7XFK8i8T6u/8BiRrcsTICsIDURou7/Y0KZ1ZYf1uXuGkrspqA
-VNKq9F5ZKXzYlgqOG5NU93544/EvBpDY4ckaZm6Kvhh770Xx1HIsjNOsGBNSp6hk
-nxxNQWtk3XhB/ixgVH9RdtcZl0uZiPMZt9gliqTbhXTSFUGhERw88Lr5o0Nur2fE
-w4rs0fLiv5uNOUP8/x+GuHJ0hqMqGzML0i1Mo72X7tItztW1P4JC2YgsbOYtR9KY
-VyK/0jPJAdWF0OzJxfK4
-=Ec3i
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOCEMP/izVnFthfgRJjHWtS6yC/rnR
+De4ERZXNEAC/AHfhsWDxXVqxOMz9YRTZB5VQiSbvQE+/XpXT240tutF1aiWEwtLu
+bxUmP06HfJDMPlRfMFOOfvNL2TnACLDMl43AEZ1oJNIhcajbHC9463SE/Woswats
+S5PrWk9ItTQXIYOqqWR2ljkILZ5JmOeQrTKPopBZxoOIFivr19abyz+AWi2YPMDz
+Z0PMY7Hy5hDQSozHIkKsYrXAvRsnOiD4rx4+FzR3fs62pgLL1JblGZWa7EV/+vlU
+r5ivlbmnyBNfFEU6gpwSwDtKBLMOirKMrvAcXwM6C7kGQRnWThW+3Z3T+Eit+Pp2
+44rngI6DV+4obC8V+FDw9aUdj8apD7LYBpbKKQpz2IE2ZJA2Y7RAxKIxaKitVJTl
+BVJFYIIuksai5xaJqllt2BMXL+mJV/b78bNTaG02x7zd1lCZUP2eX3eFjIVi4koX
+O1XJXRBL8zFXDvO9p9tLZsxXXAhJZEBe4m/lMP8q6+YNy7FY+iu4V4BYqn/KCXp4
+U+V6SyL2M9bykEbrmKyoZ4XurDsYZSlxifpoA81fcxqVkpyhoPruCJ/FdGnMgMnd
++juZ5OzCqC4sBgigKc/Baln8Iu/L8FDCCJSfi2npj7PuH/ceKGLVfi39pK2TWdmG
+X/kkCllhSHGaXXpekymU
+=RycR
 -----END PGP SIGNATURE-----
diff --git a/media-sound/wavpack/wavpack-4.60.1-r1.ebuild b/media-sound/wavpack/wavpack-4.60.1-r1.ebuild
index c6c4498b6173..1c0c26e24512 100644
--- a/media-sound/wavpack/wavpack-4.60.1-r1.ebuild
+++ b/media-sound/wavpack/wavpack-4.60.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/wavpack-4.60.1-r1.ebuild,v 1.13 2014/06/18 20:29:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/wavpack-4.60.1-r1.ebuild,v 1.14 2015/01/29 18:57:06 mgorny Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="mmx static-libs"
+IUSE="cpu_flags_x86_mmx static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4
@@ -26,7 +26,7 @@ DOCS=( ChangeLog README )
 
 src_configure() {
 	local myeconfargs=(
-		$(use_enable mmx)
+		$(use_enable cpu_flags_x86_mmx mmx)
 	)
 
 	autotools-multilib_src_configure
diff --git a/media-sound/wavpack/wavpack-4.60.1.ebuild b/media-sound/wavpack/wavpack-4.60.1.ebuild
index f21faba87ba2..c5a5dfbd2a71 100644
--- a/media-sound/wavpack/wavpack-4.60.1.ebuild
+++ b/media-sound/wavpack/wavpack-4.60.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/wavpack-4.60.1.ebuild,v 1.10 2012/05/17 15:25:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/wavpack-4.60.1.ebuild,v 1.11 2015/01/29 18:57:06 mgorny Exp $
 
 EAPI=4
 inherit libtool
@@ -12,7 +12,7 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="mmx"
+IUSE="cpu_flags_x86_mmx"
 
 RDEPEND="virtual/libiconv"
 DEPEND="${RDEPEND}"
@@ -26,7 +26,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--disable-static \
-		$(use_enable mmx)
+		$(use_enable cpu_flags_x86_mmx mmx)
 }
 
 src_install() {
diff --git a/media-sound/wavpack/wavpack-4.70.0.ebuild b/media-sound/wavpack/wavpack-4.70.0.ebuild
index e791d9580a42..a53eff3200a4 100644
--- a/media-sound/wavpack/wavpack-4.70.0.ebuild
+++ b/media-sound/wavpack/wavpack-4.70.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-sound/wavpack/wavpack-4.70.0.ebuild,v 1.11 2014/06/18 20:29:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/wavpack-4.70.0.ebuild,v 1.12 2015/01/29 18:57:06 mgorny Exp $
 
 EAPI=5
 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
@@ -13,7 +13,7 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="mmx static-libs"
+IUSE="cpu_flags_x86_mmx static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4
@@ -24,7 +24,7 @@ DOCS=( ChangeLog README )
 
 src_configure() {
 	local myeconfargs=(
-		$(use_enable mmx)
+		$(use_enable cpu_flags_x86_mmx mmx)
 	)
 	autotools-multilib_src_configure
 }