Switch to CPU_FLAGS_X86.

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

5 files changed, 43 insertions, 37 deletions

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 \