Convert to CPU_FLAGS_X86.

Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E!
author: Michał Górny <mgorny@gentoo.org> 2015-01-29 18:56:11 +0000
committer: Michał Górny <mgorny@gentoo.org> 2015-01-29 18:56:11 +0000
commit: 7a21957547161d06b2d4196544103dcb1d8cab50 (patch)
tree: d15b7064f8b2ca132db4d3a3c79568fb7dfbc61b /media-sound
parent: Version bump. (diff)
download: historical-7a21957547161d06b2d4196544103dcb1d8cab50.tar.gz
historical-7a21957547161d06b2d4196544103dcb1d8cab50.tar.bz2
historical-7a21957547161d06b2d4196544103dcb1d8cab50.zip
16 files changed, 121 insertions, 101 deletions
diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 6e64e52a4bc7..b5baba028b40 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.138 2015/01/03 14:37:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.139 2015/01/29 18:52:23 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> ardour-2.8.14-r1.ebuild,
+  ardour-2.8.16.ebuild, ardour-3.5.308-r1.ebuild, ardour-3.5.357.ebuild,
+  ardour-3.5.380.ebuild, ardour-3.5.403.ebuild, ardour-9999.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   03 Jan 2015; Michał Górny <mgorny@gentoo.org> ardour-3.5.308-r1.ebuild,
   ardour-3.5.357.ebuild, ardour-3.5.380.ebuild, ardour-3.5.403.ebuild,
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 72fddf40c197..762092a1cc58 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -15,31 +15,31 @@ DIST ardour-3.5.308.tar.gz 8578598 SHA256 8fe7d396d182c1cecc377d70e788f4bcaeca62
 DIST ardour-3.5.357.tar.gz 8579943 SHA256 1c13a3200bfa0fb8c0adddd3439102e0caa7f219a0f2518a4ba0d233924ef0b7 SHA512 8ee6d3b3f8e05547b3e9487e56344c2795fbc4781f6ac03a0c1684c534940570e3138023df4e57ce904c99e152ff212ddf67d83c1c95ac8542cc55a6e379c90d WHIRLPOOL a32508b6b54909111bf9a074df72d312f164a18840c28e96d1c38e368a13f8ea8f9dc6d9fb4fc600af97e06ce79fdd21a58f1701125a02c5a26ea919d823d2ae
 DIST ardour-3.5.380.tar.gz 8580892 SHA256 476829114565b56f6dd9f05d1e93752d36db6db453f0f69c09ed43f6b3ed88e1 SHA512 286290186e400cdc9fe350dce3e785de8193adac7a7de951b78ee91d0ab8a29ee4dfb113f2e996a821e6e26079749a7a2f09583451b364f5497027c0b52d7f0d WHIRLPOOL 2a59c5618690d8570a782ea7b2ad2882de7affc7b98a1d0d834bdb2b2a36031570b7e9e68e83f2b8fd19e224fef2393601b47a633659f8fca5fbb11102b957f9
 DIST ardour-3.5.403.tar.gz 8583763 SHA256 46490623479d9a25e2ab98b817c1f5c42b1d042f62afba1d1828d869a0c2d395 SHA512 e00053faf6c4f62dc80c85d82bbdb4b65de2111c9c9efc9d9e03b73be353a7cd652c02a2989566fd30491b1a07d02a7ff15e4523966163cf2e5e4c708a12aac0 WHIRLPOOL 726b66d236a9488a58fe333cbe720bdbd6beaf993d0e738ff8757cf7f657be164d5d0e390da09c773ab3b590c3bcf73be03a358164d54bd19fa7b025ff13118b
-EBUILD ardour-2.8.14-r1.ebuild 1995 SHA256 5217fea5b18e164f4e340d64d86e7deb8853ddc707dbdcfa02b1ba76aa00281d SHA512 3a71c41baa07c6c3f9e98715b064a655aa65ec430f88fc1a52a9926b65dcd544d79dc32287a1fe2c45cb94d799d32f2274d6b67793bae7deea1b589a33a45e37 WHIRLPOOL 088ad8ecda65d6a39a81334228783758eef0d18ed7553941f6efc1d5673f875ec5e7b488739c32ddc417ea7c427c97804ca2907aa5a83d12cf23eb6afbc286fb
-EBUILD ardour-2.8.16.ebuild 2007 SHA256 4158499194ec45dae26c1d1d2dbe8de5ae4c42073b8c021b34ffd22b0639fc3e SHA512 245ff5fa0156cb1e3a645f1b1dd711f0041b42a41e79e4832e4a3c7e4999f4e193a6b005291aef15ca94239212ed65f52801d519fed8aa80a3f49d5963ec3122 WHIRLPOOL a6604007ab9a11bbf99c4972527838285b422da66901c422b72a6c41569314409a50ce312043ce72cd5121ef9964ecd97c874d880cab2d12975e54e3f6977dea
-EBUILD ardour-3.5.308-r1.ebuild 3172 SHA256 062993af8dfeb530e9891e5328435e185a6c88656f8a166782278a6e57940451 SHA512 4010aaed7877202a900d015aaa4930ab22d8350e0f7abeed8c7d489bfcfbfe518542f0a5163cac21e2fe0db8b14d60c723ca571e76ef23e09fbb24bd59d53641 WHIRLPOOL 34202c60f2f4afee17aae69a65e062345a79e2d4b6464e06d81664b63cd9d38f6aa6d1aae10ca3b58eb757c2ca88c17932be2802615261a9be9213860980be03
-EBUILD ardour-3.5.357.ebuild 3169 SHA256 04e79c75c0e2085bc10307096386a984cd84c32e4d1cddd65b173a67fcb932b7 SHA512 1a9516af24eefb8ed2479bc5e7e764a7807229893b8d5bf77653192a8b7022159b6e9758aac27d1f712b4a1487380e76e83ec21a56f3227989bad94dd8d9edc1 WHIRLPOOL e74c1bfadadaabbc58e06acac0c03682950c10fc758e684d20aca877fd2b06f89dac193bcc2203b065bb708e64db8c0396af3f5b4006f5647dce5fa72888ba37
-EBUILD ardour-3.5.380.ebuild 3283 SHA256 32fc06c14834cf21a6d1a18ee8434ddce18b165ae4de0566c6a71bef70dcf4bb SHA512 be3b5f43f49520e5a7be4b3750123a1f899b7998295047725d001e4dec511042fe279cc7a4304740aa317766204054178d2f3f8bfe2339eeb517af46bcfdc5b3 WHIRLPOOL 409852630e1b629ac798269efa4c54fd76f719b437c95958159215a50f5ec3eda7cc461106e8f917a7ea82df53c90d0ea4ddc6df8d19d6142245573117e4c7ef
-EBUILD ardour-3.5.403.ebuild 3690 SHA256 ea5c64a369d80ce00fdf2acbc53199cf0642bddfdeecb0ffea80ff214ed97639 SHA512 033deb090a0a1cf80e97d0e9c2986d24d95cabde0b34308c732470a44383cb894142faba92e4f4cb3fa158fef96db14203256ae42e1566b434956ac1c789f508 WHIRLPOOL 2a9e1dd8d74f555238f2c959f1c69181b3945f4577670ad06e06a33fdfaee8d41162a2468b6fa28548c845fe9a9ff06cd9ca41dd7b5ebfa10f943cb2b355fde3
-EBUILD ardour-9999.ebuild 3739 SHA256 552ce7b347aae56bd7d03a7dc6a2a5d92710f05f8a6ef0aba121290c8aef5e92 SHA512 ddb50cd0c16377b17d98c56075835d345bbc6f1fb1b21ec1b6e170a234707e3ebe6f0207890dd50cf0da27a94adc8a886f68239011272de8e718ce7f5fec341e WHIRLPOOL 150e44d4f99a97df3a310c8597f30d8083e79b986245d85a2557ca30b71e722f04b6f7b79613203aaa7fd4ed50386017a110f7a7fc0b6e4b600d8c821a2a58b9
-MISC ChangeLog 22712 SHA256 23b36ccba981058cd5b7c6bb9475e728a31f91cabb4dffd0f6e904cbc0169fcb SHA512 326016e442fe4242562bff81caae55c7c97dfa500fa3fd0f0b165ec6680322dbb7e36d6ee553545ab3800041989326b09a401210f94afbf56981036541377c5c WHIRLPOOL 366e3be88f91dfcd16efed4afa316d941d1cfbfa6cb5060941377827633df5b843c61281a6542e213033bbd776b66fa7c4c128ebc09f71c581a299869539ee0f
+EBUILD ardour-2.8.14-r1.ebuild 2020 SHA256 3dec9eca6b07672e344f49975ecd4741afe28205a7675a0872996755b612e5a9 SHA512 cee41a3a36f228e128af4adb8e5d89ba0f322fa193f656e79c3e4e0cdfd5d496fc06605c9328d0d5f273b3a77b1601d126bb9024c2b1bbe9027841aa700f87be WHIRLPOOL 41cdb3fb49c3236c4e8227a4c341a8875e871128b529f0baa4779cc9aff179643a96f34bfecb147beb0ace7fce1ff3e5100f6504366615e7fa9d965e8742586a
+EBUILD ardour-2.8.16.ebuild 2032 SHA256 beed4e986e57f3cb9b3b2ca8a556f26308c1a122dbb58d84901108cdc5ef7969 SHA512 ddfbe3599572136d14340732d8ac6fc26c9549cb215e08a110769f6a8f9ddaeb0be8944632b0d82b7ab63c3d8b05bd4e3849c4eefa3166d10cad844102289024 WHIRLPOOL e77727d63c27fd582fa5d18ec59ddb46abb0b94596222aeb7fb5e992f1a442f602b6f9da63f6c86f368633f2e049b8f17bc695e83bcc905fda1c976dfee606db
+EBUILD ardour-3.5.308-r1.ebuild 3200 SHA256 3c93b1b99a5d17d2183531705ccb623646a3d62845581a81e1e84d7a75fb899c SHA512 97bd3eef1198016023405bce1dc3faa554075940b4ed0c11cd387b28a5582d972cdd115edc4fb510e27641ed54fb3386f307636f93ff86b81bc383e1113e1dca WHIRLPOOL 8d7839da5a63534ba9049df52a878b718c29f4f21e0b30fe1e2b97bea7605c9899a0c8830792c33293cc8bbeacb52a82606c35223d6f693c4bcc8b8b099b24b5
+EBUILD ardour-3.5.357.ebuild 3197 SHA256 13ec34b6c51f469da1f2b713347c8bba27d3cf076ed2c946e24f0ced1c9513cf SHA512 c52a354231caa078cc04d147454526b2a8f161bf089c4a6acfd0ffa8e4eafcd2ac36afc0cadcf154d387ea2ac133d70e3cbe7eeea4871aa07d214501b13433dd WHIRLPOOL 1bdf2ef5710f21cdf48bf77a47c0d7ab02c0a5ce54c2332c23fd7093805369a53637d20da1580b76a24a120e8278995a63d235c4c6eb6d1c6748d9f2163ce2ae
+EBUILD ardour-3.5.380.ebuild 3311 SHA256 6d1f06ca01a8c775247a87d7fc8c3e2c66b2bd847386d6c9ed32f1ff98ed4494 SHA512 3ef5b97f108a3e1a63e175cf0847f67c3c519828f424e8b06c752874269a69fd9c6fa808df013f62f3c28eebdd4a68279d75dedbee6b7465d22447fcfdd73235 WHIRLPOOL b80335eef5690cf01db84834413d929b30bc88f9b723581e2400dffb13dc44f474eab65e50dfe0d9e8381015cfb55f59073695f526ee509eadcc134584dea731
+EBUILD ardour-3.5.403.ebuild 3732 SHA256 43b03f5333a2d89743484b9330d1ce9e57efbf13b828f6588b8d2698d9e1bd5d SHA512 227767a07bb2318d4b5191a0418b4a53fbc8411c02e8b431afe6d390d4caab2a7304a6570bf147cd0936bdd79a5a8e885374fb1b7364906b5141f2e47907d616 WHIRLPOOL 4fb8486e2ecff3b829abb55d7d06a00f67305c256b9222280360abfec32aefafa6846a702b6518aa854aea440589d17606cd79359f1a83e9e1583187c160a639
+EBUILD ardour-9999.ebuild 3781 SHA256 78551c0038e2994a7a68fab7a6629a45bb1c8e067771cef74968bf53400e5cae SHA512 03d229fc78389943f7a3ac9d370dad5aae63c1643f75085a397a217dd85ecedfee196f71a92c0687371b7afe2ce60d88f1bc7110812104c580f3c5bff77b0042 WHIRLPOOL 12c46478c641a40b76487dae9f25a3ecf8208a98731508d879ad543ef44cbda42ddb39691b68c144297e64c5f161ee5983edd700a9219c907277222593d26d69
+MISC ChangeLog 22957 SHA256 c22765336774246d04c0c96d64fd4722ee2194bd1437cd17070b841d086eb6d9 SHA512 67d9e6e4fa5c42f427fc05be9748f8e59517a5409f124be5cc6c07475f7a8a87208487411907f0126d27e67a9b331edd8f50891307b6048549f9bea87bdd8ca4 WHIRLPOOL 4bf41b703f9eb9da56b92ec5eaa1e8c09f3f4453ca5152299ff7308c6935f5264a6bd10501a07ea13cc0916b98b5fdc11efde75b9dd33ad0f33a8c96a4b4661b
 MISC metadata.xml 234 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799 SHA512 ed4a455e15b346baee30ba9c76637a199fda7c1d7c144cee546d45e7312dc7cd1f50be64d80b0900834a5b7e3851ce82158b676696c3ee1b34809a341edca2a9 WHIRLPOOL 68998d2804aab1645e9cb386ecd149680486b967ccd65b281327247a5617ef3f7c5ee25be285a502d397e6c414db70f39111716a2fe5f7b7a012c327fbe5abae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUp/6oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUyoFtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOqDsQAI0AoJ1MsLztgDrGS5FS4Lzm
-pxo9p5LDz3neStEB8sNzKpTQSxXY3a4nmDTsDSMrM8ZVsYopWItwG+dQV45KqZ2Q
-zFRXqn8sMDY6S8QMiTyNqJO2kIQy0vjPcH/yvqsKeXdarqYrfZRVCtTwpzFdQrLP
-0Jrymf2reYZ4Aa6X51EQdX5lMwh9ged9WloIYwpPGLLQwoikhhsrxF0aBuHuA4Au
-raSgYL/bQsFBKejSRhXElExMfDziClj4IYA1Ud38OtAj0lsLyf4FDsgaVr5+O7pQ
-4e6r+TmtcmIkoqvj/a9jE2FhxZfFzMtUYpOGlKTMKyF/qslhK3xkGCJkxAoA6Q85
-mdDEdJNve4Wn8iVLFf1IolzSxyYdEY/fC34kFawk7WPSI86OcJyTGBzBNSUsnKT/
-WUA9N5OH6WBHNoCTkqTgB+8xvRPDzic7IMLHeK+HtFYmYEkXxvO7qFDnkhN+N8+W
-dYrp+S/FuMK2v8z05LSIwe83H33sVxpLnqongV/201KjVIOR1QcF0Mt4rNA88yow
-b+sriPK4KhTdsiPMyKyKbKYYwSc5Gsy2iqP6uZlYhabiJWsPTtotvObkKIDVC28u
-nXYhnCw4Ob99saQusbPJpamMUnynYUHXnd97SKQ3UOMzfAMF9VLus8XgWk5fjYNL
-2UAFpR26CvrK2nseRLzJ
-=jFg4
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZTwP/RG1iupC+u8JCriGK030R9ty
+UoE6WHyKgNSSkeChdLHHpZwxAuBeVTYefq8uWsPt5Ja8LiCWJJUfr45+CWeV/Ebc
+QLwqAk0hzQxPO5v1yyMLpRlOtHCZd1uKqLhqGwSO+syviQFadkbHL9WUdTEvRLId
+T1+gKuBt7S0Kifk44G8rPJd9Sloc6Eg+Avrnlj35niEQatb+yPUn6DPBWylHbgDR
+bCmRY2yGN6ol/GB2sx7qY7RMoRzfCgs3ppH1K4HXZjzM+TKrpld1q4dj7ykP6xkL
+ooNXmlQa20iyRVj6vsfjH5DJlr6g2EUqK5MWjSHavLOufB3n6GjMTJ0IIQsHWefg
+kqGA1RCB5qUKmxfp9fV7Wz80Z81vpqFnTna5tlxz6Fay9VZeCyQgB0BCHwLQCUI1
+J6iqoWhD2RVhnz1LPqeUAW28nAKHttxR8xE43fhKuqJshRDQ569nyB3BqFr+EIDD
+xXp8xp5KtYbSB98Hk/PdOZ8SJuXDVZe/7ukir8hzyNXHaOTsS5c1QjW619G0dPmt
+oB06qvNjZG4SzMUa/i91dnqDq6V0kZhSEP9a2Bk0PLUkvugZjKRBlQT194ZWyxD2
+pVES/R7Rqr5b7obaOA01pPI48DbI0TBd+Whgqa7HZ+7MMfo3PuYTFWTVDZBNJr4C
+j+yr0eU42j73Ha88VGUZ
+=x/uU
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-2.8.14-r1.ebuild b/media-sound/ardour/ardour-2.8.14-r1.ebuild
index b3f9822fda0b..cbb25a6d693e 100644
--- a/media-sound/ardour/ardour-2.8.14-r1.ebuild
+++ b/media-sound/ardour/ardour-2.8.14-r1.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/ardour/ardour-2.8.14-r1.ebuild,v 1.4 2013/03/18 12:34:30 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.14-r1.ebuild,v 1.5 2015/01/29 18:52:23 mgorny Exp $
 
 EAPI=4
 inherit eutils flag-o-matic toolchain-funcs scons-utils
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
-IUSE="altivec curl debug nls lv2 sse"
+IUSE="altivec curl debug nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -61,7 +61,7 @@ src_prepare() {
 }
 
 src_compile() {
-	local FPU_OPTIMIZATION=$($(use altivec || use sse) && echo 1 || echo 0)
+	local FPU_OPTIMIZATION=$($(use altivec || use cpu_flags_x86_sse) && echo 1 || echo 0)
 	tc-export CC CXX
 	mkdir -p "${D}"
 
diff --git a/media-sound/ardour/ardour-2.8.16.ebuild b/media-sound/ardour/ardour-2.8.16.ebuild
index e166dcbe23bb..d00702af38f9 100644
--- a/media-sound/ardour/ardour-2.8.16.ebuild
+++ b/media-sound/ardour/ardour-2.8.16.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/ardour/ardour-2.8.16.ebuild,v 1.2 2013/03/18 12:34:30 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.16.ebuild,v 1.3 2015/01/29 18:52:23 mgorny Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs scons-utils
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
-IUSE="altivec curl debug nls lv2 sse"
+IUSE="altivec curl debug nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -60,7 +60,7 @@ src_prepare() {
 }
 
 src_compile() {
-	local FPU_OPTIMIZATION=$($(use altivec || use sse) && echo 1 || echo 0)
+	local FPU_OPTIMIZATION=$($(use altivec || use cpu_flags_x86_sse) && echo 1 || echo 0)
 	tc-export CC CXX
 	mkdir -p "${D}"
 
diff --git a/media-sound/ardour/ardour-3.5.308-r1.ebuild b/media-sound/ardour/ardour-3.5.308-r1.ebuild
index ce31a727d0a4..4040e065897b 100644
--- a/media-sound/ardour/ardour-3.5.308-r1.ebuild
+++ b/media-sound/ardour/ardour-3.5.308-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-sound/ardour/ardour-3.5.308-r1.ebuild,v 1.2 2015/01/03 14:37:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.308-r1.ebuild,v 1.3 2015/01/29 18:52:23 mgorny Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="3"
-IUSE="altivec debug doc nls lv2 sse"
+IUSE="altivec debug doc nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -103,7 +103,7 @@ src_configure() {
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
 		$(use nls && echo "--nls" || echo "--no-nls") \
 		$(use debug && echo "--stl-debug" || echo "--optimize") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$((use altivec || use cpu_flags_x86_sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }
 
diff --git a/media-sound/ardour/ardour-3.5.357.ebuild b/media-sound/ardour/ardour-3.5.357.ebuild
index 72566f6dd56c..430991578aae 100644
--- a/media-sound/ardour/ardour-3.5.357.ebuild
+++ b/media-sound/ardour/ardour-3.5.357.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-sound/ardour/ardour-3.5.357.ebuild,v 1.2 2015/01/03 14:37:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.357.ebuild,v 1.3 2015/01/29 18:52:23 mgorny Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="3"
-IUSE="altivec debug doc nls lv2 sse"
+IUSE="altivec debug doc nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -103,7 +103,7 @@ src_configure() {
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
 		$(use nls && echo "--nls" || echo "--no-nls") \
 		$(use debug && echo "--stl-debug" || echo "--optimize") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$((use altivec || use cpu_flags_x86_sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }
 
diff --git a/media-sound/ardour/ardour-3.5.380.ebuild b/media-sound/ardour/ardour-3.5.380.ebuild
index ea65e59166b5..04445df13f78 100644
--- a/media-sound/ardour/ardour-3.5.380.ebuild
+++ b/media-sound/ardour/ardour-3.5.380.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-sound/ardour/ardour-3.5.380.ebuild,v 1.4 2015/01/03 14:37:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.380.ebuild,v 1.5 2015/01/29 18:52:23 mgorny Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="3"
-IUSE="altivec debug doc nls lv2 sse"
+IUSE="altivec debug doc nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -105,7 +105,7 @@ src_configure() {
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
 		$(use nls && echo "--nls" || echo "--no-nls") \
 		$(use debug && echo "--stl-debug" || echo "--optimize") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$((use altivec || use cpu_flags_x86_sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }
 
diff --git a/media-sound/ardour/ardour-3.5.403.ebuild b/media-sound/ardour/ardour-3.5.403.ebuild
index fa133a919c20..8f48210bef0f 100644
--- a/media-sound/ardour/ardour-3.5.403.ebuild
+++ b/media-sound/ardour/ardour-3.5.403.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-sound/ardour/ardour-3.5.403.ebuild,v 1.5 2015/01/03 14:37:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.403.ebuild,v 1.6 2015/01/29 18:52:23 mgorny Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="3"
-IUSE="altivec doc nls lv2 sse"
+IUSE="altivec doc nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -95,7 +95,7 @@ src_prepare(){
 }
 
 src_configure() {
-	if use sse; then
+	if use cpu_flags_x86_sse; then
 		MARCH=$(get-flag march)
 		for ARCHWOSSE in i686 i486; do
 			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
@@ -119,7 +119,7 @@ src_configure() {
 		--optimize \
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
 		$(use nls && echo "--nls" || echo "--no-nls") \
-		$({ use altivec || use sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }
 
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 31ee68d2b18a..401e2722fce9 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.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-sound/ardour/ardour-9999.ebuild,v 1.13 2015/01/03 14:37:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.14 2015/01/29 18:52:23 mgorny Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="3"
-IUSE="altivec debug doc nls lv2 sse"
+IUSE="altivec debug doc nls lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -95,7 +95,7 @@ src_prepare(){
 }
 
 src_configure() {
-	if use sse; then
+	if use cpu_flags_x86_sse; then
 		MARCH=$(get-flag march)
 		for ARCHWOSSE in i686 i486; do
 			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
@@ -119,7 +119,7 @@ src_configure() {
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
 		$(use nls && echo "--nls" || echo "--no-nls") \
 		$(use debug && echo "--stl-debug" || echo "--optimize") \
-		$({ use altivec || use sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }
 
diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index 484a968bdc55..e930da616a5a 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpg123
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.315 2014/12/14 15:59:07 zlogene Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.316 2015/01/29 18:56:09 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> mpg123-1.18.1.ebuild,
+  mpg123-1.19.0.ebuild, mpg123-1.20.0.ebuild, mpg123-1.20.1.ebuild,
+  mpg123-1.21.0.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   14 Dec 2014; Mikle Kolyada <zlogene@gentoo.org> -mpg123-1.15.4.ebuild:
   Security cleanup
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 61dfb4ef9f42..00e1bcb8b2d2 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -6,19 +6,29 @@ DIST mpg123-1.19.0.tar.bz2 855879 SHA256 869024e01d7cb4dae1aea2f2a10420d4be7e1ac
 DIST mpg123-1.20.0.tar.bz2 863544 SHA256 a97c85f212fade0728d2d641190907935d4b03028ba200d1576f4f6786578503 SHA512 1ebb01ce8f8745a36c4b32ce4f4ec9036af36f18de08633425cb38038cc2bee5fbe3afbeb2deaa7251d0b0f28d2c5ceb41f82625417ec037a0e529facdd1ac17 WHIRLPOOL b3124d6791da7e017d40565a2b51b1a84bc5cfb896801736f86f65a79ffb1786b409b13834d665a9f520fe8565851ff343101f705e4608922cb9bf7f91e25358
 DIST mpg123-1.20.1.tar.bz2 863792 SHA256 da2941c1905b5776d5468209896502a8d5257966dfadc07f1e4ea105cc515900 SHA512 88e11c5aa84181c457d4b7df7f54d79705552f69ee76197964442d4d817c9dc1e092005feb4ccc59d7ceef428052688c9abf95e49e443afb93ca4645b5b30dd7 WHIRLPOOL b2942a5d816dea735782ba31e334a52ff2a848dcf7f5ac995185f5c4b2e254015d2bde8532c8e14fcf937f82704347db6a045bbb75f2e641c2e8c1b7da09529f
 DIST mpg123-1.21.0.tar.bz2 863177 SHA256 3ad197f77c9ffdf3601e1c3183ae0709ccb3c3de68309527ce9375fcfb15dcba SHA512 8c48037981d3ff8a2e863a781b2d22226a820d63d334c11dcc2868d715ef696ece7a302d1df0550a5fe936ad19ef87bdddf3c8cc8a7339998f229671dc5cc48c WHIRLPOOL 19e4d335f67e181e57acb716337b501aed1c5815dc63a8a69995bee06d6fd0bff8a5e4c86aec09459d5213b8d8bcc27fa99653795a72affad74cea7679eaa5af
-EBUILD mpg123-1.18.1.ebuild 2853 SHA256 0348a6e5759a91196882dda963e450a6bff0480308041dc4ff69bdc64c0d19d9 SHA512 16e4624a174e07b27bc182e77a71beea20e32fbbfa4a07da55204de9e55800140ab17842035eb928deadb9c54fece9e1498ee6c19870ccfbf7e7b6337af0aa95 WHIRLPOOL 460afc7cfbe9a25942a44e666640c41243df50c1a57b743e94927ddf9b61db730f7646edece4f90aa151813a71a919342107a8d31585f97b41b33ae1bc3fa775
-EBUILD mpg123-1.19.0.ebuild 2867 SHA256 f2404fe81a6c92b6b3ec81f2ee13aca497c166b7bf2d55a7ecdc7c9753fe309a SHA512 9ff9fb633d9dab2155f14f51c35d47d25362d42e333539b6c2ed02cef0e79e3028d0840ecd73c10a437b03d5f44668402b28040489db4bcb15a7a9e00204a8cc WHIRLPOOL f3e8884e7384b58eaf17cebdced718816a6ef720d2d76394a0b33e3ae875230148431c1ddad4a50f1e26156e5df133ffad9f712373a791e09ef400a121582b88
-EBUILD mpg123-1.20.0.ebuild 2867 SHA256 b21ff8e62e2fe036f8614a0ba44e4b4dcd7f1979e4fdd31721784c771117df6b SHA512 c4e1d9deff5e9c53240fd398de91b303751c3f8981a3cdf43863ccdbf1f0d2dff59baf40594c70bcd19e7e0e44182f437ddadaf21175478378e1472ede088de6 WHIRLPOOL b30c70a05a01d6119c7701a0781e45e3379ec3455827e8bee443dddc172aaf701c57005eedbd15378c07dab7b6bd5db29501f900037e4abf530a7080162dbd73
-EBUILD mpg123-1.20.1.ebuild 2867 SHA256 66f7026be3a1e55fced45614f74b1b9f555cc0ee9e290509bceeab8f85257537 SHA512 3257d1a925a80370e1f713de3190c307bd6f11a5cc8d267c6fab04ee7188c46c0bddadfc0c9378c7e3ab91fc4c331a90e60cfe84ab461fa30ec9bd6204b6881d WHIRLPOOL ddfb58c0fd03df85bfc916aed9977fba7d7bc2718b7a2e634845cd5dd50aaba08108017be343534f462b7356a1b97d0068b2882f62ca60d8a910985471cebfbb
-EBUILD mpg123-1.21.0.ebuild 2867 SHA256 d0fb21fbee1db59b6e938c11f555a752a27bc5e3696375d6c5e073aa304261c2 SHA512 f61d1c8271b95fb33f0d30a671f13f6aabacc5d704260910f0d3d95910bdcf555ad7d04a986971044a873b6696a1d4a17da632752a13fd295b1cfa0c9cba08d7 WHIRLPOOL 710dc8511c359211e067f640bb8647fea394bee289c1920c515a8b299106011c5e590b6ee140565e6aab35d6856aed6e0a8fb0e6c50b415a811ae9ea556becb9
-MISC ChangeLog 42244 SHA256 5fb1277455312df3c5faa6172bf1dfd193f8f3f84a048e509650793182eafe1d SHA512 e86ec852b34ffe11832d5b1836270f6178aa08c1e047215590e25bcd240d39ee87d8667219b62cc393e155d79ec0ffc41bea675738659b489b30810fb5de6365 WHIRLPOOL 22e79d5dc987055878a278d653b69232229e123f2c0f4caa8daf24486bcb41a168483229db38193fab3916dc8e9b1f35dd7222de89111ec7a2f012fe9bed8f7f
+EBUILD mpg123-1.18.1.ebuild 2982 SHA256 1ea294cf82a525a59133b080ebc0ead1ce17a7b2fc33636b370eca34bc924927 SHA512 44a65843cb27f11bc2348cf43a484fefc6a80b238a36ef8ab19d6c816ecbeeca27c09fef7cc60bd3079f15477e9de20549931f3205af16e720122223f2a2b8af WHIRLPOOL ceb5c2c76e1f30f4061d36068b53354da964fce0eafd0f7e32e656ec713cc239200aa894e15d205efdaa3b710225ca59923b628704947565d6035314616e3045
+EBUILD mpg123-1.19.0.ebuild 2990 SHA256 54c13b9a8b06696720247ebf90f705d6d7d6f8202c2945adb5bbd5a506545051 SHA512 1fa9cdc705734c15a90b439c39fd771fe7ca39c9db4225baf5af12c4c278de40dcb1c9da66374da4d7fbd8d5bbec9006c1b10b283121cf8ff6ecbef8eac8a595 WHIRLPOOL 71ed1442826b64d16c61165aead25e3596d3ee5b64de654895d3e96354c147cb68868e833e3f6fc89fd28f48f479e67b585035da750c757402e6474338261401
+EBUILD mpg123-1.20.0.ebuild 2990 SHA256 f9b38199aee3a703379c0f2945dea44fd33e0c20901b7721ba40a0dd7d785f4d SHA512 6257bc63765c22d5ead1ec11a30fbe79f390ad483b5fa6e66df44cf35ab8cc9a20579e99a33afe63090bdb27ddde3415ab942dbd5f7b25dd4c3583831d9677ea WHIRLPOOL 8fe2fe4f3f87f3600a0e9119f1bb79e4a4750fd2b220b332eb5576b79505f6f091cb2e549befc4ab16e8c015f3c7b130f5fc9368048401178f65a1ff8e6ec024
+EBUILD mpg123-1.20.1.ebuild 2990 SHA256 62aa0001c6054b4c8576d219b96265e4277c64b0434528e7237505a9aa18ff49 SHA512 585aa0e2f630b552143e64340aaa0aa55e1b43b3602471985ec3f716673e07717f5fbc00ad169b56e5162e69c00457251adbd37eb602c2514b5d9da1ab3986a8 WHIRLPOOL dda7c1e536508fe6875a6ad3e58aaa76cd6ac992d46d4a37052e4157380be458c8d451db065a7f60865e39f31d20357e99750a258dd28489312ecf9d331ad078
+EBUILD mpg123-1.21.0.ebuild 2990 SHA256 cb6015430d8f9a4f7b30c037ad438a0f3cabaf89eae58b9cfd6cdc2dbf6676b2 SHA512 ea9d796f3e096b76b18342336b1e60c2a91bfa327ca653325e810ef1403e9cf85654df6cac80d39b7353098c7078288c773b13e346651be19b6abe5701f5ec91 WHIRLPOOL 187c9ce9db9728a65f60a92001828d31bfd9d82202e6cfce2b8f4429be6b71363b27a809586a72cdf4dda4c9f1c04cd7d29fdc79eb6b25a12d82930701cbbe04
+MISC ChangeLog 42436 SHA256 6baafec885d37212844fc62bb43e0076f1ba3712486250f488666aed691f7198 SHA512 4a4ad45c981d816fcc0cf41222697fe423401aaeced360a6e3466bf70dd5223137bffad923cb43f1f4fc1e80728db1b103a14b03e7feb866e19fadc0a2d36796 WHIRLPOOL 63aee4f8ca0170579db40b31e40518f7e354b1fec5733aebc534be20cb4fe88da6dc467edcc2df4bb6364107110a5c0b344f5776872a05ae18892ca4d3318f86
 MISC metadata.xml 492 SHA256 ec073d0ca010ed50d6b671f13cc98a6ee6f221526e56886b469d436c25a6042e SHA512 0cb2796ed7f5eb2696d374b45f83a371944257d177d6c73df0495178dd9e43a56efe947ccdf09dcb306c051f4e00c1af3f95201a32b93ae7eef449fe2acbe7dc WHIRLPOOL 7b1da43b004d4cf690fd16915d0af64207e4ccbf391f8ae1253d14f916a44c92ecfdbe80473c8a0fdff9aa82a7366f42348c97525057ccf1195a8722ff5c67a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlSNs3AACgkQG9wOWsQutdYw5gQAnmio/mbHyw9cZvT8wvPchxZ2
-s3DiK6FGxO9MTWPB8YKnEnqT62l53MBcY3L2ikQbdnVJzcc6aPs9oCk8Ef9Gyte9
-eQ2HKwwLxGIaUTbosnSLckaFnsl92gPVeuCGnCjBSuCRFCmF7o81CnDkiPPuPUJS
-wiHQ+bAFhT9/RwO3A/U=
-=mLMs
+iQJ8BAEBCABmBQJUyoJLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO+HsP+wZePbtHlG66KVRYNyxv/XYW
+1i2FnxHB82yPuBptKt2Hc+7fYWjMuzRo651+9rTPbhUCnnpJxYQ0pyB6r6Hq7m4O
+PcFfHfpK0Uxq9r29w6yzc2AYjrzWspYZitnRySVtdZ2dRXRLaVzCb5jtbi9KGuD4
+RmdZA/HCZ8D/imvNVEns0laSHY0gy4leAIg/tqJtlNRyWQ6cV8W+/syjA0WnCDWi
+HTGsZiMpO5jBkfkoVFJdcJuFj/WkjjSpdVURG0TQUVypU/yz58qNCfgshk9x4sJi
+3FqjyENYf6njgvIB+xk/1pT121jvSSqFJ9RTjVAmzwOh9Er2X0h8JEKC5ZXnU42M
+KN/uiTTZfofI9eKGlS1NZRuCiPwrdSwuRjGy8C0SzWpTzklA/19Rg4G9jl6oY0el
+2jtCxt0M1Cz+F28eH7etFhCmJIrD0L7aL+aYP806PCqjp1EYhPvuPpRJXxafbPNK
+a+4D2jbiMKGqb5THJ81IoJEVyeT5iC/mMB7/xRKrQLA6U/RqvvBAtCweCzyYuF76
+yOPSh3MjsZvZOS/HujtptRqGKsbDZO1KgS9eAOCA4JZyTB9sZhM+GcNDlAGqiVOG
+lio2HfnMOicQAghC1BHiU8GftTWyWHDKBTqFQ0H1kEoUi2QTreSk78QgSPMuC4iT
+mDq4K7LWoyv9XTO1JbO1
+=Evx6
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpg123/mpg123-1.18.1.ebuild b/media-sound/mpg123/mpg123-1.18.1.ebuild
index d5af27f2865a..3406e3700dee 100644
--- a/media-sound/mpg123/mpg123-1.18.1.ebuild
+++ b/media-sound/mpg123/mpg123-1.18.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/mpg123/mpg123-1.18.1.ebuild,v 1.10 2014/06/08 10:51:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.18.1.ebuild,v 1.11 2015/01/29 18:56:09 mgorny Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs libtool multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="3dnow 3dnowext alsa altivec coreaudio int-quality ipv6 jack mmx nas oss portaudio pulseaudio sdl sse"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
 RDEPEND="app-admin/eselect-mpg123
@@ -51,7 +51,7 @@ multilib_src_configure() {
 	use altivec && _cpu=altivec
 
 	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use sse && _cpu=x86-64
+		use cpu_flags_x86_sse && _cpu=x86-64
 	elif use x86 && gcc-specs-pie ; then
 		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
 		_cpu=generic_fpu
@@ -59,10 +59,10 @@ multilib_src_configure() {
 		# ASM doesn't work quite as expected with the Darwin linker
 		_cpu=generic_fpu
 	else
-		use mmx && _cpu=mmx
-		use 3dnow && _cpu=3dnow
-		use sse && _cpu=x86
-		use 3dnowext && _cpu=x86
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
 	fi
 
 	local myconf=""
diff --git a/media-sound/mpg123/mpg123-1.19.0.ebuild b/media-sound/mpg123/mpg123-1.19.0.ebuild
index 475d7a8ee0d4..75b2c866c739 100644
--- a/media-sound/mpg123/mpg123-1.19.0.ebuild
+++ b/media-sound/mpg123/mpg123-1.19.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/mpg123/mpg123-1.19.0.ebuild,v 1.1 2014/03/09 02:16:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.19.0.ebuild,v 1.2 2015/01/29 18:56:09 mgorny Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs libtool multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="3dnow 3dnowext alsa altivec coreaudio int-quality ipv6 jack mmx nas oss portaudio pulseaudio sdl sse"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
 RDEPEND="app-admin/eselect-mpg123
@@ -51,7 +51,7 @@ multilib_src_configure() {
 	use altivec && _cpu=altivec
 
 	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use sse && _cpu=x86-64
+		use cpu_flags_x86_sse && _cpu=x86-64
 	elif use x86 && gcc-specs-pie ; then
 		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
 		_cpu=generic_fpu
@@ -59,10 +59,10 @@ multilib_src_configure() {
 		# ASM doesn't work quite as expected with the Darwin linker
 		_cpu=generic_fpu
 	else
-		use mmx && _cpu=mmx
-		use 3dnow && _cpu=3dnow
-		use sse && _cpu=x86
-		use 3dnowext && _cpu=x86
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
 	fi
 
 	local myconf=""
diff --git a/media-sound/mpg123/mpg123-1.20.0.ebuild b/media-sound/mpg123/mpg123-1.20.0.ebuild
index a140da710200..ce1a9048a141 100644
--- a/media-sound/mpg123/mpg123-1.20.0.ebuild
+++ b/media-sound/mpg123/mpg123-1.20.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/mpg123/mpg123-1.20.0.ebuild,v 1.1 2014/05/27 14:20:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.20.0.ebuild,v 1.2 2015/01/29 18:56:09 mgorny Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs libtool multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="3dnow 3dnowext alsa altivec coreaudio int-quality ipv6 jack mmx nas oss portaudio pulseaudio sdl sse"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
 RDEPEND="app-admin/eselect-mpg123
@@ -51,7 +51,7 @@ multilib_src_configure() {
 	use altivec && _cpu=altivec
 
 	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use sse && _cpu=x86-64
+		use cpu_flags_x86_sse && _cpu=x86-64
 	elif use x86 && gcc-specs-pie ; then
 		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
 		_cpu=generic_fpu
@@ -59,10 +59,10 @@ multilib_src_configure() {
 		# ASM doesn't work quite as expected with the Darwin linker
 		_cpu=generic_fpu
 	else
-		use mmx && _cpu=mmx
-		use 3dnow && _cpu=3dnow
-		use sse && _cpu=x86
-		use 3dnowext && _cpu=x86
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
 	fi
 
 	local myconf=""
diff --git a/media-sound/mpg123/mpg123-1.20.1.ebuild b/media-sound/mpg123/mpg123-1.20.1.ebuild
index 800a9d151261..58b16d98f601 100644
--- a/media-sound/mpg123/mpg123-1.20.1.ebuild
+++ b/media-sound/mpg123/mpg123-1.20.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/mpg123/mpg123-1.20.1.ebuild,v 1.1 2014/06/22 04:24:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.20.1.ebuild,v 1.2 2015/01/29 18:56:09 mgorny Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs libtool multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="3dnow 3dnowext alsa altivec coreaudio int-quality ipv6 jack mmx nas oss portaudio pulseaudio sdl sse"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
 RDEPEND="app-admin/eselect-mpg123
@@ -51,7 +51,7 @@ multilib_src_configure() {
 	use altivec && _cpu=altivec
 
 	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use sse && _cpu=x86-64
+		use cpu_flags_x86_sse && _cpu=x86-64
 	elif use x86 && gcc-specs-pie ; then
 		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
 		_cpu=generic_fpu
@@ -59,10 +59,10 @@ multilib_src_configure() {
 		# ASM doesn't work quite as expected with the Darwin linker
 		_cpu=generic_fpu
 	else
-		use mmx && _cpu=mmx
-		use 3dnow && _cpu=3dnow
-		use sse && _cpu=x86
-		use 3dnowext && _cpu=x86
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
 	fi
 
 	local myconf=""
diff --git a/media-sound/mpg123/mpg123-1.21.0.ebuild b/media-sound/mpg123/mpg123-1.21.0.ebuild
index 8d79b32c6483..a75c38ffd444 100644
--- a/media-sound/mpg123/mpg123-1.21.0.ebuild
+++ b/media-sound/mpg123/mpg123-1.21.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/mpg123/mpg123-1.21.0.ebuild,v 1.1 2014/10/11 20:45:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.21.0.ebuild,v 1.2 2015/01/29 18:56:09 mgorny Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs libtool multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="3dnow 3dnowext alsa altivec coreaudio int-quality ipv6 jack mmx nas oss portaudio pulseaudio sdl sse"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
 RDEPEND="app-admin/eselect-mpg123
@@ -51,7 +51,7 @@ multilib_src_configure() {
 	use altivec && _cpu=altivec
 
 	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use sse && _cpu=x86-64
+		use cpu_flags_x86_sse && _cpu=x86-64
 	elif use x86 && gcc-specs-pie ; then
 		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
 		_cpu=generic_fpu
@@ -59,10 +59,10 @@ multilib_src_configure() {
 		# ASM doesn't work quite as expected with the Darwin linker
 		_cpu=generic_fpu
 	else
-		use mmx && _cpu=mmx
-		use 3dnow && _cpu=3dnow
-		use sse && _cpu=x86
-		use 3dnowext && _cpu=x86
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
 	fi
 
 	local myconf=""
author	Michał Górny <mgorny@gentoo.org>	2015-01-29 18:56:11 +0000
committer	Michał Górny <mgorny@gentoo.org>	2015-01-29 18:56:11 +0000
commit	7a21957547161d06b2d4196544103dcb1d8cab50 (patch)
tree	d15b7064f8b2ca132db4d3a3c79568fb7dfbc61b /media-sound
parent	Version bump. (diff)
download	historical-7a21957547161d06b2d4196544103dcb1d8cab50.tar.gz historical-7a21957547161d06b2d4196544103dcb1d8cab50.tar.bz2 historical-7a21957547161d06b2d4196544103dcb1d8cab50.zip