Switch to CPU_FLAGS_X86.

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

8 files changed, 72 insertions, 54 deletions

diff --git a/x11-libs/libast/ChangeLog b/x11-libs/libast/ChangeLog
index c3ebd578db73..595c060507b9 100644
--- a/x11-libs/libast/ChangeLog
+++ b/x11-libs/libast/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libast
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/ChangeLog,v 1.33 2010/11/26 05:22:15 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/ChangeLog,v 1.34 2015/01/28 22:21:05 mgorny Exp $
+
+  28 Jan 2015; Michał Górny <mgorny@gentoo.org> libast-0.7.ebuild,
+  libast-9999.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   26 Nov 2010; Mike Frysinger <vapier@gentoo.org> libast-0.7.ebuild,
   libast-9999.ebuild:
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest
index af2a7973eda5..4da4f49661a2 100644
--- a/x11-libs/libast/Manifest
+++ b/x11-libs/libast/Manifest
@@ -1,17 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libast-0.7.tar.gz 508654 RMD160 82dedafc23668f0bbecbf09433676d4b31e9e154 SHA1 8449049642c5a945336a326b8d512e4d261232d0 SHA256 52055cc0df0af58adc8c43cce6c9a2fff71c627a6bb0395073d353920dd1ebf0
-EBUILD libast-0.7.ebuild 1023 RMD160 d027d4de0a0a49c2cf9a75ac5dab9b54f05c6e3d SHA1 273099e05d603ce59f19cf860aaa385afe163e53 SHA256 2bbeae05cf9c2801267589f3ea23a1bc4bea3f9d8d53986c77407ec0d3deb55c
-EBUILD libast-9999.ebuild 1113 RMD160 62708e44526a3a2ecb40a4c70d7096abab66f0f0 SHA1 80c63fe07e77b85f0ae7d679a93f4627d8642cdc SHA256 70c9fd38fd2874fb62d1b5373dd6053673072920d26c652e689b27a50c937f6a
-MISC ChangeLog 4246 RMD160 634bdd9a79b3fad0c4625db7c66bac0b06e4c525 SHA1 53ac2fa4a45c4635b6135e484dbb40034851c2e9 SHA256 59f54b75ca94451d63aaf00b37e8b2535d8a18eea9c4380647ba7ca3685a1e19
-MISC metadata.xml 770 RMD160 5ddcc2fe945bc2ed3f500d183e53bd845e9e0e74 SHA1 5c5d0519a332036bea73e0d1c84dea9054ab446b SHA256 0974d313cdca1a54224ff7dff1757f2982056e78eb4bfd0db1c8e6104f99e765
+DIST libast-0.7.tar.gz 508654 SHA256 52055cc0df0af58adc8c43cce6c9a2fff71c627a6bb0395073d353920dd1ebf0
+EBUILD libast-0.7.ebuild 1055 SHA256 b7b2e5912d418598ba8851346079d964dacc0e07ff59bf43cdc7a1d8bb8c4dbb SHA512 2ee3fe21f23ae895b6bdc20c6ddd150d3f210024314f384a0fe30415811bbf4c61fa3905c55a8452b071cab73dcd244a8f1be924c4c9f353cabc859f1823dc39 WHIRLPOOL f6c85729c5c903850687965a66460291629d50c21f0b748632c26ee3282e13ac81dada107b261d11aadaa1eea4b476780b571fe4868fa2612639ceb70ae15ec0
+EBUILD libast-9999.ebuild 1145 SHA256 2a217bbed03f5f15127a365398e5baf1b3ec187cc1bf2ac307c2537e98118daf SHA512 b4300d72b04ae59380bb3ea71116599e853afa0cb8517f9731c02312779d15ab7db10e4127734dd32c525d833fc5336fb91872b56a791dd9d845bdb64841fd36 WHIRLPOOL 582a54c9c18eb0525930d4c18ed037910b934a4aab1a345f7f810225a2de45e04b320a68ad0b6a74c6123807bbc45c7584ec8f408a30a21c8c875cfffad0df83
+MISC ChangeLog 4365 SHA256 c4457e6aa608033b6b647c3d73fda09dee4743df700649c5159156493a1a8d33 SHA512 448e0c96788fc9ace342ec062e1c630d23ec1541f438b31cd6741685cddd2da00cb457525df00c0666890c53005dd9baa5f42f2c559469d8bd623a20f9869781 WHIRLPOOL f76e3357d14d1efc998dedd8c4f7449d34631ea4e21ad7e35c06a41d9c8d572ef89ab066225329148dd1940e8ebb379b52360f75cc85ba2a7698fa2fa6d3d542
+MISC metadata.xml 770 SHA256 0974d313cdca1a54224ff7dff1757f2982056e78eb4bfd0db1c8e6104f99e765 SHA512 88470985cd213181bb20ac4df9a02a9dc5e3715f3d08adc7503417d434c9607334761ddc23cda616e134006a4dac3576e663b79caf623745d5d71815e17b181a WHIRLPOOL 375b0f9b171ce9cc697e429875197fb412b3ecc020f3d159bf576fee60d13b928225719038c5eff0d1540a1c6967c06885ea1489bf595f2855e4614d5fe4fbe5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2
 
-iJwEAQEIAAYFAk59uewACgkQfXuS5UK5QB1ZlQP/QiSA4c9v3YF7bd1tjY0210aL
-5MY/d5pm4Bjin3Kf9ho1Lr8ktamsLOWVkOOJ4y0K4oIrORlwgFS0DHo89FGBBjPE
-TeGctJe7643b/my32Uy+ODLxlIrYuB0Z3PziB4P2NtSW1zG5OQSrqHtKGlKmero8
-WoOHAeMW9ocwkYEL9CU=
-=Gp2Z
+iQJ8BAEBCABmBQJUyWDSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOSsMP/icELn+RZQ7DeTMnyffOb6Ti
+XUY7NqF7bRC208C8NqycgFccQllvEFjaCnRxjr0TiQxuUyBPVtTfb61BFGsm+hA8
+WyoLTP2av+CwDk6LLjMI9369Yrcuu/siYnK1QOdnQtW61ETp1428fw4O/ZiH8lis
+SApP2sstJNJXyV6GLFqOIaxwnQPXOOBDklSh/zKUUDeDvfB1aQ3Pl83yy4g83XN5
+ruft4MP5/pBf2O50Hlb0QNKCMiGxE5KLgDv/FAiydBlz5C8cYHJH8vu7ZWmIbqgX
+2gtUw6snFr5UdH/zmrQ5zFB3/zM51o4kJINOxilcflIcjbFXVUcmWWXmqiCeLctR
+ILyHYVDZt6grKCZ+5dWmoYNWUvIqPIsuz6ghTyV7pBUZUojrT3SDVf1UAmCDW0ue
+oNMCVe+oicWA4mHChZ+bwc9VMd6qMHL+QZ53xOhNBQ8K7lBjFWB8vEr1aLyvIzc3
+R6ntT4SWSsCoPsy+b15LvX8O8mypPh7vwp/CzpMyuWJV0tnhtTDF3cD1PJlQualN
+NAEQ01EMAoiC4bXkunvaioYxKNy9+qltnGW+KFa6TKgn6ujItafeB761u5Nkkpbo
+icXl4ALt6kjfJTc73DyksmfY8uv6Ko6TpVgqsu6aCQO2o5xvDiLyZ5dmnGwDxHmb
+tmo5qb1KLYwXFMwFNpu8
+=L/4A
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libast/libast-0.7.ebuild b/x11-libs/libast/libast-0.7.ebuild
index d24d965d2cec..2f1ea884cac6 100644
--- a/x11-libs/libast/libast-0.7.ebuild
+++ b/x11-libs/libast/libast-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/libast-0.7.ebuild,v 1.17 2010/11/26 05:22:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/libast-0.7.ebuild,v 1.18 2015/01/28 22:21:05 mgorny Exp $
 
 DESCRIPTION="LIBrary of Assorted Spiffy Things"
 HOMEPAGE="http://www.eterm.org/download/"
@@ -9,7 +9,7 @@ SRC_URI="http://www.eterm.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="imlib mmx pcre"
+IUSE="imlib cpu_flags_x86_mmx pcre"
 
 RDEPEND="!sci-astronomy/ast
 	x11-libs/libXt
@@ -27,7 +27,7 @@ src_compile() {
 	use pcre && myregexp="pcre"
 	econf \
 		$(use_with imlib) \
-		$(use_enable mmx) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
 		--with-regexp=${myregexp} \
 		|| die
 	emake || die
diff --git a/x11-libs/libast/libast-9999.ebuild b/x11-libs/libast/libast-9999.ebuild
index 12feb9ce5d22..c1d8a535ba6d 100644
--- a/x11-libs/libast/libast-9999.ebuild
+++ b/x11-libs/libast/libast-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/libast-9999.ebuild,v 1.11 2010/11/26 05:22:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/libast-9999.ebuild,v 1.12 2015/01/28 22:21:05 mgorny Exp $
 
 #ECVS_SERVER="cvs.sourceforge.net:/cvsroot/enlightenment"
 ECVS_SERVER="anoncvs.enlightenment.org:/var/cvs/e"
@@ -14,7 +14,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="imlib mmx pcre"
+IUSE="imlib cpu_flags_x86_mmx pcre"
 
 RDEPEND="!sci-astronomy/ast
 	x11-libs/libXt
@@ -40,7 +40,7 @@ src_compile() {
 	use pcre && myregexp="pcre"
 	econf \
 		$(use_with imlib) \
-		$(use_enable mmx) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
 		--with-regexp=${myregexp} \
 		|| die
 	emake || die
diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index 000dcdc3991c..9cb2c3b661f2 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/pixman
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.188 2014/10/22 17:15:49 chithanh Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.189 2015/01/28 22:21:55 mgorny Exp $
+
+  28 Jan 2015; Michał Górny <mgorny@gentoo.org> pixman-0.32.4.ebuild,
+  pixman-0.32.6.ebuild:
+  Switch to CPU_FLAGS_X86.
 
 *pixman-0.32.6 (22 Oct 2014)
 
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index d6e252e23aab..530576d3dddd 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -3,26 +3,26 @@ Hash: SHA256
 
 DIST pixman-0.32.4.tar.bz2 701414 SHA256 ae2bd664057e330d41b40336ed296d3512318ce7f2401cc42601f2613d371e4c SHA512 76c7dd58a4c8ac3b99ab4b6dd4c0d777ad6d8814b0d0b48949846a702a07beccda4c117ec0493b9b5c24004774cf7a40914ddc0535eae4ee2516bfb9ad9eccb2 WHIRLPOOL 9b6aca5309f53129c1e6e52f9b27c8be2c828e76ed6a0980bd02df5861118e17e4e72ddbc979a6d3985e42a4f079db5f42a088a66c48fbd7154d5d08ada5fa85
 DIST pixman-0.32.6.tar.bz2 672201 SHA256 201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4 SHA512 162e34a3ac728b348b8cd429172fa9f6ba1fc8d94716368c84a8081c42c4e2639ec7624e5528d9059695736be785ee210835c7d832b4a07a2175aec349ddffe9 WHIRLPOOL f12567cf1feb7a82956f7b2edd1db29e439933e437a9419bf505eb1ce61ce8ac9ab1fe678f0e91064ef4a776b47892930940a10c9051da165155304f3757cd92
-EBUILD pixman-0.32.4.ebuild 1145 SHA256 1eda9d67b95178f58fae1a1c5043c44c4a1c0fd1510130f6b3cf45b4c62160fb SHA512 c866d2eab61e2ac217cc02ee961e8a930bb926625f4c96f22710e55c2917ae6ec56564cf440145d8c09979afeed8f42f2b947edeb4ad7d96dbedd923d21110b0 WHIRLPOOL ca33f9667fa5ba090fb01256cb91f83a8879a7a82be9d679e2bd0ec9b416ee0d91bd59b5050518d47e3e8a9f9d442e93e5ac750d7beafa8aa9fa704bbdfe44d0
-EBUILD pixman-0.32.6.ebuild 1153 SHA256 952c4cc162d4872185ca6e7d123566d389a17086c1cafbf5400650bf82d06f7d SHA512 e4cc96ba6fc457a92a95a0d0bcb957c08c9198c27dd3dba8ee29e7f7019517f4270a42ec3321d575ebe3c843696e9928a4fa8015fdae0a5ad7fe4debf4e8c3fd WHIRLPOOL 70ad33d87bea2815a3c6a05eff595214df81a4787a8f8cfa52e493a7146a6d4d171fa435859fe49ad49c47f5bb407bf13f0700d3e8bb918402c771bd96e9d42c
-MISC ChangeLog 24989 SHA256 161eacca3944cdded18438dbe4c456cab0aba53ab2ecc187012fb9c90a837d1a SHA512 4716403fb69dfcc1305d145830bf1d089fbd02d6dc8bfc311d5ee62f7000ebaee804dabec132afa1495c347abcf1298d3cc10109260fe19474392d5420430623 WHIRLPOOL 17e07d3002f8cf272dabc8c1d0ea3161725481c6adf12f9c76e39aefca5e81844d964e9890140ba5efb35ca4800866ef34859b39f98a7c843d338016deb67783
+EBUILD pixman-0.32.4.ebuild 1238 SHA256 7ef1ca4245f99b4ad5edd5a96bb1cb76aa5c2c61190196a0afa1a1b2b77183dd SHA512 72b537257b45fd2a55f5f6b880e7d79596232c2694b4e53c3a25225c0bfb6372b0bd3e0086c935b3791b96ec0331f2e6cca1430c7a5e3e1b40e274537aedce12 WHIRLPOOL e25cd8af36dbdb09f74c9cd5c4b5a3b87a562b6fefd836b7904638407e161fa2b66ff57600ce649d40f3faf6de5682e3a55a27b356cff6065266b8104865b1b5
+EBUILD pixman-0.32.6.ebuild 1246 SHA256 ccc7c6cbf122b27ab086a2d8cf5ac6fbebe2027c302e808b0b031d4c4a521874 SHA512 a84688258fda2edece466bcda8d64f11e65a7715454b379fa974e04d0a72a35107c808c937d5e5bd8088833f99954a2b3161929a67d8fa173a72d900726a602a WHIRLPOOL 630193c5d0e1db42a229604b14ec3535a5eec0d41da808c8430c1fecbfb3440b1400377518a5daec2fc2ce9eaa64b9af0c285ee7d1e13bdf67ed2fa7f6564bac
+MISC ChangeLog 25111 SHA256 3a6d2b8616bdf995c03614de1801ebaf664c886777434c7f8ef2a13f6d8a109c SHA512 a15d30fea5f43ed7e6c410f61938b5a551638c8e7c8120d43ba9e31d605c5de06e4cfa7eedeffef780f26fd694d36044f76fbedc49c9f3d418ca0f3ed2f92953 WHIRLPOOL b0404a5250c778625d577d1643424d41f38d2ab07952e6aa5dc8decb60f8e7363abdf54707eb5fab8d7231a5e3c3472cc74e843d365a828652e4a5caf7e5fce7
 MISC metadata.xml 317 SHA256 ceb9d4b118a9bd98b35133f87226f05488407f665541ccec0bc3b31ec5c3ccd5 SHA512 b311eca7ce00c4495b82f9bd69feed07ac311fc1023b6a9cfdd058549fcd24aa23e930fe89b6ec764852b408b504fed6a82ead81317c394eaa0b6c3251832bbd WHIRLPOOL 7a7dd2afdcee2f2a617ed1176b6a96df7050cfb865f645c393b97ebcd355af08b828825333441a9ec29722162b4708afd6025ba88ad1a951faf06d8aef8064a0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUR+ZvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
-MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYR8QMP/jpWvkGKGokyFy23R3RIo+Hw
-+fvcLKL3pNYomhQXWKpuy7VjeMacxwsNskdbWBMDi+ihIvoegzQoGiFBLhq5qasf
-TF5ImNIAyuc9zmdbMPHdLV34xebb1KuZwrGIiyI6mJmqZYtbcl3AnCbt6TUJaXsr
-/PQm7riG2PJ5GL0iXDvp2Y35E7QSA95n32XJsiSAOLq52QxeOiWUf4QYszLPu1e5
-flQbxMMAJSFYJduKMWkby/WHq/hT+DnM94dKgbiSi3fF7d25O0unbcU0oHswYaud
-DsnodExuxFzJ4PVRFmQiJx2PxDJgVFxm0kbfvVXkqyASIlQ4Tgt6tSFeKW0AV0Py
-dC80EBa0Kpo0zPTUhhsW7a/yKe7u7Ek6Xv3z0v1AyEyZVN1PGc553oTAqMOl+BNm
-PxkQfuSEeXmqXPVa7SSzlsjlGB34L0G6uuRqFfXxZiuMWXrlDR6plpORovf6k5Oj
-GC1AZFiNzLnxqo2GfFEhu4Z68gAEScUgDvRoqJ50GI7lV/FhMiMiOtvTf5kPVgsW
-hu1Cgih/ti/9RAUVJnFBeetOOn+s0CuLjYK5KpsigVpMKu7YFt5Kfx10xhaCAkjj
-nWEMZ6LKag3Id/zEPpr3F0J6pSxF48dN+AdJ+59zsZJDW8H8FcHtqB4tfsexLPXt
-Dg/92x8TRXjtCVWPalun
-=0Ebh
+iQJ8BAEBCABmBQJUyWEFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO3R8QAMxYMw8Ldq4IYavQIeJ5Kpp2
+SLjupkneD8yf4cdu0IcM+GzJXARvSP1A2mBoAbx12SKjEheXM+5tV/6DCaSVKFQ5
+QOyCJIXqzmUdHrPuIbyJBf1SuZWSgm8SwGPgsj4Nm3zgvzHORjfohj2b8Usm+hGF
+hPcUCbGuoQW0EM9aqQ+YQRyPA7H6JVlFujK4eFV2Pj65Xce8Q9L3yYWm29xNWZ4I
+liWugOJF+9o3y+HQZurJC9Mvdf3wbdBI4qFX4lcRG6aK++505Id1TLyTJaafdEHd
+s8goG/CNem5VKA25RUb1TNj8Xw0j6JXfp+67pmj3ycIl9H7zQJb4D/5napYdWnyc
+rcUvaLaKiC+lfJXmjALViqHb6RvMjrsqzGJMuQb29081MPeuXNjkJhXClsLpca2g
+LbCh2BwGrUXNNdQC1x0ndjOZ6Q9J3VR7KKp6+WS3j1e/fHE1xlpDmwfq+fQaYnRy
+ncBNwooc58cw5Nt1u7DzFo0B92WE6iq7h2DUvUjYzMqX+frwkGgCveo1eqW/IaSg
+q/2wNWxYVPthOpACfI1CYCjYW7TbuKTdw9UbBIFN7gUsKYa3bWDlgdsGjZ2YvfxD
+34w7bEVzPbhxSFzdtmOe5lom/RJsV5y6NwJ9fSiYNyMkc2h5dwjUAD72owH3Rhyb
+Y6g9VsKrsJfJpkMsGpDU
+=1oyi
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/pixman/pixman-0.32.4.ebuild b/x11-libs/pixman/pixman-0.32.4.ebuild
index b31e4e46ceaf..6a90a64c4b68 100644
--- a/x11-libs/pixman/pixman-0.32.4.ebuild
+++ b/x11-libs/pixman/pixman-0.32.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.32.4.ebuild,v 1.12 2014/10/22 17:15:49 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.32.4.ebuild,v 1.13 2015/01/28 22:21:55 mgorny Exp $
 
 EAPI=5
 XORG_MULTILIB=yes
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
 DESCRIPTION="Low-level pixel manipulation routines"
 
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="altivec iwmmxt loongson2f mmxext neon sse2 ssse3"
+IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 RDEPEND="abi_x86_32? (
 	!<=app-emulation/emul-linux-x86-gtklibs-20131008
 	!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
@@ -18,9 +18,9 @@ RDEPEND="abi_x86_32? (
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable mmxext mmx)
-		$(use_enable sse2)
-		$(use_enable ssse3)
+		$(use_enable cpu_flags_x86_mmxext mmx)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_ssse3 ssse3)
 		$(use_enable altivec vmx)
 		$(use_enable neon arm-neon)
 		$(use_enable iwmmxt arm-iwmmxt)
diff --git a/x11-libs/pixman/pixman-0.32.6.ebuild b/x11-libs/pixman/pixman-0.32.6.ebuild
index 7802f87b4e90..80ce177ced56 100644
--- a/x11-libs/pixman/pixman-0.32.6.ebuild
+++ b/x11-libs/pixman/pixman-0.32.6.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/x11-libs/pixman/pixman-0.32.6.ebuild,v 1.1 2014/10/22 17:15:49 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.32.6.ebuild,v 1.2 2015/01/28 22:21:55 mgorny Exp $
 
 EAPI=5
 XORG_MULTILIB=yes
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
 DESCRIPTION="Low-level pixel manipulation routines"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="altivec iwmmxt loongson2f mmxext neon sse2 ssse3"
+IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 RDEPEND="abi_x86_32? (
 	!<=app-emulation/emul-linux-x86-gtklibs-20131008
 	!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
@@ -18,9 +18,9 @@ RDEPEND="abi_x86_32? (
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable mmxext mmx)
-		$(use_enable sse2)
-		$(use_enable ssse3)
+		$(use_enable cpu_flags_x86_mmxext mmx)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_ssse3 ssse3)
 		$(use_enable altivec vmx)
 		$(use_enable neon arm-neon)
 		$(use_enable iwmmxt arm-iwmmxt)