Switch to CPU_FLAGS_X86.

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

4 files changed, 34 insertions, 18 deletions

diff --git a/media-plugins/swh-plugins/ChangeLog b/media-plugins/swh-plugins/ChangeLog
index 674c15a22528..e608c285b56f 100644
--- a/media-plugins/swh-plugins/ChangeLog
+++ b/media-plugins/swh-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/swh-plugins
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/ChangeLog,v 1.53 2014/12/16 12:45:24 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/ChangeLog,v 1.54 2015/01/29 18:15:52 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> swh-plugins-0.4.15-r2.ebuild,
+  swh-plugins-0.4.15-r3.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   16 Dec 2014; Pacho Ramos <pacho@gentoo.org> swh-plugins-0.4.15-r3.ebuild:
   amd64/x86 stable, bug #525768
diff --git a/media-plugins/swh-plugins/Manifest b/media-plugins/swh-plugins/Manifest
index c50b872d5353..502e009dd8c2 100644
--- a/media-plugins/swh-plugins/Manifest
+++ b/media-plugins/swh-plugins/Manifest
@@ -9,14 +9,26 @@ AUX swh-plugins-0.4.15-riceitdown.patch 1157 SHA256 9bab8b8e2ea112bb5b021f5b98bb
 AUX swh-plugins-0.4.15-system_gsm.patch 1526 SHA256 cf5648266134182d286d475347825617e0154465440969c26a75f7903d27a72e SHA512 10c4250ac82880162cf23c31cc008a4c87e248f6efa8fa9be69d5df6557fc3f1489767873717bd8d956649bb4045564d24a6a1170f0aa5511b2171f558cfa499 WHIRLPOOL 22350e265c4cf3f7d23da407a838761bacadc83112d7acb6c10aa094f5541d1310eb0c1580bec01e6b8caad50cc156d170b6580311df023b658cf73dfee10491
 AUX swh-plugins-0.4.15-x86-asm-optional.patch 1444 SHA256 93922f916e6c6dd026ed1949fbfbe99da8844ce05ad8227b7446af7e9cac5245 SHA512 d850ca895c1935ee74aef8ab8889792fefd2cfbd10416abe4e6d9b1a6c04405535c7bb0e511752205d67e8549a8a5d07e423af84d53483c49c2c53a4405ea023 WHIRLPOOL 1405f7cd6b92e2e1801d0e5af39154c86554fc199db1ecb91ee591c5bcd5bd11967eb537cb2e4e28c68a08d9b99c156318573dc46523a33c9e600bfced8e6dd9
 DIST swh-plugins-0.4.15.tar.gz 1051623 SHA256 d05ee8a4f4d92e828412bce3449a034f6ef16bb630eaf60f8fe4e15a89168640 SHA512 b26d11f3887d03d39187b86f8e4061e3808ac03fa49caf24256ae457a0156be5982fe687ed50fa4240ccbb3e6250ed920d1da8c95d57cf4313e127559491eb03 WHIRLPOOL 853af1d3c7f0593be223e722641b797e39c5e55dd09928652834cc5d48f3d1985da645f2e2ae121d9c6669ca709c363936128b5fe062889febf72ee0ed50e4a6
-EBUILD swh-plugins-0.4.15-r2.ebuild 1987 SHA256 2994e8f33044ab5ff288566b5bbf4a0669dcc2561ed89c3a186d7ea2d3980fd9 SHA512 00f7b4ab7a664b5a6457d7f1cba4b507c3cb5fa55f183948d55282e5d9075c9fa15b5c57b5597b6fdcebec63e839c6d33126d26f9c802f135e59dc5e16050d7b WHIRLPOOL de790b8284bb3e7c08201a0637ba5a241a451725ee7c1826b1c8aa533d9749c196e71641c0f4a41d0fb16e24fc436b110a806069e8b55ea601cf3b7a679f34fc
-EBUILD swh-plugins-0.4.15-r3.ebuild 2104 SHA256 97f210344c0232e3e3e68c6b9a6046039ae617a76b3cf05c8d1c95ba7060eaec SHA512 970a69cc8608c5b6e4948349ce35ba4925f587b1d96ae464f487788aa1a987832c9210e21d774e666ba7591ee3d46ba0f4b5f7a0d14ffaf2e97de4ed420d8b51 WHIRLPOOL 8bb655ad14c5411b6ada299de2154d2d3697f57a928c6b38e94eb175780b57b397da6ce41577114ff87bb0a264e259ea441a050f537482e47ba8d0cd391f9c71
-MISC ChangeLog 9140 SHA256 5ba54ea99c95a656e7660e2cb8df36beb4f07cb77e8d4c65a2ad8d57b5d31214 SHA512 1fb5b50aea3d1bae0f297af1383b5647dcf183208422729acbff70fe49c88b3d5a27f525e6b8c8ee2263cb0efc445c1898c5979e0f4a9b268d5676a35d00d2fb WHIRLPOOL eefa6dad7b294511d58da586680bf25555b52913301e79ffc4ca57025d6e79bc9b1a8981df4af341518fa76662b8c30f761d440300c8e881ebb910c5470a76b0
+EBUILD swh-plugins-0.4.15-r2.ebuild 2056 SHA256 415b0a286585bf2a06bf35e87ee228a7ed9258105b63b7148a2162b1e6e5b028 SHA512 c293a70a13050a9f78d11e3ab21922e1c973da8c753b99d15169e6a324b20aef31e5d2b667e62b91633618ac546b5a15be70bb70bc439ab7e362291367d10468 WHIRLPOOL 54a4195c524df44b2543ce2b12e904d259cc57261502c0deff2905cce3c2bcc28afefd33ccf599a6745d5dc67ae09dd62232ca157d0f7ae7f81527afc55ce4b8
+EBUILD swh-plugins-0.4.15-r3.ebuild 2171 SHA256 12055231556ff8d8bd33f23b4661e6313074737e9c3fe69e4ea1f57ccc894134 SHA512 9078ce4649f606cedc8167ecd59c0c63c75bb69f2714ebdfc0078c62b2a868ad1c834bc88405c6d268b7a3f4fcb6f58e60e4ab4c71d2e68cccd540d127fc7155 WHIRLPOOL 714a12f97db911c0cbe798c7ef5e4b660f8b41c4173b7afe1e664af81cd82bf03af6470b74968011ac34467135850f485d346d498c5f88d4e669359dbb4b4c89
+MISC ChangeLog 9281 SHA256 5a6aed12868800e36cd66bbd08fed883c835de4966ab5325d2fdc3bac7434a87 SHA512 074e5224807c0accd37f9a21df1556f622147cde0eb025bbb864f9fdb30d1800efaf43f67d14d40aa4460c30878cd444f8652b4ff8b9c4a59ba03822e758ec79 WHIRLPOOL 37e5e0d3c61582490db0abfb09388e11493335192f92d04e9ca320f734379257a6cf09c3def29a2e5051bcb748e22c0384edcb6352ff75d03ae0839c6da5f02b
 MISC metadata.xml 161 SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e SHA512 e9f8695c64d7b6aa86b9b6186490d50b5a75d593ac1c86b9698265c6345899c64fa712acdde3bdbfb2464139e44623efdae29b67b73c1c85bcbedfbd10e874fd WHIRLPOOL c01ec8b583f907a3a62da7d5bf74d09809244709021f437dc3f0064b2d52baa3dd4386369b46a9fd74020146017cf6117ad04b147e8538b1a2c7202e1b4a2dd5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSQKWgACgkQCaWpQKGI+9SsLgCfcNiDKZCEaSEQaIoN2mbEhqPM
-TTUAnRBIe92O3DN3Tu/rx2IiIIry1Yje
-=VpwX
+iQJ8BAEBCABmBQJUynjeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOvu4QAIq4J0+hcuSBHfCwyCNwLWnm
+zYKosLIw+TweFP7Yq6cAUHyavpDwBcpaFTls4NX4NET7GGvcHBPUzhQP+J3kS+xG
+Paz3+bKataQJj72G06rV37tkPK23masSbWHG98agagL2fd3ClfVUhumzEuwcRZr6
+ftHei7lO3Sfi5yrEAAm0wTsNMFToYYzL1CvX81QdojNHBzHs8ZSdqOJG3JqWcxgj
+P45kN7fhCmTN6kgCpjWNJLfcR5TN9HHaOoxdnZMMzRYu6GB3U8yVZqDwdlX2rnZN
+d9112C+BaMFq/WlUMFzsghLWd7uOID1ieLCKejuVCMF9//StSTxScNKFM45d5w8P
+FMm+M+oyAkbfsvvzINdiR4r+0VJW6Vqal64c52bwEb1zB+IBHEClc4ykZTcKPp5L
+GF0ZRiaJZoq0DvVIs7QMr6wAEyaT3UZbVDAnNcw6e5e1+KKxkHmiJS/sI8TBB7gn
+8LrDJtKJEwLgrHHi0h0uPZTI+0j2llrtF51K7wogmsDcPt+VUbDMLUv6ChO02jAG
+LRknMzWe+ucJNsonWDdIXjRhFM5NaKgFOqmyeJxly7ZuUyXBD1Pwd3aQ68x2IaLE
+D8ekR58b03JIcOUdc/JSjhZ5PHLtewinLXwZtrxuLtsh0HEEuouOmlu4Tenq1McO
+h5gXEBbHKdKjyhslGS4i
+=nQig
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.15-r2.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.15-r2.ebuild
index 8810254ee0a6..8778af731b36 100644
--- a/media-plugins/swh-plugins/swh-plugins-0.4.15-r2.ebuild
+++ b/media-plugins/swh-plugins/swh-plugins-0.4.15-r2.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-plugins/swh-plugins/swh-plugins-0.4.15-r2.ebuild,v 1.4 2013/06/25 18:42:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/swh-plugins-0.4.15-r2.ebuild,v 1.5 2015/01/29 18:15:52 mgorny Exp $
 
 inherit eutils autotools
 
@@ -11,7 +11,7 @@ SRC_URI="http://plugin.org.uk/releases/${PV}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="3dnow nls sse"
+IUSE="cpu_flags_x86_3dnow nls cpu_flags_x86_sse"
 
 RDEPEND="media-libs/ladspa-sdk
 	media-sound/gsm
@@ -51,8 +51,8 @@ src_unpack() {
 
 src_compile() {
 	econf ${myconf} \
-		$(use_enable sse) \
-		$(use_enable 3dnow) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_3dnow 3dnow) \
 		$(use_enable nls) \
 		$(use_enable userland_Darwin darwin) \
 		--enable-fast-install \
diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
index e3c858c51c4d..9d4ef7146b99 100644
--- a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
+++ b/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.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-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild,v 1.4 2014/12/16 12:45:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild,v 1.5 2015/01/29 18:15:52 mgorny Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://plugin.org.uk/releases/${PV}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="3dnow nls sse"
+IUSE="cpu_flags_x86_3dnow nls cpu_flags_x86_sse"
 
 RDEPEND="
 	>=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}]
@@ -58,8 +58,8 @@ src_prepare() {
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
-		$(use_enable sse) \
-		$(use_enable 3dnow) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_3dnow 3dnow) \
 		$(use_enable nls) \
 		--enable-fast-install \
 		--disable-dependency-tracking