From 2bff2cd5e4afb71f4ba83951ef59906f9d1219cf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Thu, 29 Jan 2015 17:42:49 +0000
Subject: [PATCH] Switch to CPU_FLAGS_X86.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
---
 media-libs/avidemux-core/ChangeLog            |  5 ++-
 media-libs/avidemux-core/Manifest             | 26 ++++++++++++--
 .../avidemux-core-2.6.2-r1.ebuild             |  6 ++--
 media-libs/devil/ChangeLog                    |  5 ++-
 media-libs/devil/Manifest                     | 26 ++++++++++++--
 media-libs/devil/devil-1.7.8-r2.ebuild        | 10 +++---
 media-libs/flac/ChangeLog                     |  7 ++--
 media-libs/flac/Manifest                      | 26 +++++++++-----
 media-libs/flac/flac-1.3.1-r1.ebuild          |  8 ++---
 media-libs/gegl/ChangeLog                     |  8 +++--
 media-libs/gegl/Manifest                      | 26 ++++++++++----
 media-libs/gegl/gegl-0.2.0-r2.ebuild          | 10 +++---
 media-libs/gegl/gegl-9999.ebuild              | 10 +++---
 media-libs/lensfun/ChangeLog                  |  6 +++-
 media-libs/lensfun/Manifest                   | 26 ++++++++++----
 media-libs/lensfun/lensfun-0.2.8-r1.ebuild    |  8 ++---
 media-libs/lensfun/lensfun-0.2.8.ebuild       | 10 +++---
 media-libs/lensfun/lensfun-0.3.0.ebuild       | 10 +++---
 media-libs/libde265/ChangeLog                 |  9 +++--
 media-libs/libde265/Manifest                  | 34 ++++++++++---------
 media-libs/libde265/libde265-0.9.ebuild       |  8 ++---
 media-libs/libde265/libde265-9999.ebuild      |  8 ++---
 media-libs/libggi/ChangeLog                   |  7 ++--
 media-libs/libggi/Manifest                    | 30 +++++++++++-----
 media-libs/libggi/libggi-2.2.2.ebuild         |  8 ++---
 media-libs/libmpeg3/ChangeLog                 |  8 +++--
 media-libs/libmpeg3/Manifest                  | 34 ++++++++++---------
 media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild    | 10 +++---
 media-libs/libmpeg3/libmpeg3-1.8.ebuild       | 10 +++---
 media-libs/libsbsms/ChangeLog                 |  8 +++--
 media-libs/libsbsms/Manifest                  | 30 ++++++++++------
 media-libs/libsbsms/libsbsms-2.0.0.ebuild     |  8 ++---
 media-libs/libsbsms/libsbsms-2.0.1.ebuild     |  8 ++---
 media-libs/libsbsms/libsbsms-2.0.2.ebuild     |  8 ++---
 media-libs/libsidplayfp/ChangeLog             |  7 ++--
 media-libs/libsidplayfp/Manifest              | 34 ++++++++++---------
 .../libsidplayfp/libsidplayfp-1.1.0.ebuild    |  8 ++---
 37 files changed, 323 insertions(+), 187 deletions(-)

diff --git a/media-libs/avidemux-core/ChangeLog b/media-libs/avidemux-core/ChangeLog
index 4f36a8c6422c..f15a60756874 100644
--- a/media-libs/avidemux-core/ChangeLog
+++ b/media-libs/avidemux-core/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/avidemux-core
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.25 2015/01/06 19:39:11 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.26 2015/01/29 17:24:24 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> avidemux-core-2.6.2-r1.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   06 Jan 2015; Manuel Rüger <mrueg@gentoo.org> avidemux-core-2.6.5.ebuild,
   avidemux-core-2.6.7.ebuild, avidemux-core-2.6.8.ebuild,
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 067ed463c3a0..0dc60b914afa 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,15 +1,37 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d8744496578d1c77957ab103fdb6 SHA512 1ba6f1c751732eec9fdceb2b0728122005ceab4c74ac09d213ebeff4c2af2a0b6ce8737d88e7c43970d1b9ca80cb36ad925efc9e4a487c4f463f1435aee328b3 WHIRLPOOL 0c95e87293251fffb773c8a1996ac015ba0d6f9d36d4f5ae01313c0532d2cf020a3ba0704d0f607347bbf0444e10857d7508fcbd968d62e889d7b62b36b85df7
 DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc WHIRLPOOL 899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf
 DIST avidemux_2.6.4.tar.gz 17109929 SHA256 2937c6c09248445942ac7e71b100ff8f7e272c4ad9c38e7d8c519ce4a11cec44 SHA512 1b80f65ac5a1da844b521a82bab8976d01c81923460004dc76ed0f6994f95da0ad9a836c90ffa1595ad060f0d6f27ce30add0204ca9d5295084a62e79dd484c9 WHIRLPOOL a1cbfcfeafa163ed24881edb085126a69eca3e0e8eaee50091ceadb993105a0cb43068b7725fa54871bc04b20ca5b51650ac536688b1d1f8d5b0a2d7356459ef
 DIST avidemux_2.6.5.tar.gz 17322253 SHA256 428e1f6d99e2d854ccdcb68f2260d853c47c809eee6bd92f151cb298d98b1861 SHA512 e7f8be29812ca787a1ec2cfddb1c611e1032ed94f24f41c0684f106970085bb6d219c822f3e713c472508a3f7b306540d2cabeb665bdbac061a49bccf8c23a80 WHIRLPOOL 192ce60afe4634319567cd7a1440ba212d83e02c054d6625ad738955fde02d0e722eba948c60932f520bb5e76c46ebbab0001230c1da50d893fb99a18f1da76f
 DIST avidemux_2.6.7.tar.gz 17337193 SHA256 d28202273d23be85c748c12d6e4df5e013bb861ea52b9bac7e0f90ba3d23249f SHA512 deea9811a0b6f618fab2ecf63c675b37dac12ea0ab09136a6b251e13601cd62cdc1c97d032762ea54f38e07275380106026541243bc87e230ce302fb821f2e5c WHIRLPOOL a41c338fc51e14d2c900dcef86a3887f94164548e8b904945d47915a78db907d152fda4ae53e5c37bf368348ff9912b529005a271f85d993776f042b5b997553
 DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6
-EBUILD avidemux-core-2.6.2-r1.ebuild 3898 SHA256 56d329e732b886ed403e8d87a16241adddd25e5420f5d0f389867b5019152e7e SHA512 04337c6cd839cf658021d71c44ca45adc8ccd5fcd2a60a64708e5fb8cdf7f6846550a7cb2e3b6bc762062efb7258d6dfd3b00d34d3072f78507fcef931e098c2 WHIRLPOOL 07f216e71aa3bc21a4747a3377f087371b5da6d240963cf68b2683eaa49d08cb474462b8be96e0dd26b73324279d92e314351393d06b731c9b04f0f60b14135c
+EBUILD avidemux-core-2.6.2-r1.ebuild 3913 SHA256 0367b27b5e966bea07c4d97a7c06afca87ee87283851b09f491159f2ef05f787 SHA512 b5b597b44c761572561b3aa85b4a45ce2c5478b17eac7c3b620038164a77ac0d0464c7caec494dd4703ee6d52b58dbe7dc57cf684451bebe50691ef71bc9c699 WHIRLPOOL 2fb3d5f7d4a154190b3b6941fb0e88ef1c94a8b9f96dcafadce5ca83956c24b532a3dd1cc2b493bdd32a346bbf275292b969fe961f087c5250e2d4fa8ecdf9b6
 EBUILD avidemux-core-2.6.3.ebuild 3279 SHA256 5d0b858c4970b19136a3da5d8e0d3bc1e249f82615ce4343d7c96fb1b66f1ee3 SHA512 97df89e479fdb4aff19b0797a385a308efe3e24757e4f4eb1388b069c69e8049dd2f2e02b0f374c80e5fbe89eac8c3752cd56d601e111f5c70254eac61562bc1 WHIRLPOOL 04e68bc36ce1a028cea86151f53bf8ef6f780d3a3c339ce9bd947ef00e9ec82ad48e58264035bbe64ed513206517c2615069e62fa0950fe6467360ca82e2bb4f
 EBUILD avidemux-core-2.6.4.ebuild 3251 SHA256 006d813cbdd1befdcbe34425fed4546f7e9f92a185460768f63433bca5146a9f SHA512 a977ba19f61ca385bc6d539517fc0941c978ccbeeef3590ca766a9565149c12bf898b77c1c3c1aeb5dfe849139e4a3f2209f191b6e3259b7878d4ef026bc9d87 WHIRLPOOL e0d725156ce99323b329b81eb64447e9507d2e64d732598cd430575744ce0d4ddcba140e24d7062abc460a9c11f237927e3999a182501c5891a2f43ef2b9feb7
 EBUILD avidemux-core-2.6.5.ebuild 3300 SHA256 b38c193c67d76a1fa36f6cea4d8307fa647d00d0ac42ab5cae40872078d1f3d9 SHA512 b42c1797b571db9d37d5edc79f432bbb4aaab9b40d42d2d220c3c7dd337c48d558c60cbd0b55cfaf441aa608573382c348081c934a0c3c65df74b0c81e4d7dc4 WHIRLPOOL db3ddd84eba6651b65c1518ca70a3fe64244cd8def1c10e9519c7570ad57ae94e4b627dfa9d25a51bbb0d4db8bd0dfb09c0caf9944c911858ac2db0560b44356
 EBUILD avidemux-core-2.6.7.ebuild 3309 SHA256 ca501dc78affce3645291290cd0d1d071ec7053cb3d78bb178107e99c258bb8c SHA512 a30218b29de5d210e1bf5324dc0c516c8d227562c7917433a56cdcb1c4a736ace592398514c4dc85380b92ad62a9daa017a6547f82b373f59b70e374ecd6f266 WHIRLPOOL 9e7e7da4b6c8340edc1f153a6a9d3130afce0cd975ffa5bbd1bd3e938dfbf24434c65bab64cd3741081ea4a0d8063b9507ea7ce420b262fe49d97237bd7035f7
 EBUILD avidemux-core-2.6.8.ebuild 3309 SHA256 b47e4d67bd7c4a5dab180833c095cd7614b946535e429eb89e8819edec9b46f2 SHA512 bcf97c65e6748c23090276043871dd7c099124d5b946ebe0396ddffb0f2cc06705cccbb6041f2045f2519044710adcdd6248205cf4b1b39abf60104a6f7a197d WHIRLPOOL 3696d7b1eac07b29a940fb19221bf1e6d309f6ca02c04c161b81105c947134326b079e6fd03ee9a7989f2836e63ab4396083c56ddca22e7fdfa9b7338fc82ba0
 EBUILD avidemux-core-9999.ebuild 3309 SHA256 50f1b8e60c765fe0c07441718829426e47eb2db5cd461e37c5fb180f4938dc37 SHA512 dd236fc8eaccdd617cf97ccc71367bf5423a041d7377eb961f4aad54a761f6277ec97432636db3fe013def7b5832c17a5a23e4bd4ef1540da6aff2481c76fc52 WHIRLPOOL 88d7ff9c5327584a521ba1113aba5b830806ac0d852f5ca57f59708cadb9c4fd125bae4c4067795a39babe8e36afc4c70622eac1506bb993c331a1a14e71f4a2
-MISC ChangeLog 4710 SHA256 411e80ce0fe5120c82d1b7aa1552f8af919aee100575a34c15e7bc429b53b447 SHA512 b9270d3217fad52eaecad59a890f234751193351a4850d9f06fca664f133d53d8063c04494c843dc2040c7368a638070a5efd8cc7c652a4eb34cb7a90d2cf7f1 WHIRLPOOL 5f0e3f8270b09ca2989cac57177bef4e66dfe27b81fbaebc7954c4d1bdd9a1be55db561d7b07f2aea97ca23d175d52a25e1582b79cb088c9fabdf7a827c8c294
+MISC ChangeLog 4820 SHA256 40f82912cf09dcfc5ab20cbe992fafce6cf8dd376a4346f40b7b9383c1a8d5ce SHA512 c1a1eb6d72c1b0c2e7340338b6cc4e33adb3885015e6c837776bba225a868b1660de061fd9e2f11409011a17420e6109e9a375222d59cd775d2243f1b73245db WHIRLPOOL 88117b9d06f4c718d3a7716526d6be4d88ca519a89a5d3ad88ffdd4949b9aa159e5d76d5bddbba650126015eac9003440bfd1bbb2605b24040d230452d839f35
 MISC metadata.xml 436 SHA256 c65fe3135372d64dd3ed901279b93c6865f8572ed9794c6867fd5dea14d4253b SHA512 5bf1bf809c5ce64827cca1aec7c752f853bff627fa75ac5dfa2db53ff1ac0553270346ce88888a7d9340735669e10bb0d0fa284e4ee7438d056b9bcdbc0efc9a WHIRLPOOL 21490eb650b127212b527fdff9e8dc23f83efdab96886f4950a0682aacc172edc9df91928beaa1639a9acb9d9f15eec28730188ff02562c28487c1203888461d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUymzJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7xcQALCgPGojTE38Q4UsDJ0SHFsy
+09hUSRkY0tcB27CtASArc0mwf8gZ9kMzrxyWDRvWQZice/14EzzjbEuVaKV6J8TP
+KfhJbpOq6IkqMQrAuvf2pnd+nAYy8OQFkjleBGAPGYkCtvSjE56BcNGIXdHg7KC6
+leK6bDvwIfkTBBgOUT4Jf07zG779OEmtVxUIgi3WzVmLQRqhmQNkm5V5aXynyKLD
+BzaVfcllSGQBLrs7MO+egtdX9ruWfotRB5kOGXyVOTbh+ujiqgHc+qn03WX6Wgp7
+RqDUavTY4BqzckjCSSfxGs9BF4elDA9mHAJv1xgQQmiUVragsQAsV/POwMd7Qf9E
+H7LywvJuXzhBkF6MTbqRJFfCE8zmGMBx1XkUWDrTinGXE3fqgqSdiK7NraYK1woK
+ALHGUlECwlbWD6crfHd8DEGsYf7f4scCBU3TNT7KaWNb7ZMmINrcjD1vnPUQBLyd
+hIF0jSs/L+eKR29RU64ikcE405N9L7NMbqR5k3cbNJuQ39+lGQqGGEy35U2gFP5x
+6PcT2a7lJJCZS9CXyt2WMUBw0Yek4ucAK7wLYptYg8VUdbkJ2+i0z0GDe4OvXcYs
+UiRNMuoQJVyLlPsbT/FYGS1kJfvnb9YDtNGawasqjik/llFCEAyBQOrhvRIm73Rc
+2KoN/OuhoOkLvp+iIXpr
+=FF8e
+-----END PGP SIGNATURE-----
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild
index 64f031339e0d..db6ef8bc4eca 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild,v 1.9 2014/08/10 21:07:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild,v 1.10 2015/01/29 17:24:24 mgorny Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts fontconfig jack lame libsamplerate mmx oss nls sdl -system-ffmpeg vorbis truetype xvid x264 xv"
+IUSE="aften a52 alsa amr debug dts fontconfig jack lame libsamplerate cpu_flags_x86_mmx oss nls sdl -system-ffmpeg vorbis truetype xvid x264 xv"
 
 RDEPEND="
 	!<media-video/avidemux-2.6.2-r1:${SLOT}
diff --git a/media-libs/devil/ChangeLog b/media-libs/devil/ChangeLog
index 5c96f29cd411..ae2cb497eb15 100644
--- a/media-libs/devil/ChangeLog
+++ b/media-libs/devil/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/devil
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.64 2015/01/22 08:28:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.65 2015/01/29 17:28:34 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> devil-1.7.8-r2.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   22 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org> -devil-1.7.8-r1.ebuild:
   old
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index 4665e5768840..d421026d87cf 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX devil-1.7.8-CVE-2009-3994.patch 443 SHA256 856c0f3f5b24b4474acaf84277441a390d13fcdd86e9ed19623de07a6261ef90 SHA512 b5e720e24f2e97e19c694224281a41466296de9e3bc3a4dddf7a5a0881c8f49af864625f1b46e37cd9d113d0b7e7f95b1720e5b49be679e2c7ad6169cd52729f WHIRLPOOL 179af1739cfa54cc4206c454a5632adff123be2c98c12cfb6ce668f6f17fe4238b747a77f9972cd9533c4de425b3acced180a9a1559f85163e406fc51623412e
 AUX devil-1.7.8-ILUT.patch 667 SHA256 a100cda1db97f7e90cc864589b89294f18aee05f2ef4907dde0c8cf03845160d SHA512 e36d441a2f7e56a7affc858de7447a558a9b73037bec3d0544126c5fdc2d3d580acb314f666db2a9cdaa8f78586ecafd8bb211ed0a921b32d23e49f3780145a2 WHIRLPOOL 5d241a7f1a3bc95652217903fce8abc578c02200b40ffd665d2f0207a65ee32318064f9416da17d0141e106ec9c1d526ad4acaf5cc5aa617eda972a3779b70d5
 AUX devil-1.7.8-libpng14.patch 1221 SHA256 bd1da681157678fcffcaba5ec2f7f2d33ad9971816ea33dedcf2721ad0ab4536 SHA512 cca76f7f6702ee8341ef68f36f36ade358662a38294e6e2badf7944e2c5b194d1098eb24e9c57e4101b3b110548d106cf8e3ed7ac55281d96428c07cbf6396d0 WHIRLPOOL 06178a97bfa6a67ef50bc26887f6ec4067c0db21c97a518032d75005b18658500262ad22c74e7df0cbe6a66e09eedbb3e57fac25eb06590a2be2e3828af748e9
 AUX devil-1.7.8-nvtt-glut.patch 2477 SHA256 7660558de9615d617027f501f93e7472647696fb5cd7c02dee31cb2a42969383 SHA512 08fc08f2ef37a19eb0d5f0d904814d659ff6133f479a323420d8cc1922b2c836e5f7d23cc52bddd723fe51a747cc40646df75c16fdb3c2a1a08a1967f0d842e0 WHIRLPOOL 96a17dff33a6c0daa7833b223078bb3df7a95b965bee0ec1b05aa2caa2a15e46a2a8b4e5bedd4c504f070102cf8e2cc99a41042291b55803c76b4ee61b050070
 DIST DevIL-1.7.8.tar.gz 2051993 SHA256 682ffa3fc894686156337b8ce473c954bf3f4fb0f3ecac159c73db632d28a8fd SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e WHIRLPOOL 749bf0ce73786709414d6f2c3bf29b20c56397cb6f9f92b4158902a98a4f4d0ef66d78096ce8daea3d65b1718c5255421055cd223e9269f6c773ca310c2df146
-EBUILD devil-1.7.8-r2.ebuild 1941 SHA256 fa3c991e48c67a7f29028bf676429d293fff98827145cca70e8d2c270cb9db45 SHA512 162fdf9766d3a258c0658a3a32b311f932ec911bb04c7b338e7cde50e2142d411dea6343d7f671523ae925af592426e9569eebe3521a27174216802a58242a37 WHIRLPOOL a4edff69cdafd1151df0e81668782542c985d69400119fb5057a5738a552dcb83f3608f49cbae3a7e3c2b5150240b93a4b971acfab1853d62aff0f84c85cb48f
-MISC ChangeLog 8028 SHA256 c52d52f5a0f23c6b9717b0f26bd65ce37535460a7012f153825b34b0afb918dc SHA512 3f5d3b7adfd6eaae4680a68a80a3a12d02ba747e898fdc40f97163f940ab16dd2db9582fe7dbe6c990a3ae5c5188356f6330a6aa958933ce4123e114ced9eda5 WHIRLPOOL 8be1a63c799c491ff56d690141d05c0cc957f88f478e3467e0ebcd36bf7463f742d195be28c17f67102230b2b847625f989e04429332a8db80a4caf0813789ad
+EBUILD devil-1.7.8-r2.ebuild 2038 SHA256 50f8fac0e10aa6a732cc727442a23bfde22112c5c02c64cabd49f76239b9c354 SHA512 59169468e117bd5cc45a8cbbc83a89bfc43748b65bd9c26ed19073a220611fb0c39f75db08a86f9def01534f8f55698918c1f37eb7dda0fa6106a7ae7c586f5e WHIRLPOOL 96d2e5ff587bc2cc77931b2132aa99e9620f3eab0bafd057df1d87ac9368e4bd67b401769ca44db27c88ce5a5e9cb1c2c9ddfda29aa8a31f71f19cdfeb760088
+MISC ChangeLog 8126 SHA256 f90f0b9a9a41e5a5b595a9f388146f2c85dcd8c55067d7569ffd2c97fca09434 SHA512 f3cb04d7d2d47552e1bc9fbe14cd36921d75cb666d038785c3c8f6dfe14d89d8e403157c2ccd538b2266d5a5e5bebd6bbc30ded23358c25d2fb77110de5d84f8 WHIRLPOOL e89f42f7204552eca0084b92129c32e4a9bab2cb848c71d6220531b9b83ecf1fd9d5e59e9c08489d43ad07ce204027fc88241ec30a3eaf1460ec8285c2ecfa05
 MISC metadata.xml 316 SHA256 388c820e32109098344e929245c2cc8e5d208aeafb5bac00c684851f9f44099b SHA512 bb18bf810ad2d70eab915a10e3bc1f1029639649d9f1fc8ee330d7f1ec0ef7ae8e6699dcdf64ab14635bde4088c8ac5afd9b9280b24a269e8efd1643ae1fa5af WHIRLPOOL 7ac9e392a5ce6a832d7493ffdb6818989eccad99ffdc7871f32d7b11c7c7b19dc28763d162b65f16424d997bd1c857d299a30c6edaca3da709c8314ad4e07b1e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUym3DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOlUgP/ivECQYm21nNw0UoNPyVUamC
+RTSxrJCfZN+r8hxyDpc758KKQ53N1CeDZsEZU2cvNqmmZMsu8fw6aiWRaiEjiino
+dk89xVpWl2Cys0C0jbujiVVf5n9FjTIyoY5+s1TzOuFEt0sSNkXJrXNBnrgGlYQo
+kTCjCU4Im3jFP/elpz9pDhXPEgORNJgSgEzHLVKdguZOH/zNMAG0aZMG6+D7u6Il
+DTpoio4rCZGxMSc3QivzRBss552J7BgNW1DNSy+CtNnEcUof9KtI7iIxYQIbBWEP
+/jKkYyOu7fPpyzdiLiUvwh47LzxXVQLA8fDwuxJvm66/AihmUEsT8rZRNg5q5gO3
+eZLts4j1rjwEc40TPMYWDBLt2NGti8EKih5VYNdykdWVSXFUajLAPBpZ+PvA0E9r
+t63fmNBBcH12Q3zk82HOVILp5/tBxakXDa+cqYuIqVq+/pI2c0QxdhEcBXKOXVk2
+5oyeOqoFb0Cipq6DPVqqlpDOnxQWsRMuzMosvfcuaBpPBxdUCGRu5r4eCvwoBDmc
+vv8MSI7qElux29d1A9RA/vl/XBa0RMeUHg1aVSWgPef/fXb/D1GgxMhKaUVt5ojJ
+lkSnS2uLNy1TfxfvxEB2u7DVOB1/lLW+O3HJZDEdvpzLqgXZdLBuiYY/fgk/kS/4
+J2ZKjFjC/Mhxxg/wGKQc
+=oOQO
+-----END PGP SIGNATURE-----
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
index 02a844d49f62..5dc89b7885a8 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.7.8-r2.ebuild,v 1.2 2015/01/02 14:37:42 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.7.8-r2.ebuild,v 1.3 2015/01/29 17:28:34 mgorny Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86"
-IUSE="allegro gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl sse sse2 sse3 static-libs tiff xpm X"
+IUSE="allegro gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static-libs tiff xpm X"
 
 RDEPEND="allegro? ( media-libs/allegro:0 )
 	gif? ( media-libs/giflib )
@@ -48,9 +48,9 @@ src_configure() {
 		--disable-lcms \
 		--enable-ILU \
 		--enable-ILUT \
-		$(use_enable sse) \
-		$(use_enable sse2) \
-		$(use_enable sse3) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
 		$(use_enable openexr exr) \
 		$(use_enable gif) \
 		$(use_enable jpeg) \
diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 138942411b1c..f2b33a754888 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/flac
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.194 2014/12/24 17:08:42 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.195 2015/01/29 17:30:46 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> flac-1.3.1-r1.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   24 Dec 2014; Tim Harder <radhermit@gentoo.org> -flac-1.2.1-r3.ebuild,
   -flac-1.2.1-r4.ebuild, -flac-1.2.1-r5.ebuild, -flac-1.3.0.ebuild,
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 18d4dfc80c78..a4bc3c1fd7d5 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -6,17 +6,25 @@ AUX flac-1.3.0-dontbuild-examples.patch 723 SHA256 8330ab837796cf94eb5c62c8ef787
 AUX flac-1.3.0-dontbuild-tests.patch 2111 SHA256 31d1a8bb80d623db4cbac8182e3b2027b8498f9bf77d5baf38acea9558dea970 SHA512 50329cdb766111dbda41856363cbba74dc92e7348605e086697778e7004cce514ff9452c1d5bd72e327c9d7182af218e74d82625f6cdcb977a7dad1cf3d07995 WHIRLPOOL 4ab0ea936c6d4f9e28684f806c86dbe94bd082892ecdf4c5b4917cf3a738ad544e9f2336b678f904c2614b8e8c33aadf1326583605e5a6917e7fd87f1f5f4b00
 AUX flac-1.3.1-cflags.patch 786 SHA256 077cbb1c3254218e257bcee5ae1b22b5cadd02eba085163c8bc51da2041e1862 SHA512 4c639023861b8508d7a1be2bdafd4ff33d398b2399ce97350890b25394c4ebd9745d622053305723cc85acb2391b46364caba1cdbf3b3723a9cf05971306b7b0 WHIRLPOOL 54a918b35e656568663f0abb134191d5520866811a9c37631e5d48602987e2db2f842884c4c7eb1f764da82eb6bdbb27ec1a25e7e0cffbea60b159e347796985
 DIST flac-1.3.1.tar.xz 941848 SHA256 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c SHA512 923cd0ffe2155636febf2b4633791bc83370d57080461b97ebb69ea21a4b1be7c0ff376c7fc8ca3979af4714e761112114a24b49ff6c80228b58b929db6e96d5 WHIRLPOOL abda096c0c1392499a613cc99c917cd519a20936bb98390a466c971ee981385a0e249e80f0bdac27b1eb6566a3392c1a4cb6ff9a6695952f16127a0b290fa5d4
-EBUILD flac-1.3.1-r1.ebuild 2002 SHA256 dff8f19f0e090a655cdf8fc0359d452f40b79636118bf4233ac41c240dc47865 SHA512 ee9da0ad9588864fe496964bad92baa1a3def98b357f84a6ee57fc39d3c1b919fd8dbccdc8b2ec6ae4285c38196ac51a06c09cb7ef1d3d0d9db4b943d9a9ff79 WHIRLPOOL 0b3aeedac5784014576687ab54182c7892df226b3de19de661533a91ff28848aa536627437db30d9f65084e04ef037f20f8b638e955c5cdc9c33bbb7a1905a41
-MISC ChangeLog 27466 SHA256 fdfddd6abe923fba250c8c1689e1e94bd9a97baebc1da51e11c32985ba47b389 SHA512 28085cd3a28bae29dca5f23b1e62e144a6d74de1f8009b2f8ad4caf675fe8bfc6bf6c2d432f5a076c2f62c0a35809064411296c7077dbf35fef32a1c05556805 WHIRLPOOL 261763742c3c4b7d3c5cb5469759342a28db2645978b0895fb3c1eee1056999887db623abd0cb7f09eb9058459a931e981960104a7e45b5d755fb2ffc964e190
+EBUILD flac-1.3.1-r1.ebuild 2037 SHA256 a8523eb553cd2cbad2e2dd84d9bdb8d552836fbf93863035fa8f914574a82aa4 SHA512 989da1cf1d0f9f175d821eb7273e06fd7bd3a3fd7ce4d4b640de4fb9fa1bd876cf81eb37bd5cf61b106e35d3b9d1ca9acc35b6530976446dcefb22f3ab55248c WHIRLPOOL 77bd27f129f6419a0cac332172da2f5910709e115f4b90180950ab5113aabff0752e6ec96cf2aebe42917f06dea510cfd44a962921e323fae7d014d937545bfd
+MISC ChangeLog 27563 SHA256 dfb1f1e3db0136ce715ed033a9e86c184df84507010c0624c519d039dba0bec4 SHA512 e7c919763f9f2a3669af37510d68cfac2e2773e3101b3c076d59caa2b186a201a66d94c7323e172fab2ca037b696f8b39abe89fc015472b5d03c40819e8413b3 WHIRLPOOL 540cef712fed63dfca0ea7678755ea1cc31951cccf53b8150403709d0ddf2a9fc5a79aca642c7b47d137e95fb6c7535bb0e01ccfd0090c5c4f334e1473ff4f02
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUmvMsAAoJEEqz6FtPBkyjwzwH/0WaIChVI5glczUgs8Fn9RjJ
-MFXjUzTbMRn1nZQyJZCuu0PweKcCCqi6h7C4V+xa0iWu1s9/xBIOzu7WfU7iO5Yx
-hn/OsbLFB6k9HXWtNjy49bdchKPuqZb9nzcMv4QUoj6RKZp4LxJGiYmTb0SFrhjU
-mdR8JfRXyUlMK2CJblokf1fLojuh2mxL+8UVguW4abUmnGCGFpbFtBaAu8mgW56z
-j5afrD0iEErSFUKfZSxLoqIcH8DOSn/ICMJUk3/EOvtpbILty+SHlWJ3WXPCWW6i
-RA8dHVGo88EBirZEjRqjPWmNucslCuuUwTFSKIO9FK4nZUGRWt1qpq11hixpvY4=
-=3ddA
+iQJ8BAEBCABmBQJUym5HXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO0sQQAM5JLwmUY2RJTqPF0+VU38jF
+cWAZHOiZVGzHvVzyWaaNfWsd8E8w0qjHowgTGFAue5gI5KYqw1P6Zft/AUadHYRc
+biB7hlgRvzh6t73+9Z9dv2GDstN8IOeLJS0nmtJMjYbQZUb3wxs3WCiPRGd8q6bE
+AZO+ixaJU+nLpMfr4MQKjhfd9pmO948iyU2IZJgDJQi5xCRwV/d01aqZv/p2FYe1
+tTDXiuA+2DtVgObxy6PC2pqgPMj+V86Jn9SSNUvXRw0kdvNL3SLEoqGLsGGg+FEj
+vIhu/LEKoRL0BBj2kRNQHp3R/++JHpKIZ0D5im2fDFnlorFBv+b92ROZ0FcjI5oY
+ecStReMC51d3M7nY6UvTCyy+uDIPXlSIK220SXMgUuemxJxa+3LkLorhWoEoazuZ
+wbcltpXv5/rkzLRBGG0C+BpjuXxH67lOwIZUJHC9rdielNmSU1/xEiIvml6RedBV
+IodLrSgrI/NuJBYDJXqjtCNjAK3WmoA0CT7LNvniZWm8oe9lhWqsJn5M4YyE7Xmm
+nJhk1cS7WsIHyJaBWd+d7HIFbxSibkxPHsvYmKF6wD3+NFRu1SJOOG8Rja8KnReA
+wjaSfb4qJv/e6ZmnrsNnvBV2jyZ3btjmHh+RZFKmHzRAZULcjsB0Bomsho9Nzba1
+YLhIuKhWM4RIpbu+Ic/m
+=Skdx
 -----END PGP SIGNATURE-----
diff --git a/media-libs/flac/flac-1.3.1-r1.ebuild b/media-libs/flac/flac-1.3.1-r1.ebuild
index 634b5c797996..161f40b44044 100644
--- a/media-libs/flac/flac-1.3.1-r1.ebuild
+++ b/media-libs/flac/flac-1.3.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-libs/flac/flac-1.3.1-r1.ebuild,v 1.12 2014/12/24 14:45:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.3.1-r1.ebuild,v 1.13 2015/01/29 17:30:46 mgorny Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -15,7 +15,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="altivec +cxx debug ogg sse static-libs"
+IUSE="altivec +cxx debug ogg cpu_flags_x86_sse static-libs"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
@@ -42,7 +42,7 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
-		$(use_enable sse)
+		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable altivec)
 		--disable-doxygen-docs
 		--disable-xmms-plugin
diff --git a/media-libs/gegl/ChangeLog b/media-libs/gegl/ChangeLog
index 1e346181ee78..488d63629a97 100644
--- a/media-libs/gegl/ChangeLog
+++ b/media-libs/gegl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gegl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.106 2014/04/23 21:15:06 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.107 2015/01/29 17:33:00 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> gegl-0.2.0-r2.ebuild,
+  gegl-9999.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   23 Apr 2014; Pacho Ramos <pacho@gentoo.org> -gegl-0.1.6-r1.ebuild,
   -gegl-0.1.6.ebuild, -gegl-0.1.8-r1.ebuild:
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 9252290cd060..3603da81508c 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -12,14 +12,26 @@ AUX gegl-0.2.0-introspection-version.patch 1233 SHA256 7238b314bcefedb0cc6e9d655
 AUX gegl-doubledestdir.diff 438 SHA256 a39da1569b510092ba345f52f33486fc246165ffd0f84d0129d29e77a26ccc2b SHA512 dcfd999de171ebc80a4016d380793ea5bf39bfb4839715acd01a26edd28dea0a81cc31e92343934a6940f5aece8b2fc476f3328ba45343a3995e79040560b131 WHIRLPOOL da248cfb52a39157d0ef010121182151a00ad684e354c8d3fd2110d64344ca80f77acea5cf0c22ee6467a63ca43d6c2efc846d74137d1a9262d56baa042bad1f
 AUX replace-imgconvert-by-swsscale.patch 2154 SHA256 d0470dd22814afffbbb2fffa7fc9488129b9cae715f26c8330eea913550885dc SHA512 e988ea43516b5664ed8e359e1d964875916540f617b810e958f0644efc98f41abaed6c6cac41c049524dd85decf8819382fb49a5ddd3df42c12747a16fed79e1 WHIRLPOOL 0f28afaf5b9bedb18b178f5df9eddbfc6219899a189e16e15bbeed5da1d1417c55988cf1b6ee5da643fe7494c53f54c2d531cf2d543c94f03869279947b73ef0
 DIST gegl-0.2.0.tar.bz2 7502040 SHA256 df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8 WHIRLPOOL 74e9c18b095526b1d053f0700b3c3776197a5c1066cb77adb7c83f154aae9087319f7b7f0379fb9e895a5ef3ac62ebf05e2158c1d18180bafcef41dff096c01d
-EBUILD gegl-0.2.0-r2.ebuild 4607 SHA256 37ff44cc6602885dccbc6afacb04b160812483e0100aebc2c73e228f6e27df88 SHA512 7643de79f23501af630dc87a24de5dc3c7b2b64c6ff38814cf2fca9b022f2dbfdcaf529d601272ed64bb41c97e1ba383dbe7ab9693f809a2aa05161b909ef1d9 WHIRLPOOL 97392ccd3222069ffdd72d1c976a700ae8c34993e8e3f608f93eb38f92db6bc1205246906fb05d187c7994b5c80820547f4f69a739ef286269ad3ed5f139bcab
-EBUILD gegl-9999.ebuild 3764 SHA256 9924ae618a8d35b3d3c968ad9927e27afc826b142e0db9fd53a8c27209e19a16 SHA512 00e4aeb9b49aa573bcabc6e7ab953bcdd993a9b65c9eedc56d2731853d0d7d02fd3d17ea7f69d07fdf2713309a5f50560612177f46a26b70eda9bdc45c92eb41 WHIRLPOOL cd93dc7d24e05696e3d6568f4af0dc195ed46d4d152ded5db657f2e3d7fe6ac6c15ed09f9ca7c07d3e3b7da291b43263c2d3d350846b400d2c4e6e215ccdc20a
-MISC ChangeLog 14543 SHA256 b0b846ecf4b70ae9c5ce4aa6cc1a3fc5f090c927bb910247210fb4574d4d7a27 SHA512 03664b5e0e129901d1cc15ba4e2771b228e1835e1dd4b607d1ba60c12abc436a0913f736112d5630cdfbc5915be734e70f06e63344e99086a525976dbe0be267 WHIRLPOOL 929ac00785cfc89fe2970c2e42689d7a67e43eaccdf0b16ecdf42cedcba2fd50c32db8dff5d463f67876dd5796466c6369eba21b9563b1324a6e575b299fffae
+EBUILD gegl-0.2.0-r2.ebuild 4670 SHA256 3293913e057641ffdf159f4baff1171cd3ce69879c6081fbdcd87c6556000d4e SHA512 3dbe1297e34926c2b4bc5497e6ce726fe99abba1df891e78ea6f24e96d59e06e455e4d0e7cbf3084209c679266ee2bea38babdf322cea65ab86fc9b87951f34e WHIRLPOOL 532d59bce62391d10cb35cfbc97357abc9d677b678d1690f147fda1fd449a659e5443e4d88f2bf1d87925b899c567dee6875dca7fc1c0af2d115e169385e5dda
+EBUILD gegl-9999.ebuild 3829 SHA256 eeac42373cbd48aa9c33198825f7da86819ab87741161a2694cb69361a053da1 SHA512 db55435eb2b598df6815c43033b6a98dd5c31b976f36ae15165733f61afca58484281e494771393ea1777a0f416dc8a167bbeffa5d1819c6a574ec27f9662ed1 WHIRLPOOL 4491c9ee967d04e4d37bfa90d059adb464a494a4598ce0ed8c2dc9134dbb88091a0991c47c3f7afec4b102bcaf642ba8e7fd875190b4ebb51d45b92f965e6993
+MISC ChangeLog 14664 SHA256 c91078ffb8ed1c63b88c7b5137b7bd9c105230ce03242f42a6e19a72cdc5b84b SHA512 ad1d5f54ccb946028664f24546cc7880d4befa28dcdbc3629f7e469bc0478ee799504691b4978a4e563b8fa94f8d6033f65e93fbc7e699f3344632533df51f56 WHIRLPOOL 77fae863f952895b0d41d4b6226eca20329fe40c2295221546a8c7dfe2607cfce77e0207ccbb3179ce045a104aeb99d899b0db567f2c0ae67bcd1a142be032ff
 MISC metadata.xml 546 SHA256 76148af87ef72e06a1daae6476a80a97058f4f9e5d115c0603e156aeb3fd492d SHA512 0aab6757fb995142f0407c2b9aa35fdd7d18566541ca2dd06134451482287d0fb9b3fabf3b744644edba43d7d5b5838558c622792c041144d1b160f44cf48fb4 WHIRLPOOL a073c9fe5d73789ed6ba380b1c0337948300765d1e509f0097be34f1bdbbdebf8863608dbdfa63b0430695d9f22ae0c3b2a2513cba1520a6fc4178419854bee5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNYLVsACgkQCaWpQKGI+9TZjwCfYAx5DBmEKREcChqMZLSac38s
-Z2UAnj0n6fxcLT7ONNLJO0RbaVMZcvbM
-=S87P
+iQJ8BAEBCABmBQJUym7OXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOIRYQANPtaYP4HMsj7Uv+A1Du0fbk
+vhyh5wmnOkSTD/J9fOBcp10n/GPLWHJ92wlKPnLAiz435prZj5MNVkH3LBEEM0gZ
+5Nni0RV/bvvCAh5KjA5+xOsf2J9ndyC366HEJrrSFIp9zVhohHSJUHigYtuuBVGR
+OA5cYOnHFvINpk0CCEeefhukD3C/q7jTDk9OkUTJ414QDPFm/QDWVqM7/jtbfVg5
+0Atw7YFKIUCQo4FZFsc9zqvoYvPxCJtoIG5V4prxyIj2Fj7sqQZyAN0gj6+n74Qd
+LBqPZ6RwQ4WoCrFfvFUScGBhzdevn63c5unedq+vWo/lHx4WSsAKYC+Mx4iCgZJZ
+IkHnd/AW0txB2p6tbTECP5m4CF3NPEmvnyNvQRwLp7/lYlN4tMo+X384+EtNJbgE
+sKtAQz3ZLkCZ1fA8eFRyZMztaPasyUk3SLnvd3zIj+9QxQdDG6dQZnzL5kVX/66S
+YfTlq1RAlYK2QnhIat6vIXSc7AlX/89z9oYofClS2eMKNbY2M9AqxWus6uqmG1R8
+8MKCIF3DB13fTpED8Iu7utrXe864B6Qk0qFtN2+k6w2I32GkxGhIzsezDXPQG7ow
+C5egBu0IwyQRojYIBB/WLv98Z1zzgZjkxYEDTOCsbjvHBTTghFJBu5sFyHrZpkj9
+TunRKLCG0rFroHhyDaUi
+=FxN3
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
index 83c81bda52ef..ed95276c762d 100644
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r2.ebuild,v 1.13 2014/03/04 20:03:39 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r2.ebuild,v 1.14 2015/01/29 17:33:00 mgorny Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
-IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun mmx openexr png raw sdl sse svg umfpack" # +introspection vala
+IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
 RDEPEND="
 	>=media-libs/babl-0.1.10
@@ -110,8 +110,8 @@ src_configure() {
 		--without-libspiro \
 		--disable-docs --disable-workshop \
 		--with-pango --with-gdk-pixbuf \
-		$(use_enable mmx) \
-		$(use_enable sse) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		$(use_enable debug) \
 		$(use_with cairo) \
 		$(use_with cairo pangocairo) \
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 3d823ffd9b90..d353c8360d67 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-9999.ebuild,v 1.7 2013/05/01 00:46:15 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-9999.ebuild,v 1.8 2015/01/29 17:33:00 mgorny Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="cairo debug ffmpeg introspection jpeg jpeg2k lensfun mmx openexr png raw sdl sse svg umfpack vala"
+IUSE="cairo debug ffmpeg introspection jpeg jpeg2k lensfun cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack vala"
 
 RDEPEND=">=media-libs/babl-0.1.10[introspection?]
 	>=dev-libs/glib-2.28:2
@@ -90,8 +90,8 @@ src_configure() {
 		--without-libspiro \
 		--disable-docs --disable-workshop \
 		--with-pango --with-gdk-pixbuf \
-		$(use_enable mmx) \
-		$(use_enable sse) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		$(use_enable debug) \
 		$(use_with cairo) \
 		$(use_with cairo pangocairo) \
diff --git a/media-libs/lensfun/ChangeLog b/media-libs/lensfun/ChangeLog
index c64482db64e1..d1131934f8d2 100644
--- a/media-libs/lensfun/ChangeLog
+++ b/media-libs/lensfun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/lensfun
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.82 2015/01/16 08:58:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.83 2015/01/29 17:34:49 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> lensfun-0.2.8-r1.ebuild,
+  lensfun-0.2.8.ebuild, lensfun-0.3.0.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   16 Jan 2015; Raúl Porcel <armin76@gentoo.org> lensfun-0.2.8-r1.ebuild:
   alpha/ia64/sparc/x86 stable wrt #524436
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index c96aac245377..b65372d636cf 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -8,15 +8,27 @@ AUX lensfun-0.2.8-x32.patch 944 SHA256 54d7b5413d39d25776e1a9a87171de132814652d0
 AUX lensfun-0.3.0-rst2man.patch 1112 SHA256 2880cd8ad47f8c310b9cba0ecfc6193bc788d6db16ad9232b224dbe1809be0da SHA512 a7017f968333ffa3bfe746600b3c30dee7d9a288fb0a758f02ee03547b9ec23f364a04e9322984748c8599bd9976dbc6dde9f287efe3d668e6260c5a469ecb1b WHIRLPOOL 5ec38e9eb53efd3d1207f9487b670823c63f7e6530f63dee93630199e1262ad8464dac43232337fea4b709337b4e4e2d340b6b0d3c02b138828db729116cc1e6
 DIST lensfun-0.2.8.tar.bz2 628913 SHA256 f88f97fbc78259a2b2edddef295caf50770901107c8469e54bb5e9699faa1a48 SHA512 46fc545882884f806e3e4c8c49237243123f1f463379a4161821f627eb63b61815fcfe9c19f239b733a311c2c952e4a652fabe2d8e351e31d8157a5f2600e284 WHIRLPOOL 84118fe34e9a6984a5567546daf95ab7e5945e93efcfb45bcd86a157b6b20f3764921c53cfecd9419c9cb0205df8e940f61a828ae575f76bf12282b9b4fad0cc
 DIST lensfun-0.3.0.tar.bz2 636694 SHA256 c2c3c03873cb549d49d42f118fcb0ffa95d1e45b9ff395e19facb63bf699bec1 SHA512 2b0a57b3ae48401908d51372814424c1076d4219400935990af917f131e34261c44122773114c045a39db9062d6a0146cd44e20e3942d2bf3c281a5cc1494cc7 WHIRLPOOL 898b19dcfc70e8721bba45a8782f9e33a17180ab4ce21eef06b874f1bcf76bc0cae8231fdcff797ceb0bdd086266a42a47ebe6d63d20d0595aee11bbe713484a
-EBUILD lensfun-0.2.8-r1.ebuild 1338 SHA256 13f3a7641c135a8404432c100a7c2620688dc0c96d0f0f8d9f03f7b237ca9a7f SHA512 e6434c76d1e15f3c64f3f7479894ed48a8412271ceea01b7d9371bf2a9c2b2b0ebedc6cc3f638b859cbd8f43692c2fa4051642fb7b7265a90b087ab6aede69b7 WHIRLPOOL de47386fb34d4e068636f133d44bbad77c5be6b50634d86f1f748be363b7ecf13dc21c9eeb07b34f17685f4d1336cc711ea900a5a0a6131d95b4c2ea27fa0eab
-EBUILD lensfun-0.2.8.ebuild 1275 SHA256 45c1763e4cec962f62d12ce88b5130409b19d7614e0604cf2dbed78377abd262 SHA512 ff83b68c3ace9f1da0967dd1a31409e3343fec3f0a2327f0d9985476529f42f5093ed94d7b7150a3974244dbe9fd1c472e3022dea54407ebe621a2c67fbb3d14 WHIRLPOOL 298546946256fc620f5ebd5b6b32df9e23417e879264ac7bd0e941b2da682a4d68c369214f8c7f36ba96f2b6fa53ccfa645257c97469c28254f9336655c81425
-EBUILD lensfun-0.3.0.ebuild 1305 SHA256 32a7ea26c2b75cddf036e271513098fd7a7b6190cdd932f649669ed254d04259 SHA512 a964e30170435c9ca09102019cecaf7fd608f87b3e2af594d36983eea5c94a64f01024237dd1246b6fed8140486638b8ee69c8ee9a37b3bc34b78f96b50e33e7 WHIRLPOOL b468bce43164f3ac8371f20a662ea018edad08fa8246b0f837f68b70f740713f066eb81622437c79d96b4f4d933168bd873bfd99cfc294f3d021deacfda6cf42
-MISC ChangeLog 10852 SHA256 fd660a5e679a91b31042783844cf841130ab00215a35554ec6eaa839bd22ec0e SHA512 cf531e83d068878d6a011c6d52b2bff4bf51626cca4e290f8e7f4823952e7ffc6ded8f74758663b2258dd2aafe88c16c9289d4e542873f8ba803c3c48c4233ca WHIRLPOOL 82e3d631cb5bbf176384cd559ed05fd6085500d72aba437a6e520041096493439a2db497758c31ce02bd4fceaa8a54d1964aa4894aa30faad1891c287b8b2a92
+EBUILD lensfun-0.2.8-r1.ebuild 1393 SHA256 76a8638377c05ec681388c4245c5ef72fcfa863ca496659c575eb37941c1bb51 SHA512 eea6816875cc0f4254336c61a6a3b8189c7bef9f2128cbaa69d71c838e63e7b5df89c1f61b3c06d42e037aaa88a3e13fedfdc3c61ddd5ee9550d761589023d51 WHIRLPOOL aa3363c7e9198ef747d232d921cf6196a646ac67ff100ccc28e8bff324e2814ce788d24999a7f8c01d72d24a22bdb7e59f5dcae16c3abb942577ab3af26ff26f
+EBUILD lensfun-0.2.8.ebuild 1334 SHA256 77998aafea9a97763f88dfdb51278921c849a468887735df5e5ba50a5561955a SHA512 fd75238da540a06c3d53a51f6c00c4b12bdd4370f8d9daac9404d1a526defe8f354bed610df7fb7d28f048824b038620ba9e8b4839ba6b2ea265ab00a7aa0a42 WHIRLPOOL 460eec0400f139b76ccca6e35d163e2e183f84bf2d5bc1d02e6167bac5117bcebb88d9314115036a8707e12112fe76d792c2c0403679b188e587d481b73eade3
+EBUILD lensfun-0.3.0.ebuild 1361 SHA256 5749b2522de3c8393d7416b2ebf8a894ca5dc22c3e6b5dc22b7c7fbd9aef56bb SHA512 c970d41115001cbb3371f3598527c24dc78335e2685adf90d39543180982754455fa06aa2a281b36c63304f68468c6fce31a336e18fec6d04a9e299a4b8329f7 WHIRLPOOL 6de80c249c5105bd18f7644953bca8efc09ab184c4a72e38ad582e040ae1441671e5f5a6ab5db0d5f636f00dfa5294236f5989e65c36e025ac5f2c2b056e5bca
+MISC ChangeLog 11000 SHA256 ed952efd00247c668a2abd4082766e5931c47d6916bf1c173a18c494573631d1 SHA512 0f59efa32fc1a46f545fbdffa136a5f2f7442aaf6479b81c68d47ef70ff2f57fc8e39f7d417ec46ca32942984d1d24de36d5bb3c5e391b487f3a6a7208a1ebb2 WHIRLPOOL 917fbd9ad566860d8ae4cece5c2a96120ffc12de1184f10fbc984cf822bdca3ae00f948a58dc0b1016668e66f1a7c9db4e36968cef20f1021490725f6b881bc5
 MISC metadata.xml 434 SHA256 cdad31489c1592f642177d2c6c152262fc5bba1e6322098a95cbe496d03c3c2f SHA512 3735e2c7fd32e4b2309ebbfb2f8e3107698a5d722fbbb712bddda7dc665af5d994e8f213c06e247ff0fa04f09f209be2cd4fdac4ef218c5b60c99a65334944bf WHIRLPOOL 21bc12855f7bbcd67f885b6a3e022372d5f55524ec305a9e405b2e7d09f76a571236da65d15e81c631c23fa4e914ff1e5ef68fa26f7a51249d5f0837035cd7ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS40tQACgkQuQc30/atMkAvVgCdHdGkNvL0Kw6d3VfAt0hNGeLj
-GpMAoIT80O3WRO1ZuOSTOWXBQMh4sw/V
-=9Lql
+iQJ8BAEBCABmBQJUym87XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOTr8QAN1PT5k+Vsg2IQ9RPTZMkC/0
+k59M2jBcAj5MZkX91YjLI46yhM35Bo6KzFJyHmwSOxOS/UiSzqzAoh/fUikoe5Qa
+yOctmOW5SjSQT7jLKAu5CulYvFVRLe9rAVj6w31ufI0Tw3lZELpMjS5exiInyioU
+6+CZMiz3AqEjH8QqDOMmu6bZMlNTgIPVyZVIQVuHDnmtZMMTbnAjQXoGab6QVypD
+V2BzBEF8lSDyQd9xBFmv6XOr+CIJRaN2k04Dj0hFfvqeGWyojBjClB87efB9c8P8
+Zca3G55znP+qipelWtX6DSi94E9nnCTpg6p6BuHDl2ymdN0Z2kQ7+WmyreBzV2GA
+1SI9P7yfz1yZ/+meJ2yiaX3OTecSbiv+4QkTmL/YOCooS2pmhXVZXQRLvkUcchMN
+U41prO/epij/18AIAGrn6lEHehIdU3pKq8U2C9+pL8clPB8trVI42JltUWWPVvfN
+CQoRYH92j5fHQWKiZKYJPtONZXjI9qBZjrRG7NJx3jyxsDDkwpLNkgguFLlrIkzD
+SwTWQ7qrWARLY0ccIw7HK2tHKSiJtBIoTlOqsUgKLNpXdWWodqlX4rZNXpQkYoyc
+8eJbalUoydWlIXUAqC0fJCb8bChv1XI5VEE67CkxSVtVnlK/6zujc1EUcVvRQvWm
+Yn4I7/UfDNdtMlMfGCzj
+=6mRw
 -----END PGP SIGNATURE-----
diff --git a/media-libs/lensfun/lensfun-0.2.8-r1.ebuild b/media-libs/lensfun/lensfun-0.2.8-r1.ebuild
index e6399f0c075b..25b86a0c395d 100644
--- a/media-libs/lensfun/lensfun-0.2.8-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.8-r1.ebuild,v 1.6 2015/01/16 08:58:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.8-r1.ebuild,v 1.7 2015/01/29 17:34:49 mgorny Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc sse sse2"
+IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2"
 
 RDEPEND=">=dev-libs/glib-2.28
 	media-libs/libpng:0=
@@ -39,8 +39,8 @@ src_configure() {
 		-DLIBDIR=$(get_libdir)
 		-DBUILD_AUXFUN=ON
 		$(cmake-utils_use_build doc)
-		$(cmake-utils_use_build sse FOR_SSE)
-		$(cmake-utils_use_build sse2 FOR_SSE2)
+		$(cmake-utils_use_build cpu_flags_x86_sse FOR_SSE)
+		$(cmake-utils_use_build cpu_flags_x86_sse2 FOR_SSE2)
 		-DBUILD_STATIC=OFF
 		-DBUILD_TESTS=OFF
 		)
diff --git a/media-libs/lensfun/lensfun-0.2.8.ebuild b/media-libs/lensfun/lensfun-0.2.8.ebuild
index c96e66b35b6c..dc28d0e6746c 100644
--- a/media-libs/lensfun/lensfun-0.2.8.ebuild
+++ b/media-libs/lensfun/lensfun-0.2.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.8.ebuild,v 1.12 2014/08/03 18:38:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.8.ebuild,v 1.13 2015/01/29 17:34:49 mgorny Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc sse sse2"
+IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2"
 
 RDEPEND=">=dev-libs/glib-2.28
 	media-libs/libpng:0=
@@ -38,8 +38,8 @@ src_configure() {
 		-DLIBDIR=$(get_libdir)
 		-DBUILD_AUXFUN=ON
 		$(cmake-utils_use_build doc)
-		$(cmake-utils_use_build sse FOR_SSE)
-		$(cmake-utils_use_build sse2 FOR_SSE2)
+		$(cmake-utils_use_build cpu_flags_x86_sse FOR_SSE)
+		$(cmake-utils_use_build cpu_flags_x86_sse2 FOR_SSE2)
 		-DBUILD_STATIC=OFF
 		-DBUILD_TESTS=OFF
 		)
diff --git a/media-libs/lensfun/lensfun-0.3.0.ebuild b/media-libs/lensfun/lensfun-0.3.0.ebuild
index 39c574ae63dd..a1977d4d0620 100644
--- a/media-libs/lensfun/lensfun-0.3.0.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.3.0.ebuild,v 1.3 2014/10/11 11:46:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.3.0.ebuild,v 1.4 2015/01/29 17:34:49 mgorny Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc sse sse2"
+IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2"
 
 RDEPEND=">=dev-libs/glib-2.28
 	media-libs/libpng:0=
@@ -38,8 +38,8 @@ src_configure() {
 		-DLIBDIR="${EPREFIX}"/usr/$(get_libdir)
 		-DBUILD_AUXFUN=ON
 		$(cmake-utils_use_build doc)
-		$(cmake-utils_use_build sse FOR_SSE)
-		$(cmake-utils_use_build sse2 FOR_SSE2)
+		$(cmake-utils_use_build cpu_flags_x86_sse FOR_SSE)
+		$(cmake-utils_use_build cpu_flags_x86_sse2 FOR_SSE2)
 		-DBUILD_STATIC=OFF
 		-DBUILD_TESTS=OFF
 		)
diff --git a/media-libs/libde265/ChangeLog b/media-libs/libde265/ChangeLog
index 0363c31e3f88..f776562533d0 100644
--- a/media-libs/libde265/ChangeLog
+++ b/media-libs/libde265/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libde265
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libde265/ChangeLog,v 1.1 2014/11/20 13:50:04 dlan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libde265/ChangeLog,v 1.2 2015/01/29 17:35:51 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> libde265-0.9.ebuild,
+  libde265-9999.ebuild:
+  Switch to CPU_FLAGS_X86.
 
 *libde265-9999 (20 Nov 2014)
 *libde265-0.9 (20 Nov 2014)
@@ -8,4 +12,3 @@
   20 Nov 2014; Yixun Lan <dlan@gentoo.org> +libde265-0.9.ebuild,
   +libde265-9999.ebuild, +metadata.xml:
   initial ebuild added by me, bug 528684
-
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 4be1a344fa7d..44e3a1fa2859 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -2,24 +2,26 @@
 Hash: SHA256
 
 DIST libde265-0.9.tar.gz 258887 SHA256 226856358b1cb7aa54d3f3e1bc9bb9f062b867c6de58ab1ee94cfcb8a111cda2 SHA512 1e519cea8447bffd14dd1b78d9ab07f3e558e5f3731e26a3d5c3bd8c4a67e05c1ab228f1f82d671d64442ca78e6ead9305edd19bb17fa62c27253616ff6a84d2 WHIRLPOOL 0c0ee2cc844c2551ae1effa1305d6413a5a4a81406f1957f4d48fe74d9e1c912e424106d4c3290100b15c2d8277833cc07931fb30c4e14e827e86e785ff7f3d3
-EBUILD libde265-0.9.ebuild 1152 SHA256 e5f7b0da65ecd86f8144de2a02bdb7b0e14deb36b8fcbc82d031d54a120a1269 SHA512 ad057107369eb615dda7001edb2a3a49818da9bf6ea7e9801056bf157951f3582b32775e6e3607ff9de640b3a243af712fbae997912d2e9ef0fd0b7b1ed839be WHIRLPOOL eac98703af3461530129c84c36675626bb72ec26c3d0a1ee1ee267daa8f29ef75934796444f0d2c542f799004be1d0257f31ddeccce5986d31ebfa1ab13d58d9
-EBUILD libde265-9999.ebuild 1123 SHA256 6cf2a75794f5b1d2106022a8b7abb1f683ab0b4ad000f417df45f6922559cc98 SHA512 3eb6d2e33c695870a3908813daf84891eb7ecb9ded667792ac2d57dd5c78b532a5289acf5192308da6ba146422e5d47087b0d918c0e775c469e848d203fbeed0 WHIRLPOOL 06e841063ff65a2bd448b432d80cf8ee7fc56df327c6356aa2e359d324ff10ecdaef19e625797ace73d43b8d2bf8b6d8e98224fe8d27a10734a73342cc70cb67
-MISC ChangeLog 414 SHA256 108dda017227a00a15a55e88af3d243189d20ed21760235e7a6b44c46613113e SHA512 45a6e28d54b380ac991cc55fd0a0e1d7ac60cd01c21d64bda77fd9244453389985dcb4ba37bd8cdf3d87a7ce693790cf78bd341577271ad6633da70fbea49b16 WHIRLPOOL 08356d7362e444f46e3c0919bf7998120ace7cf8883ff2e8d84e31ca2268d80ebc8f99ac27f3b2bab084ef32de60449a1d918a70e9714e50a10dd5e04f1b1f30
+EBUILD libde265-0.9.ebuild 1186 SHA256 c8b54d2c62f3b02a19c841069e90aa3dcfed5f256addf50118b78b798936283f SHA512 5545405d42ae96fa7ea8540f6489116025143e2f8054df1d4362487d140e2aba72c92849a1f584ef02e3ff28c89ce3d8becfafb78bf6e85a32644dfb622f0be6 WHIRLPOOL 9e2cd8b367a241647f945b780b756f08fe468dd32ace6e35a2aceb86e1d17cf145c8db4f6d42b2c1ef738d4f2597d6e9db88f4eafda62b04707784394f4f379d
+EBUILD libde265-9999.ebuild 1157 SHA256 657a9256f72a04bdcd8a6858f5a793b9aa0ae7f914605c7fb7bc2c4101cce803 SHA512 40714eaa5726cabbfa59a2122e3752fe86569033875476b67618e5caaa0a623ff21a673c5ac042d49180d563a35b4c08cf2915736566dc7fd201d3b1e8b168bf WHIRLPOOL 9b8b252cebd939cf1bb118b6b3131683ffff74349ce9b0df2e001eec0df2989a7cbe93d7ae684cf455e7bc05d8f5f8789c94ae6e0885cba78427db19fbead773
+MISC ChangeLog 538 SHA256 1a2e7d3110eb8f1b9bfccfdc0cdf2c17af2c4e6dea8d6044076bc42ffb26cb75 SHA512 488a5a275466008d23c1b5e30e220a5cfbf78f41043944935a1c32ae9398164de3cd51adb8e8656d6841cdf87678b87bae33b2ae03cc18f7d9437bfbf57bbfac WHIRLPOOL 85eaaf67051e98f6f07e866024ff16be904158546dfbc819b63e67643f979b3c2c4ce18bafb4239c0439a1f854bf27e10d48cdd6fb78b4e1734887a2b7d5102a
 MISC metadata.xml 452 SHA256 d2566e53037d29195a938ff524062802df4397220f8af8213feda198dee26039 SHA512 65ebc6b9915797fca06935a1fc11ca82dd1c0c1768efe5dd296f042e2b7bb476596ce3d551cec859cb41b1106715733d61f2ff6b9810bbe6a541060cf9d629ef WHIRLPOOL 4e0e1f8bce30d531f1e1f5e917b1229309dd8a5a91d5ae0b1b5dbd6b465a9906d3ff0ba98fea338bf83e164683e43d5b28a2a9a71bb1b2cb12539d9dd00c2bdf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUbfGaAAoJEJIMDbyqvv1VNQoP/iGrL93w5UpnwFyxMqfuqxwY
-bIPCURGAytaQKKKpEyrHpkPG48MOwWZDZ/Zrfj4OIGydmQH3vK1iAh9267YrJnHP
-70NAMeTpzbaMJ02MGvMADKlEX4T05dRMirEkyshRkgMrJmLLvRi/mA/nlz4bQlDa
-SYth81seuz2rQ7P6Ghtlajcy/sxx/cil1uzWSR3tzDh0BThoFZABw1Iln1GLqTZp
-IYmduJrfSJa/vmWugxN2ywNSU6loBXoEkNKPa+K3ywbtKcVxEkXCcIjRTgoYwmOA
-wpf3iHeK7/X5jizdCKM1zAL2QqD5Q5qucu0ot0GE+2RgdamnftMPk9lGWeS88AJG
-zwD5jSjoxk3sRcLC8tgaUtU9hhTez7Z9BLmz0tMMR2+ElKKFW0/aJBMTZZO3ONmH
-j1iFANHwo0f6WU42CRPknoMOc7dCp/zO24weELi+/Kn12FjFe7exx53JS2gU08zG
-j5jfurr57Yr1acuXQDEk6pLVnDKVbA8lyqS4Hgyh7FrOKQqmBQDV8kbMc6F6oi7D
-exNHnegXfgXadeJuVIpoZpGppzE6u9h8FNp4c5rB87H940CUgPA4pfQLD1oymmUk
-V07z1cNZ2LgoiCHZB5QxJh3k2NOMROOsL0nsTB9xXhc2Ndn5V01Ib9Nj5yw6pVx0
-0p+YCaJKgEYhf8GdwzYh
-=Q5s9
+iQJ8BAEBCABmBQJUym95XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOVZEQANFwPLG8UNptrDlxYp8XnhPh
+4Fx+ywzFwshKqnx2HqCGwa14YPC1E/qrgdzftuRj6XWFPV6o/NHltvrYjuHMZCjC
+PtGriq9p9FxDAcdqDOO8vHW7H1IuUdeaLcSgK7oX0cZrbzMTcvQEQvzMaNT2gYgR
+V3JoReLk8KvMwk+IRhQjl5s2pULugB3XAoUU8UsbXQA++UJ4K3nTvKuMI7mtFTML
+W952gEE7csS0M6Plbc3lX5bk3QerNELhsTI7sOaq7smgdGu/fvurGr5Bdt7Sbyg9
+O5PS+l+s/dEOUQyFAI2FxnzQ5kFYXK/Uo4AYES3BSalQDl3Nx4cNamKM3VGpKsF+
+7tL7rdzdoQFp168MsrEy7gTfWZ1bx9SW2zx0XyttTDfJGCJD/mtUV63oiGXnRtYj
+pgwOuccGdEKTcyUzp5PXd1rFILWmqyMOTLeQ3MZoOX8LXM6Pn2IqOkSDlyl7SNZl
+Z+eetpbnHK7yboZ8xKiV9/cpTLJDH2wwcwsPEJ2F6OmdjsA7WcOqX6FZ7daFzICY
+CyrQJ0uEcMZevJ60DatNxeDY36alD7zKvb+FWhotJU3qbQoOMJI7305bCaWFya5M
+38p8UQ3PNnJCfne6JJ6B2kpMN2RnVQaCtW+k/qiecvazvPI26g5L3XQOyZxazaa3
+xX08Cd08tRXeOePSzS1F
+=Xhn1
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libde265/libde265-0.9.ebuild b/media-libs/libde265/libde265-0.9.ebuild
index 8e35aa3a4c54..d1ebd4b039f1 100644
--- a/media-libs/libde265/libde265-0.9.ebuild
+++ b/media-libs/libde265/libde265-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libde265/libde265-0.9.ebuild,v 1.1 2014/11/20 13:50:04 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libde265/libde265-0.9.ebuild,v 1.2 2015/01/29 17:35:51 mgorny Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug qt4 qt5 static-libs sse tools"
+IUSE="debug qt4 qt5 static-libs cpu_flags_x86_sse tools"
 
 DEPEND="
 	qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
@@ -29,7 +29,7 @@ REQUIRED_USE="tools? ( || ( qt4 qt5 ) )"
 
 src_configure() {
 	local myeconfargs=(
-		$(use_enable sse)
+		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable static-libs static)
 		$(use_enable debug log-info)
 		$(use_enable debug log-debug)
diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild
index dddf03cce3f4..3d2b435b4682 100644
--- a/media-libs/libde265/libde265-9999.ebuild
+++ b/media-libs/libde265/libde265-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libde265/libde265-9999.ebuild,v 1.1 2014/11/20 13:50:04 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libde265/libde265-9999.ebuild,v 1.2 2015/01/29 17:35:51 mgorny Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ EGIT_REPO_URI="git://github.com/strukturag/libde265.git"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug qt4 qt5 static-libs sse tools"
+IUSE="debug qt4 qt5 static-libs cpu_flags_x86_sse tools"
 
 DEPEND="
 	qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
@@ -29,7 +29,7 @@ REQUIRED_USE="tools? ( || ( qt4 qt5 ) )"
 
 src_configure() {
 	local myeconfargs=(
-		$(use_enable sse)
+		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable static-libs static)
 		$(use_enable debug log-info)
 		$(use_enable debug log-debug)
diff --git a/media-libs/libggi/ChangeLog b/media-libs/libggi/ChangeLog
index 66bf5a72a948..e8542f7e1000 100644
--- a/media-libs/libggi/ChangeLog
+++ b/media-libs/libggi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libggi
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libggi/ChangeLog,v 1.55 2012/05/09 13:25:31 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libggi/ChangeLog,v 1.56 2015/01/29 17:37:56 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> libggi-2.2.2.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org> libggi-2.2.2.ebuild:
   keyword ~amd64-fbsd
diff --git a/media-libs/libggi/Manifest b/media-libs/libggi/Manifest
index 5b29095c16cf..7bfbe6126e1a 100644
--- a/media-libs/libggi/Manifest
+++ b/media-libs/libggi/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST libggi-2.2.2.src.tar.bz2 1071939 RMD160 e76d22f06231e0aa1f752e33951802f243b7f0aa SHA1 aa439b21fb040b5b52ae18099a0c3cb02e50110f SHA256 acee4201cce6c658531717441ec33269e57f04823226461598152553a5b633a7
-EBUILD libggi-2.2.2.ebuild 1659 RMD160 5a34e005f4a373c18dbb6d86327c78a6b17130d9 SHA1 2ed37c095d51d23fc30d9aa7b96c5a3d91fedf84 SHA256 5028d4eacad76304287b3bdd756d1a39d7572adcd0445b9815f87879546713e7
-MISC ChangeLog 6812 RMD160 0320458e7fbb2104ea6d3af3c0af4fb5b28e809e SHA1 409fe003a454a15c7c5fbf58ebf2cfcc60c93a30 SHA256 ae2480f4c431088613424c7047d2b2c6636c6137d168d4a59b35cd416ffcb948
-MISC metadata.xml 315 RMD160 1f2b03ae94729cecc4f88f6da9215c2f58e6ff9d SHA1 cb218a5a5861911d14b52c8c71d98e725da966a1 SHA256 d1fd3c1276d3bdc72f34e7cdb10142661feb794282ee87ffb34a6999f53e7701
+DIST libggi-2.2.2.src.tar.bz2 1071939 SHA256 acee4201cce6c658531717441ec33269e57f04823226461598152553a5b633a7
+EBUILD libggi-2.2.2.ebuild 1689 SHA256 4cac8f375825e093cf61e3db7d2868906582097619560da52f739c37fe9a4165 SHA512 08bc05e377c691f1724d9043fd1d2911fdb3e67d75c51ef249f683631bd28d5f43e9a0281881cf4b194cb89fe84a4c1907cff83686fb26ba92bd0bcf5400d963 WHIRLPOOL aeb313354cca05453a11d4ca14cec51a6ad12c4cc73f56b0ea19998cbe4da8b41496029ee24e7251b3947f96bfeb9fb75c11432a854424405e8df97d59fd3d77
+MISC ChangeLog 6909 SHA256 2018dfa7bbd605e9aa6b43eaf8ff7942c32bcd7a973d52da26f04f3511a2ecbd SHA512 a9d235e062c05699eef329249ff981369a2d635fecdff183d350d9c609dfd9903d346da6df77a8c8e0044efe5daf5e58eec67966704bc872100cf8a617ebf43f WHIRLPOOL ae681d40f12fa596f1ccaed36420565dd33a7f03a6161a038c6ae0aac35c50b0ab21ca9d5205e5ab8d156ee994710841b1fb232eb6d3d39d6b20ad60cb7f7c0e
+MISC metadata.xml 315 SHA256 d1fd3c1276d3bdc72f34e7cdb10142661feb794282ee87ffb34a6999f53e7701 SHA512 1a89169f8d4eb53677208ed0ae0840dd21e9678425e0f8ae6e9bf7422bce54ef0e49c57c34599b6c3f4298763af14548941fb77c1dec0e6ebd4c00912f91e9db WHIRLPOOL 74efe08052db3b922ddd6845f15d1e90b28e5b5e92aebbda156f6008669c8f89e2249175fdb89eb6bad5a7d8673a905a693ef8474c1eb5effd3c2201119c42b9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEARECAAYFAk+qcFEACgkQvFcC4BYPU0oWdQCgv8lsXAg1w9w5k74IK2UXPkfX
-xBQAoIIQ6+nAuWP5O6FCtFFdX+mJBO+S
-=SJw7
+iQJ8BAEBCABmBQJUym/1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOck8P/j4e3nDUiL7oXlfk/onkFGmf
+CJGsatpclh8A4/G9grT4qg0c7oXSmo7J2r+sWGrZfPh0ZG1O+Gr+jUrAopxoDl0M
+HGmFPcswofAxET1Uc3/sc8vGtoHETej8z8yZnyi0aIr8tmZC778V7Nd0oZRh8ZFa
+mmT7n4GeSeFVEhXMafqSgIybSJE2E9E1TiwQD7rjmYEqj5pUgpoTkLpa2bBm8jPT
+XIKQSegYWrg08MnFaDzlD7iY2iEMhhE4NVpm7znSHodTv+T61pTKvwUFsRzId1el
+XWDHk4z0jywgSJDZfDCp6RxdO6c3xXXGK2ujhu6T2o+TdKXGYY8U9bIoOAARfiFM
+a80+R0KvBA1l6rBVq9QmcFZAP5vYTCsWgYx2xQabpqDMTYs4mH+oU/BFv7lm8ohs
+jSJys63i8aoIjVUwkhon3XyFbbWEo+50QTw8E8tiQBBtUNqxc351Su6DMAGKj99P
++rnlguEVNnQ/720g4aD6J7foiP9IXNBTcPBhvHVTWMvBm+udEVfqItaXwQcml3Gl
+TN5fEk9Z9Al4+BMxvshtEQHx4GH1SARD1YuTsysHLpTBV6YayRYd67V4A/M4MVAr
+RBlH33NxPPzEhpTVVPdsrivcInI8ohsOztJRGLIatm2RwYDFw5kd3Hx1+eh7WBu/
+t1sZcmPX3PH3AayGysim
+=Bb7g
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libggi/libggi-2.2.2.ebuild b/media-libs/libggi/libggi-2.2.2.ebuild
index bc119f52242a..a360c3deadd0 100644
--- a/media-libs/libggi/libggi-2.2.2.ebuild
+++ b/media-libs/libggi/libggi-2.2.2.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-libs/libggi/libggi-2.2.2.ebuild,v 1.14 2012/05/09 13:25:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libggi/libggi-2.2.2.ebuild,v 1.15 2015/01/29 17:37:56 mgorny Exp $
 
 DESCRIPTION="Fast and safe graphics and drivers for about any graphics card to the Linux kernel (sometimes)"
 HOMEPAGE="http://www.ggi-project.org"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="X aalib svga fbcon directfb 3dfx debug mmx vis"
+IUSE="X aalib svga fbcon directfb 3dfx debug cpu_flags_x86_mmx vis"
 
 RDEPEND=">=media-libs/libgii-1.0.2
 	X? ( x11-libs/libXt
@@ -45,7 +45,7 @@ src_compile() {
 	econf $(use_enable 3dfx glide) \
 		$(use_enable aalib aa) \
 		$(use_enable debug) \
-		$(use_enable mmx) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
 		$(use_enable vis) \
 		$(use_with X x) \
 		$(use_enable X x) \
diff --git a/media-libs/libmpeg3/ChangeLog b/media-libs/libmpeg3/ChangeLog
index 37bb30598c5b..bb8eae820e49 100644
--- a/media-libs/libmpeg3/ChangeLog
+++ b/media-libs/libmpeg3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmpeg3
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.91 2014/08/03 18:33:07 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.92 2015/01/29 17:39:36 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> libmpeg3-1.8-r1.ebuild,
+  libmpeg3-1.8.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   03 Aug 2014; Agostino Sarubbo <ago@gentoo.org> libmpeg3-1.8-r1.ebuild:
   Stable for ppc, wrt bug #502840
diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index 17f68802bf6d..dbe018af91af 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -4,24 +4,26 @@ Hash: SHA256
 AUX libmpeg3-1.8-impldecl.patch 559 SHA256 f9e591f63f4d1a151d8c3370cd99fe0e4d5c026bf748d8246d45a25c12d76694 SHA512 43affdcfd54146c0623478f6b2108b28b2be09c956d800705b24dfe9eff6c50e861c83e392371a4deaff19649d61fe27edc7521c7daa703ac369c96b5f698ff9 WHIRLPOOL 6856580263d01d88f731a0454e32faf897200d19c63fbab47a39043f0d4acbe2563c73cec868023c1449b2fde45666b1ca83cf6aa57a10c00e21aebf4b89c969
 DIST libmpeg3-1.7-gentoo.tar.bz2 5625 SHA256 6dde60e78776e7a3c761218e35afc6432a9289eb1ae18c4e4e7f85f67d63572d SHA512 9ef94c41ee943e321c9fc14a02659a839f08554aac4f5c5abcb9835e9940f0e5dc4c67c26f8124de960cba78493fa43f6c800748c0426e6dc141aa106e2aabc1 WHIRLPOOL 501aa2767acb06e4fa9cc95315f32ab7f8e9cd0889d5c2aa7f3b9476868b8db865c65ff9e7e5b221361cf1104f725693ec4eaac6a43b1bc3eafa60720e847341
 DIST libmpeg3-1.8-src.tar.bz2 2452350 SHA256 656f50bef752463af06c6b131f67efef30a34978499e1fdee30e97cac1dea3c4 SHA512 e381f07d46d47d391c6db420791a065e3572e17ca63966eb52712560867866683505693f73b25869059319eec66fd1c2f923dbef1fdca5ef9efbe598e217d60e WHIRLPOOL ecbd01be343edb5a115983e28fef1526a37a3f0b67ddc1eb3c8c566be47a3bc1def26d017954fa49795567df2d3ac838ae6868d12d3cf1a8c359e82a07c11e30
-EBUILD libmpeg3-1.8-r1.ebuild 1787 SHA256 bd0b955199f313e8708b0787fd55d525c0a7afa8db9d7d33c1c46884692d3faa SHA512 f58e6fb1739229b68f21d3609a58624ad6a4a872ef6020dd198de523182d1cfb9037afefe1c4c0157713ca566146f38d40bd4e034d2a6ed5f176b59f14fccd14 WHIRLPOOL f98ff533fc3d82d7ca3be160637e9faaf604f754fe03c05fd0c6f51e24eea4a39741784eb51b6fae056e1222fdb3334a31ef3fb0d55d513ac4878367534b82a0
-EBUILD libmpeg3-1.8.ebuild 1693 SHA256 a70b29ae31ecd32586101d02e8d196807bbd017743070b388dd98da71f2d38ce SHA512 44ffa67312c4360f064c9c8f5d3898d371ce3ed7f517f3eb1eb7421cd897e25cc2909001d842d6e77037f9c960b7146f8b0cdf6bb8e0fd5ad2064dda7f177663 WHIRLPOOL c2721a637e58c07f4969d6654f85a5f4a73005d858fb2c93d87ae6801d8af2f55b6cafe57a7a7382e317c15704e36ee33f7eaa59dc02f6732add33b4db64ba63
-MISC ChangeLog 13123 SHA256 5351e541e7dcd730587e4cbcbcb567e6c745b6729eec43ddbc81d3a3135fa59a SHA512 68f7e18dd5c8d38e63f4c4916455043b306e858e6699706f1bcc5560205323add0db77a566eabd78bdacb668b99fd3ea1de7a39d0b3a20d4555d3b22e59a11aa WHIRLPOOL 57577aa13fe305907b20f08c6cf5a442c8ddd6a55865c11594b145634919d8f2c3c1a2cb0649af2460880c539f0985a0f444d785b9656ee317043ee83f3b9df8
+EBUILD libmpeg3-1.8-r1.ebuild 1836 SHA256 e897dc0e5f8dac78c579b028d48e7b16717a4701479cd627818cc923e460d74c SHA512 cdb428e887fe29f2d251bb4591e1eeb67deab2247f20a597b99ec76423cfbdfcb89826010e7729bb8188b181995cd4a564b718f813c969e2afb6e0bb00473c08 WHIRLPOOL 270b9b876e1bc61e67a5298c524ab94b05024c040527b4cd8c44f818390d134a0e37c26c86c8dc13eaa155531d8073ebd7e2030f5cd2864e91aff56307e61692
+EBUILD libmpeg3-1.8.ebuild 1738 SHA256 beeecdf48c1cf5dbb61c26f0eb2a6b36314f4a24a3ab9b608b370188f57b6fee SHA512 d1ecaf76793b8b01a3339d377d7eb15f644e78f565794a54e2ffec0d2e5f1c3f90bc2916856b65cc30eb3b2dae3d67426ee52101fa879333a2f6371691c4cc48 WHIRLPOOL 0ccecebdbd86727013c5e54bc82a50adf3a6fd6453dd08910dec17b1551e5c00c04fb36c0689d6fe10f19b40d2dfb611918d668786518058d08da76bea7da26c
+MISC ChangeLog 13251 SHA256 77570a599cc91e9ac190f36dbebade94b16e3f1977a300365d2774a694b1ddf6 SHA512 975de81e43bba4131877f8f92d1e85d7bbe4a62f035b6b9c1ab3bf95caa4748153bafc341f83f2bf54c200e5dd7c0fc716ff44e970ee3c5177d4a1deab87dd95 WHIRLPOOL 1255ecbbce816ed349060a1a16cc7e6960e4ba0cb8140e155eb801c59a113211e8e2973bb301f990b0848d6df9354575c4505ff7c0e17b17564fba0c096d45ab
 MISC metadata.xml 225 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 SHA512 79bf53ca11044e2cbddf8ba8c661abd2a6f7602748ef4dc1d1a3447d4f0e5a15a4d69f6e1f60e0f854465097019607a6fe7157906bc41ddfe41fb747de3ca7d6 WHIRLPOOL d257430e16390fc27365e2f58796f0f0b7c2c818f1bae76bb2a13b7971e5d33baa9d8aa33a12605653d05e0c7bd52b020aa96b737c56ac1038c32897c481a12c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT3oBkAAoJELp701BxlEWfxUYP+gKWbciuLTWZWU5/5hfXD5cd
-LfrWshJTS52+JcYREwgY2EBbH4p7cri0F8hL4/yu50oZhZay/AIJgHfSx+Deg7uc
-FznRTXEHmeY6i182RWozaiTZoP3pftKYY4AOd8PtvC+BCEsCfHFvOH2XXvIoEt85
-4YdAOayuNX0eIN7qKrgEbAmb4+FA6/t4he5y/yljBJrhRNXLin2H/XSYtYNWV4WF
-He5ILTaa1RlbPk+gco+QN7euVXS6AWHHWo+bUihN+N6D7spb925dYr3i3cUzf4C4
-2RLyXjK1qijHRgy39IrYss6eC4XtZh3ZiyMwMQ3bvf/Q8Y5cf02gtXF5TODPcck/
-F5ffoi68QIl/iF81NhplgONT/AF3g+XYL12DitQAwfXCBisO+YNty4WMn1N64azU
-W9/ANs3rGg9D9UrO2w+syMk/LZEBOAxCjUQi+7yChQMC1u/biAXbvkgTziQ1tZQh
-RvTMn+qmE5YxXb+tWHEeW8Y3RktSfePWmi/Dg2caVFrtOeC+zzz4h8tyecZRsaeM
-JBlU9iyVAfOSXyRvi3GCUxUJ5pKNhTktKEa2A7WqTwAktevfLjeAOXjN5Tw/F2IK
-ARuDksSpYuTtFz+VVj0c6e2j3LN4wtldtkiLq9zeWuiBQMGRQf5fT+FMhO5dg9P5
-fhcoYpXqqedkIGCZjQhT
-=1Dd3
+iQJ8BAEBCABmBQJUynBaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOWfgQAJpVbOiKbEPB4qVNlmkEo91t
+J6knDMIBuxtCIy3xH4jhsavTqwn4EMXO565W31n4W6MghVoMWvSRGPWS7VKyCOIL
+t4xoapSPfbs+dGOy8msU2DDk5U6dEitE3pT22VUEuf0H87arcUvqplMY5El0aThv
+iYN2b3le3w+wvvMXuoOsn6lLM+bTIIIZeOyoFe5SLFFvo3DzpSEWErGiwUTsaJWg
+j/2e1PgfhfeIdXjsYCtLZG1nV4o6BQgAPvEHlmHyI7Kx7+U9ZIAhPNI3I0CnBXaO
+6PpLowSYr3JDsiFfVQy8pVINiSypXglsFQmyrTkfd9AJtbbOK7W3Nx29WLpMDx4O
+yWYHG2hOibazVOwTFL4xz4heEs2KHFdBl04qhM/4gHP7oHQMwPPne60B287kmRtE
+OFnwhjblJivIoB1ZYIaqAgnvVxjsj8a0EoGmghJtnYRhptC8SLjTFkSnfy8i08oI
+tywesSR8gfuCSel3wo5yUjvnIwhRjOCLv7OP29shJ8KeYrDxeme+LTh5S0H/9T1m
+o6iTVXpOgKvcm761V6p3qhoZW0v8wkDxFxL63kSUBMDSQh977xIzdgK55yeBfgbF
+2BJaaSX2i/P6e2fg7WB5efJktJq5rMfsup9fMa0Rn4cTk4y+4CWU1iJJM8PaWsQ2
+AY/D4+DBZVNy9Jk+k6k8
+=d3OP
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
index efaa6c62eae2..7e25d2232798 100644
--- a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild,v 1.10 2014/08/03 18:33:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild,v 1.11 2015/01/29 17:39:36 mgorny Exp $
 
 EAPI=5
 
@@ -14,13 +14,13 @@ SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
-IUSE="mmx"
+IUSE="cpu_flags_x86_mmx"
 
 RDEPEND="sys-libs/zlib
 	virtual/jpeg
 	media-libs/a52dec"
 DEPEND="${RDEPEND}
-	mmx? ( dev-lang/nasm )"
+	cpu_flags_x86_mmx? ( dev-lang/nasm )"
 
 src_prepare() {
 	epatch "${WORKDIR}"/${PN}-1.7-mpeg3split.patch
@@ -42,7 +42,7 @@ multilib_src_configure() {
 	#  Stubs for deCSS which can't be distributed in source form
 
 	ECONF_SOURCE="${S}" econf \
-		$(use_enable mmx) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
 		--disable-css
 }
 
diff --git a/media-libs/libmpeg3/libmpeg3-1.8.ebuild b/media-libs/libmpeg3/libmpeg3-1.8.ebuild
index c998f609dee9..d9d4d411a7ab 100644
--- a/media-libs/libmpeg3/libmpeg3-1.8.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.8.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-libs/libmpeg3/libmpeg3-1.8.ebuild,v 1.8 2012/09/09 16:07:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.8.ebuild,v 1.9 2015/01/29 17:39:36 mgorny Exp $
 
 EAPI=4
 
@@ -14,13 +14,13 @@ SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="mmx"
+IUSE="cpu_flags_x86_mmx"
 
 RDEPEND="sys-libs/zlib
 	virtual/jpeg
 	media-libs/a52dec"
 DEPEND="${RDEPEND}
-	mmx? ( dev-lang/nasm )"
+	cpu_flags_x86_mmx? ( dev-lang/nasm )"
 
 src_prepare() {
 	epatch "${WORKDIR}"/${PN}-1.7-mpeg3split.patch
@@ -40,7 +40,7 @@ src_configure() {
 	#  Stubs for deCSS which can't be distributed in source form
 
 	econf \
-		$(use_enable mmx) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
 		--disable-css
 }
 
diff --git a/media-libs/libsbsms/ChangeLog b/media-libs/libsbsms/ChangeLog
index 9644f2fc0d82..8536fc60b0fb 100644
--- a/media-libs/libsbsms/ChangeLog
+++ b/media-libs/libsbsms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsbsms
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsbsms/ChangeLog,v 1.9 2014/10/10 04:29:01 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsbsms/ChangeLog,v 1.10 2015/01/29 17:41:44 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> libsbsms-2.0.0.ebuild,
+  libsbsms-2.0.1.ebuild, libsbsms-2.0.2.ebuild:
+  Switch to CPU_FLAGS_X86.
 
 *libsbsms-2.0.2 (10 Oct 2014)
 
diff --git a/media-libs/libsbsms/Manifest b/media-libs/libsbsms/Manifest
index 4b81d1dc5b01..c79b8b9be663 100644
--- a/media-libs/libsbsms/Manifest
+++ b/media-libs/libsbsms/Manifest
@@ -7,19 +7,27 @@ AUX libsbsms-2.0.2-cflags.patch 688 SHA256 58ea7e6c5ed90149a4908b7db6977d3200b5b
 DIST libsbsms-2.0.0.tar.gz 832881 SHA256 960c7bf4bd0f5024f96be6ff8891118bd5d029f55525d1a43d8d01c8430c88d9 SHA512 c3047310c5e5080eb437f426ac679fda3cd18ccf06e287667701aa9ef50e47285df4cc29e5d1dd82e9bdd1e668bf33ee437d9bc8499ba1687b172ac904d80d92 WHIRLPOOL ae519fc74e9145a309c0fcdf7eb84335fb8c0b4d5ea5863ab14fe447dc8100fa7cb98c3dbd8ddbb0ddc07b609404f49405f2d96e7c68d1e8f98bcbfc9563da5a
 DIST libsbsms-2.0.1.tar.gz 741474 SHA256 1012201f3d982960ca29142e3adab79f3668932b23cc38a9f9088ca9a2588b25 SHA512 62d5b3bc58069d697f0cf9505f2da22555a1fa8c966191cdd369161d56266069ae47a41100103439dc58b7dd01bbc3b11279400a2d0c161b2b4b9c854199ae45 WHIRLPOOL a01fa860088e4b386184f36ddc8c19522ce5f850f76cebf8f2800aa6f21715112fc03457653842b581b4cb16c7d064a9f2babe54149ca4c652a497ea31fdce93
 DIST libsbsms-2.0.2.tar.gz 450170 SHA256 ceab3d970664b337057b46bcf55283d50d329da636bf83d0ee7c36e22341aeee SHA512 8aaab3e191f3e10e559683ab4ebdcb8d951cf0e776390234f25675a98640d60d20aed872061ba72fdc3bd7827b7d46bc27225fe947cdd7fa4312f75cbdd78e6c WHIRLPOOL 4cf6c0564a1e270ad46b90f07e1ab36c642384994ad1224c0f4c56dfdeafa5afbaadecbf8151a9767a39203e661443964b823b21c45d3a7b29fcf121cb7910e6
-EBUILD libsbsms-2.0.0.ebuild 791 SHA256 a2c9c64708357c810ff95d6e07fa1c121ceebd353baa6e5f8c1d97823ff98684 SHA512 2e75816a8bb3615d0cf2e96a0ac392ea47463a2ff2010b2b0da6919a98474de4437d1781029ee587d2c6cb6b8d44db067ee7ae7dd77650ba7638979db96d837f WHIRLPOOL 0472b6349c10650fdd8f18f7e53e0771292af88173caab9381f3194fac6e1b727ed3af4687365d6cf655e3185937faf803be4d7802721d3aebf3f9303091d629
-EBUILD libsbsms-2.0.1.ebuild 856 SHA256 9ad351dfdb4ba1daedf0c4f333cca7be7a656db02e794d2d5ca1df2fa2bfb831 SHA512 f7998917fc453f0445fe1c4563bc2a235467c5fcca834755392775e51b071f786c280f1a48d9c879df8038df8901574137277117f28db03fef78bc6c2b1138cf WHIRLPOOL 2f64e2e6e58d6b2c338834c9ba60c9b1b2e2378efd2ad6587747c723c6ed26fd42061365c23aaad76cc48a97dcb7bfa4303eedeefc8a136733c293181eb3a41b
-EBUILD libsbsms-2.0.2.ebuild 810 SHA256 9d0300dd7ef279f0a7fdfb3238c79ab00dbd8d1e72b7de97f857abc82cbcba75 SHA512 f8e97313e025e51d0eecabe5a2387f04db899d36ae388b3d09ba8e093d4f101c0af278a00f770ae4355b387f6ace12007d129c8940ef52944df51f87be98db48 WHIRLPOOL f483eef6b44db00705871a81bf68b45a679295a9b64838cb0ce72ceb5fb5403d366c3f27e13b704c995600dbcae30fb6444366809d8cfeeda4f16299438f4126
-MISC ChangeLog 1445 SHA256 a3ddef1296efd9c28cd720a104034eddcf42d360e65fb894cefae5f1dae77302 SHA512 1d34ae9a6bb4771d2405be162022ec017197245f8fa93d52c253a842d08c7fde00f5bb2974bc59b9ba9cffeb681b6eedebe1c64ec42a14ac1118feefe8e37f35 WHIRLPOOL b4c083e09b647cd06d1c453935301d3ef4882b21868fec6bd928e44271c5b5d2cae7fce6bf232276ff14489b48f139b947f4e06b19acd8840ffeb9a4e10071d0
+EBUILD libsbsms-2.0.0.ebuild 821 SHA256 0f220897849b17b517f15edb0fa21f86e6d65370ddbfc94719fa12b6b0923657 SHA512 e831340d74dd27fdbebfe12b0cf73d26c44fa14d9a4ffa2cf64ed0b4a64302f47b9564369ef27721e0b0d9783095c884e2855c76f3e59b81f8f219db4ad0dbc6 WHIRLPOOL 291022a96bfb4996790b391db8c79e8ae1632cd1643974c11c473d5721674b2253144fe242f23c762d7ad7ecc360920e6ff0822945eeaa78c98c56c78a07da13
+EBUILD libsbsms-2.0.1.ebuild 891 SHA256 a4860e71fc294b7820f15da8f32f62546b8030ded04455e53f88f4368920fda3 SHA512 e2d977704f6ad516ce3745fb7dd4b1dc2d1dc5d7554887bcba8f3250a6e355424d92e21bbca2bcc95a6c848ab4288dc36922db0dafddbe40d2020ba6a0d5a484 WHIRLPOOL be581aacecde1b5f863e29645919f4f2297f99666e42149f8a169279eb3e613b19964febe59fcbec7e966dbeeafec99d3b4c669babb8e740dfd121bfe495a8a6
+EBUILD libsbsms-2.0.2.ebuild 839 SHA256 5789702cb274ff39302ef8b8fc6ea8583e4eaeef4b3e8b900d40d7697d7472d5 SHA512 19bd2baf7e6d9b4b867aedb704c1451ecca0b10029070d9299fb5b79a8b4694d931be01e970c86966e2a14fc9dae1e5f20b7327593cbf1aabbfb47d845f14d63 WHIRLPOOL 4586e706dbea46fe3fcc701f11a4e412e74be915e443540591a5b16354daf1e837338a4e3b2b1241dabed79efdf7e64ba984f78390ca4d0a3aaad0f7e3a1f770
+MISC ChangeLog 1592 SHA256 d9474c2bef709dc8040b1a046021e540111a25b9abd909527df721a838c35661 SHA512 ca017dd7939f290d3fffba5f52ce89f938ef563f276705833cf7bd870f5e3acb6289dfed3e371a97bb4f57558e13901eb7213a758e8f60da93a430546b05d89d WHIRLPOOL e95433a5c2ea8cdf608de710b57492f21c30e39e9faf733fdab6ffdae3f2d89b22d31297e939f8e6872159fac5691cfc86462f517a565e1bfb4407d72126b400
 MISC metadata.xml 237 SHA256 c267bb94adf40f0d82243ec7fe1777061e9180712c7ec1597ddd627610446443 SHA512 1161d6e7a825e1cc7b04d8e1ef8251650b36ee6b409f8e42a9ec2be3e358715dc11a6e9114ad2e6880253311c9447b1fd9a1d1bbf902d32066d0916fb57d204f WHIRLPOOL c1d396ef656516120d847cb6f8d47d5a087b0146033c398742cbff7d79bbeb769799dd542a2d610bae68fef7686b43db2c3f3bfca41ccec8b01917f952026191
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUN2CuAAoJEEqz6FtPBkyjLVEH/iLcVOo0U3GchxVVwaO2Y2uL
-nZxuYGZa4L5LcaEY3a0SgRqHv9j4w6z7nUKnzNAILMrphVU2WUvQG/msJAIEavKd
-XptwWCL4qkh8zxA5p9orWz5Mfs0xHn3/v4/sQqaSt8qFWaXxK0nshaZn0k0wzs59
-NfYC9r5AhxV3LC7j5A+zfFUN3L/1VFDTbbDTDGGOnavjWFCOI8J5jo16ns38Zisz
-9s5CV5zbR5gAS5RX7PMWdS4zM7sa7K+4ME7C5YySwRY7J85kQ6qmv2nSUWJaDbUW
-2Z7Yaqx7s6uBMO2h9iit/ekTj5sjItY40EGgenMvhmApkLnsZPp/teVer6b97wA=
-=DqdN
+iQJ8BAEBCABmBQJUynDaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOTXIP/1X75Vzgudn/fcZsDMwDktz8
++1f1ZWDlRtPE5l0V1u+LSpzrejrQ4Hy6lilImT91g9Uo3G7y2EVh+foPvXB+yXya
+7GNnNrjaUsw0dmbZHj3sAuyCAcIdmN3R+WAehzT9B2MyVqhnpPJV5CMRDSjFq+6n
+8V1jDxlTgafqA0TAIFvSu5MPbrFsufwczilmc36sgmLvHTJJEkv3Hjeo52LNV+Mt
+u5ZFn1F0/OoSh1zquoDPh2NuOLfzKRS91ZBaDDEdqsniJRp/mwMAtdWWhFX5mBpQ
+lICV0b7gG8EzK7hMv9IimbHilyjeJwQ/GL3OQdO2LxVVDThINxhO8LQBt1Q4tTV2
+XDNW0C+ssrIhbT3PWZ/OwgQNfAtRp46O+7XizHibsHVjm/5sbD2w7/XgJA41ve5T
+yu0ymIF9eZDxAfryf015BFbgAl3wM4TO70Aaeuqpz4fN5YwGdcwG+2U3qOKTuLtF
+Nnab6JbxEx/+51Z9tgYr+RrnBK0l8RvfrT4AKLbO6qTOO1SymHMiA7U//V2R4QtD
+Oy2cQGkJGHrsWkjx3rLoYfY6Zx9e1wInyIWrAztkAHY6FGV/w5oQH+LpVNGqf+Ph
+tEx9WLCOuUtoZ/ZNDmYkw4i/7M2Ip7GfzFbf3OhJe8rEkuCxhp8JrwWL7xeq/6Cd
+Y0eKdWdqmbVWdk9ncV7/
+=dMJ7
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsbsms/libsbsms-2.0.0.ebuild b/media-libs/libsbsms/libsbsms-2.0.0.ebuild
index b12349b8149b..747b70939c04 100644
--- a/media-libs/libsbsms/libsbsms-2.0.0.ebuild
+++ b/media-libs/libsbsms/libsbsms-2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsbsms/libsbsms-2.0.0.ebuild,v 1.2 2013/03/10 14:18:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsbsms/libsbsms-2.0.0.ebuild,v 1.3 2015/01/29 17:41:44 mgorny Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/sbsms/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="sse static-libs"
+IUSE="cpu_flags_x86_sse static-libs"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-cflags.patch
@@ -24,7 +24,7 @@ src_configure() {
 	econf \
 		--enable-shared \
 		$(use_enable static-libs static) \
-		$(use_enable sse) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		--disable-multithreaded
 		# threaded version causes segfaults
 }
diff --git a/media-libs/libsbsms/libsbsms-2.0.1.ebuild b/media-libs/libsbsms/libsbsms-2.0.1.ebuild
index 90f7c9456913..454ab9191036 100644
--- a/media-libs/libsbsms/libsbsms-2.0.1.ebuild
+++ b/media-libs/libsbsms/libsbsms-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsbsms/libsbsms-2.0.1.ebuild,v 1.7 2013/06/29 19:41:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsbsms/libsbsms-2.0.1.ebuild,v 1.8 2015/01/29 17:41:44 mgorny Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/sbsms/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="sse static-libs"
+IUSE="cpu_flags_x86_sse static-libs"
 
 src_prepare() {
 	epatch \
@@ -26,7 +26,7 @@ src_configure() {
 	econf \
 		--enable-shared \
 		$(use_enable static-libs static) \
-		$(use_enable sse) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		--disable-multithreaded
 		# threaded version causes segfaults
 }
diff --git a/media-libs/libsbsms/libsbsms-2.0.2.ebuild b/media-libs/libsbsms/libsbsms-2.0.2.ebuild
index 88a5e35888b8..492609c344f2 100644
--- a/media-libs/libsbsms/libsbsms-2.0.2.ebuild
+++ b/media-libs/libsbsms/libsbsms-2.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsbsms/libsbsms-2.0.2.ebuild,v 1.1 2014/10/10 04:29:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsbsms/libsbsms-2.0.2.ebuild,v 1.2 2015/01/29 17:41:44 mgorny Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/sbsms/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="sse static-libs"
+IUSE="cpu_flags_x86_sse static-libs"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-cflags.patch
@@ -24,7 +24,7 @@ src_configure() {
 	econf \
 		--enable-shared \
 		$(use_enable static-libs static) \
-		$(use_enable sse) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		--disable-multithreaded
 		# threaded version causes segfaults
 }
diff --git a/media-libs/libsidplayfp/ChangeLog b/media-libs/libsidplayfp/ChangeLog
index 650677c6b7da..26d9d17859da 100644
--- a/media-libs/libsidplayfp/ChangeLog
+++ b/media-libs/libsidplayfp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libsidplayfp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplayfp/ChangeLog,v 1.11 2014/01/28 14:06:31 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplayfp/ChangeLog,v 1.12 2015/01/29 17:42:48 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> libsidplayfp-1.1.0.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   28 Jan 2014; Agostino Sarubbo <ago@gentoo.org> libsidplayfp-1.1.0.ebuild:
   Stable for x86, wrt bug #490463
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index 38c70b262c58..36e6510f0ec0 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -4,23 +4,25 @@ Hash: SHA256
 DIST libsidplayfp-0.3.8.tar.gz 682303 SHA256 5597a40b87c8b5adb23480f71fb15097e3d63be341c45029245a8ed50e0ecb30 SHA512 5a4cae8e7ca6c9ae514b7018b27c125e17dc6773db036dca7140e51d3021a4274348b791d72e6e277ac0d1fa3b20ba2b3a04bbccf574db178b1b28428f2099cc WHIRLPOOL 413b4baefcb45fb3911d9428b2cd154ca11f0a33ad91725cf2410b2d4e5b8d5ae24de9721e90fe41d60916477d59fc7b41538f17b7e183c721808c62db49c298
 DIST libsidplayfp-1.1.0.tar.gz 620228 SHA256 d1fa1ec68a1b4f1c8b5b27073e699a6a9d5484586a246b1cf706e9fc2d6d8e1f SHA512 fb0ce00d220772aaf97fc88b7ba3e764f1c94439c9d35713743726872cf6bc6524893489c5909be538f0630896bd328560c6b189d6d2d09932457671080ed76f WHIRLPOOL f3625612dcabe6e3f7f6e46203d56497fb6abdc2661acf05e99ca548332c412632c436a5533cb7fb8e39a5adfa9772d2858283279557fd8dc1c64b0bb1512ab1
 EBUILD libsidplayfp-0.3.8.ebuild 786 SHA256 90b12b50d63c19a6330c360d484203e9dd3c624f20cf5c818aeacd6399e36332 SHA512 c792839bc995399e567bde19323af67f7170982dc37bb9ac0a3268c0891593501ddb2de7ce80fef37ee5eec20c30f1f35360fd3fd6247df426af8d5b40baa428 WHIRLPOOL 26ec9e711c1fdbaa802e322289e23262b6aa47088606351645fcdfc29c389a01c86fe3731519002f4e64a9af23f1010247c69887e6dcca0588fd386b734d7d10
-EBUILD libsidplayfp-1.1.0.ebuild 814 SHA256 48af85cfab277b46293413e7ddf5427770cb975596f22fe9714b8881c2f7bce6 SHA512 de76beba9ea50daea9fb7d4bd6a66575a8c2fbbcd8836211b95e735c0b92d1ff75d39052a2b4d3683c5194c69fcde29b665204b867650d294c974555ef688b27 WHIRLPOOL 8735c38e10e3e171759fc48b3a66ca3ac7c63cc5a7adb645703dc784b29c86d8e6d9f14fddfe80fc9fa315e658425cb934fea0a683438320466e1b2a304c4d1c
-MISC ChangeLog 1633 SHA256 52537a854344277259e301e99e9ace912812a6d6f4eff39b82ec6e7339d3678a SHA512 602996c88dae5c95f5c0da66f5dc3b5a3ee9681b7d3423b919247cf156f9b818df40e26099fbd254bea01608e059a6d54b3b3201e13d97a5a083c362492f975e WHIRLPOOL c4ba321c272814b47f99e1508422e358c294d91ec65d054e9f926fce4cd29ab714782115b5f5a795589b5c7594525789b6b8efda2adfdf7e7dde05e902011da0
+EBUILD libsidplayfp-1.1.0.ebuild 849 SHA256 6c6fc1bd4ba678c515d3056f732fdd9f2b9902de0f5c0ee39eea56f5a7a45a2f SHA512 83a0c4c7c520be7a41c680dc7bee86ea4837d272492362d5efe5422c75aa12fe800c6e1692f8cb8e7ff8d1f0b133d12850bf61277bcf38c838f1a4cbb992229e WHIRLPOOL 5d07fd50429bc8aefdad6b4990c112676c33ef4c27dee223a91549c848bc2a7b75589e468186f508d442e5d67bcd09eaef2f39732679f7af4f80bbbd39fd4d6a
+MISC ChangeLog 1741 SHA256 4bbf27f58e53612968ce38e5e3d523bf25f24dbe643ee5d979cbcb30b80be819 SHA512 7d747430f4b551e14952c66a86da539ba35a32a1a621fa24a2af2366ad54993d0b3e7637309f8d544ebe28140ff645e7bfc8af64c4093bdb2b4d451acdfcc9b4 WHIRLPOOL d3602e79a0199d89adb0dc60e7b474d15a899432e01b5a9ad99a1693298161ff45d4c817ccca49fd4b6d25224a133239f11cc70f556183584305449767cbb22a
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS57loAAoJELp701BxlEWfOkgP/2eJBtf9aSvbVcUtgkCHsu8/
-zE41InngdBPROJEkmVaydeansaoe8fL5LqPzUmBosV3PltefvEaQ8EoilwMYW6kz
-IhlzALrMtwSTTtZ5rpGwEIJRh8PoVksGfdhbarFLOIQ4rAhyhfCQPbciOmgctQoI
-NDjItntINRslOo6aCP/YUcr/NM3B5n+jj8Q8WyzV6XpqgvgzaXJkKvKlhcEEGxXQ
-EDxa002vYrwVD22QIFVEPT2uUhAhC2QhMoICWgYUBNtH6AueWDilENXEdN9r7/FD
-ag5F7OfLW1ymGrMeUdo0BoTa0s7yKZXYybXq0Xvz/NKkCqMKlOxee4c4WiszG/pS
-81ben/Wwj+QB6rTcDsz4kFctFyvChzKUO4tgTYgX3NCf6vGqsbLpiacyXPROpBWM
-IlzZaa/8K+/izbYRW7/c2xVf14sIDAGUsFf45aOW+itbNPS5Ki0Wa35wNBV3qX+Y
-yOPT6V/cEJ4hh8zgX/x0cQ7TIu9f2K60aZjkWrKYX4lB87arY1bYyRM1JNXxpPMI
-lHyNWdZ3zUBWCh0jZJ15RJvUs6+jq2UIWrZsFvHcqNj3opPS9dFjjcMZJ1dBygSM
-U7+2XzHMxJhr5rJeXtaglkW646HItD4br1GY1jtuVE/+3nAb77GTZCw+B/wAOnwD
-fPi7it3UY2tlhxiR2fD9
-=Yi8t
+iQJ8BAEBCABmBQJUynEZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO/sQP/RbjUfs3GN8iE+LV4tHbSCw7
+zlaurZsV/8pg/t08M//ecRRDeUwQmRXVrp9/sOUsryRMqTx6fpXtRJkAx1OBjBwA
+zrqTHnXZDmxz2GjaOhaUWjdkXCwlGgt+LultStJjqjFLhiLRNT62DuJLmGJyjI++
+03JXj6bspLtmwvt09wVEiz7VnW4sw/hsZJqT8XqLN9ZQJrX39qTjoLeL6ftIiSs/
+rG/ZShD6B99xmqcW9WdLvvWQy9GOABb6nxGi+28e5XL6B6rVSI8SQRAxbNVQK96p
+6ODeTwvMUJ8lufT7S40pQnBk4lZmJZXOdSoR0RI3kTugqJGkiWHepDfrtaPsdPPK
+d0uZ04+H+BjovWY4QkGbG6Ncg8W340nWeTADq0X5kOjKDvU/xg8iEC/nfcynARh2
+Rs0ObSptRP4R/tPnnhVOVgWbuB5+KMcR+7fq1m0brFFuLnX7E3u1WfqAFXjD1kZC
+MRF/gjzQn/mxqC/Ihq8T75uWpSGDEpNqj00yWrCZ8h+iIK8yceeY5BPBpcUqz8/7
+PfqMoA+yEcm7C9oeFYsx/6788gglz6vMd3QQbGI//ncv5hftGxMarx3N6VJgzFVq
+PBK4bWuUbWjD8iVgR+wRfoxWy0TO//NlVN24gG/xsSNj+N0Gyq8wNEOoxwNwjx89
+DOlFKOMxhH11xfdvOqTt
+=Eyhu
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsidplayfp/libsidplayfp-1.1.0.ebuild b/media-libs/libsidplayfp/libsidplayfp-1.1.0.ebuild
index 3a31f3371e4a..c8398665b109 100644
--- a/media-libs/libsidplayfp/libsidplayfp-1.1.0.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplayfp/libsidplayfp-1.1.0.ebuild,v 1.4 2014/01/28 14:06:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplayfp/libsidplayfp-1.1.0.ebuild,v 1.5 2015/01/29 17:42:48 mgorny Exp $
 
 EAPI=5
 inherit eutils
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sidplay-residfp/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa x86"
-IUSE="mmx static-libs"
+IUSE="cpu_flags_x86_mmx static-libs"
 
 DOCS=( AUTHORS NEWS README TODO )
 
@@ -24,7 +24,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
-		$(use_enable mmx)
+		$(use_enable cpu_flags_x86_mmx mmx)
 }
 
 src_install() {
-- 
2.26.2