Switch to CPU_FLAGS_X86.

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

4 files changed, 40 insertions, 34 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 6a8458b38da2..2e0101a87aab 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.1042 2015/01/21 20:08:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.1043 2015/01/28 22:13:11 mgorny Exp $
+
+  28 Jan 2015; Michał Górny <mgorny@gentoo.org> kdelibs-4.12.5-r2.ebuild,
+  kdelibs-4.14.3-r1.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   21 Jan 2015; Johannes Huber <johu@gentoo.org> kdelibs-4.14.3-r1.ebuild:
   Adjust deps for Plasma 5.
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index abfeae655a06..2e682fbd73a4 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -18,25 +18,27 @@ AUX kdelibs-4.8.1-norpath.patch 788 SHA256 813acf8e0b23eeac94d6f504ca53a3a5cc2fb
 AUX kdelibs-4.9.3-werror.patch 1521 SHA256 0dbcfe622041387fddac550c37b30bfd5cf369fab24d08de566e1a64849e2e79 SHA512 79777b19e8ab56a855540c89d0f2d8a00fa40143efa5bded05be71b9ef45045f533128ccef691dd6667f3934c076968abf7fcf5aa311af56c63ba201efe4e3d5 WHIRLPOOL 428f477ccfcf0e4bec3b80d073d4f18d18e520afb24780a5682d146395bbb4067b3fbcb5aabc2f2304de435a8e316433fb32c9d1fc84380fcf17a4d428f521f7
 DIST kdelibs-4.12.5.tar.xz 11551604 SHA256 9711c3a3d29387dc8b40425cc2957e9f1f2d747d83e9e0213bb8ff6638e68e09 SHA512 222a3a5ad7a728723862fbfcca6886316964ba1b100214132d27d0f8b1bb89b73824aa0c144cd4dbdf37a43d641d9c602befcd94e8095b7bc73bcba431c3b13f WHIRLPOOL f959b45cd7d8fb0ead29153eac830ba54448b53ff0c9959628513e92c90948b128b0413d3fbdf88698d998f3c2d8d819564013987e6d1034242dbd1de23b3518
 DIST kdelibs-4.14.3.tar.xz 11600500 SHA256 f8206da1106184ef0bd031b82701c4910b8dade331c4cdaf1cd9c6c5208cfd9e SHA512 7713cec4851fd4d7d5376afd905515902395ca469cefe1924c05ac0cd4499c28ab6a3c3e7bee10c4cfb3584f2fe93cfb6129d5b550d56d18217866f5fde748cf WHIRLPOOL 9b6d525136cee8e43b832dbbe7451494cc30e15cc58cc34eeab8c9040a9cbe893dc8ba794be50cdb3462e20279bfb41bee22385d3d106a353ef738da510f5c04
-EBUILD kdelibs-4.12.5-r2.ebuild 8702 SHA256 db5c00f1ac83d62eab99704685d9fead3ac90b3f6101be37e039fd55a953aa43 SHA512 6859c1b5ea4caba8aea11534664fea41aca38c09e29ba654535e76c5f5f03eaef54606fbe405e8493e613d4b7ad6c593756319ee6b7cfd6b66138d3ddaaee3ec WHIRLPOOL 9bbc79be01ac7e54eb8d34b62716324360b6d9533ca85a80538a35f472c8421ef9f9e4304ea108b3b28a0829d2afecac5341adccf013b31b354949d46bf9e15b
-EBUILD kdelibs-4.14.3-r1.ebuild 8739 SHA256 ee3a7a5455cc648fec9efe2799cb8b235cb2b0bbe5f8d45becd5397cf50cab19 SHA512 37e84249375ba86152bac4f7e6f86e568392f7a77be4306f937a0a71df98ca20982088a65c8912f461fc3012bac2f96e086fc96153eb3ca8eb9be032815afd60 WHIRLPOOL 1eafe88d92128968b2a1382abdfb7d006aeac541f468ab60ba683e20e8727a94dee06aa36b6482c975babdf4aab5be348ddf51210bb12d3b1086a3955c4ef336
-MISC ChangeLog 61050 SHA256 e2cd3e7969b6118f59c43a9ca23d97d4166919f79f8e2e89aaeb16aa4ee4b902 SHA512 8ee420f7e57c723e41f626d40a1bbf710eca2caacb88209e0cbb135f5d8e85b70fd8c804c40b0e4626cf5f54d0bd83d4cfb4b2a69cf10987ba54771827d585d7 WHIRLPOOL db87bbb6245bb81626549a7cc2e52371d9b265baefd94893dd7c075d8617acf450a3c95fb5c2efc5d0d93325b5a4799c1e8aac938648abf040376b62ed5d9c1c
+EBUILD kdelibs-4.12.5-r2.ebuild 8810 SHA256 e81eb35366f7008dbab805ce8e7f09b1b47badc43bff857351ef1a8dab2815c4 SHA512 7814f4e796bbd798f163d56edcd8bd374990e75eac3d983a82912f40aaab4fc3ab104481342bc61c0153ec9485444fa6355eada8fd0003434d8009e44eb50936 WHIRLPOOL af632ca3f6c7b2433aeeba1c91e9727e690add68d8f5a81c9c2f83713f31beb2a77644a7bd5f3f038bde01eb82f65e5e4dfcd0ff59ed52ed59fbe5521b9524a0
+EBUILD kdelibs-4.14.3-r1.ebuild 8853 SHA256 21a583f7efb74e5071774c9b6311b1ef0a9bb73af51864e5fe9f09a051cbd118 SHA512 28817ed597db10446cdcd60ef9017b1adcae7c32bd17379ebe15c99ac256ac41849ad06f8c2e4922ddaaad4539462147564a2e6238791f9a04d189658e0d079b WHIRLPOOL 0507821e1c0a5dd3355e866800d955f2c72e9ab4bbf8f4c4c6210861f20cd4c752e59ad8fd73e397d5cd884dd147632a51763f4919dfe503cf38b075a39aaf91
+MISC ChangeLog 61184 SHA256 af4f9dc41e98fbcea07ca0cb13fc511c1133e33886d7bf1160038b02b2a163ad SHA512 9860b959265c6ab623763d1771f34fe4edd034965a91f476e289e47350d87bc211e5a6768de10527b40d0dcbf4edfc847144e35008ca62a582bf751b362088c0 WHIRLPOOL be35e5c492b840ec4cfb7ded148d877ae326efd0474a4390fd169f43ac3d0ba35319d22a9f6d857ad2011cef5dbf900bb850292cb552da89bd6adc286b61b4a4
 MISC ChangeLog-2009 110608 SHA256 845ba7764dc9cabd4753d146e82cc0347a0dbbe21a76a4aab453106e7d70ba1f SHA512 c643c3bd742f1c2c4322217b4d9f2992310e9bf86f585ef687cf68f54ed2a86d2950f7f3c3fc5021a2dd472b6db39e17415ca6cde478e4ef4f91317a116889b5 WHIRLPOOL 8dd58bffc294a811176bc3f9882a0fa8a12c02fcdd692bacfccfc9745646d5062d3980553388fcdc835bbbecefd0783f029d07a5999e7208ceece5a93fa36893
 MISC metadata.xml 335 SHA256 ce5c36bcfe52e7bc12d4c7fb83f64b01fd52f5b329365cadd44bd9d59b1e3a3a SHA512 efc588b15e3096574a9ecf0d0edf99f979197cc0e33b2710fd7babb16f2dcaf3cff22197e9fb429ef97590a1288410f77cd987e5c03b3dac8c85236b9af751e6 WHIRLPOOL 6f8cba5c16126a196fb424944b9c12322579ccbe8165821e5cb11611f941a664dee1a31f52927a346da165c25cd829c1f0187e40d209e5ef7c0af7e1afac3347
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUwAdXAAoJEGVpnaTzz9K9XBkP/3wFBdA/yzyEpdnrXTBGHSvr
-v04xULG0yCJbjVBMM85rvfjzcymyQXc5Oes2KiriGv3juuk+NHe/WFAL93vgNDnj
-F4rOujGN0l6l61OEajfR7F6Pn5U7yIsq6EbzUeGTPTxaP3OJdMNjy34GILDDuo2a
-KgII9DFAW9xg8teDvJBJ45+5MfpOuYCj4WmooY7j36iMrIS036DgsS2CqXKi/2x7
-wWb7DWcDRbaAXeZaivr8riO5ziCEFPbj1DEkHHguD/WK3yILWjPnj1ndrRn73TA3
-Gnt6yLz44L13VLuotyol2/1ff9aeTaXAURiVqRSqtbJp0fLIdDm2OMvQaLYlMvW5
-wVqyJEw1Tk54+oS9EpLIWjcL+mwgbHw2BUXrcO4mCkF8i9+fi3SiAEG3N4Vf8bxK
-jFsE5/q847V2Es44ybGy5haEMEDqmI88tiJQYEIjSrDhoWLmSahSnr1jLqTp5Rto
-LxlENugRDEu68RSfQF3MFpoKX4kZqkSOdNgSuzQBrfEaeRJkyh6BWihMucQXLaXl
-UUcAViLC1aFfqxg8ViO9Yn9inWzdTxiZ9lD1eIaDCVzxId6z250BsdLHH4ChsUbp
-u4FNwQgqS82ev3KPvIojBlhrLxtucBjvqwbBjXjSYmZZw9GpqKqZjZhrVzIVNJ8Q
-D8IbXUy9idAFDCBtOG98
-=wtME
+iQJ8BAEBCABmBQJUyV74XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO8VUQAJmN1Nib4a9z1KVSaWWj3HRB
+rMGcB/jyRafa57aTIF3kyT+BNd2EkQlq9Dq9FmBy13nfjFTvaeNiJkp3cWeCecFj
+tGAjwSubU/Etb/eRUxDK3iKMdRmEirAWYpLRaQFbkD9ym+8Ul4M5NyO8LEGE6URL
+Zex8J+dX08278IFmOcNq0omdyX5GwWc66uPRIabdbKIYgi6jp1FQ0HmOUsjGuMZ7
+9D2RefxHlqGtAcepq7vqFduFva7z+TP1V+FZV++0EQNalbEGWsoV+5b1qePM8tOw
+4P2uIbESXPCWr3EyrCn6lOAaVHKJuWf7tRA+1vM5im281OZ2Te1GRvtd2se+/sni
+SuQV14EBqZnHukHLpA9/5Xh3Ym5aYG1ulI8Sk6xhZSsv6LeubW/BUkTOqMvjMG9i
+9Ty4znYbP3fh4RVyftGlh8JKJlcx9MN4VzaQMNdcgpdEclbsBQ8DLNJ1PrXPwTVo
+4lociqQm1cKbDROmPzAD9VOaU2cNvGTw7PLP3+AYkZnrwl1RyIAlLMObS+iUMe1Q
+T0fs3WXNO5iDFd3tgIZMC/0Tc0oZdQ+ABuI0hbb9WMoYaUuQ0BWdczsyKsv7i/JU
++wqjLyQt6CnWrXlJ+n5x2SSg+6SJwQ2Z/SBofM3yz0Rnsrd5S5+gTNiFDKsytj9U
+x2ZirKXasi1PUaCOCIWH
+=sCFr
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/kdelibs-4.12.5-r2.ebuild b/kde-base/kdelibs/kdelibs-4.12.5-r2.ebuild
index 30e2b9b9c0cb..6a512dd68b4e 100644
--- a/kde-base/kdelibs/kdelibs-4.12.5-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.12.5-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/kde-base/kdelibs/kdelibs-4.12.5-r2.ebuild,v 1.7 2014/12/31 12:37:06 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.12.5-r2.ebuild,v 1.8 2015/01/28 22:13:11 mgorny Exp $
 
 EAPI=5
 
@@ -16,9 +16,9 @@ DESCRIPTION="KDE libraries needed by all KDE programs"
 
 KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
-IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma
-mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks
-+upower zeroconf"
+IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos
+lzma cpu_flags_x86_mmx nls openexr +policykit semantic-desktop spell
+cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
 
 REQUIRED_USE="
 	udisks? ( udev )
@@ -193,11 +193,11 @@ src_configure() {
 		-DKAUTH_BACKEND=POLKITQT-1
 		-DBUILD_libkactivities=OFF
 		$(cmake-utils_use_build handbook doc)
-		$(cmake-utils_use_has 3dnow X86_3DNOW)
+		$(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
 		$(cmake-utils_use_has altivec PPC_ALTIVEC)
-		$(cmake-utils_use_has mmx X86_MMX)
-		$(cmake-utils_use_has sse X86_SSE)
-		$(cmake-utils_use_has sse2 X86_SSE2)
+		$(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
+		$(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
+		$(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
 		$(cmake-utils_use_with acl)
 		$(cmake-utils_use_with alsa)
 		$(cmake-utils_use_with bzip2 BZip2)
diff --git a/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild b/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild
index 120601c1ae0e..6a80481dacd6 100644
--- a/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.3-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/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild,v 1.5 2015/01/21 20:08:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild,v 1.6 2015/01/28 22:13:11 mgorny Exp $
 
 EAPI=5
 
@@ -16,9 +16,9 @@ DESCRIPTION="KDE libraries needed by all KDE programs"
 
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
-IUSE="3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k kerberos lzma mmx
-nepomuk nls openexr +policykit spell sse sse2 ssl +udev +udisks +upower
-zeroconf"
+IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
+kerberos lzma cpu_flags_x86_mmx nepomuk nls openexr +policykit spell
+cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
 
 REQUIRED_USE="
 	udisks? ( udev )
@@ -198,11 +198,11 @@ src_configure() {
 		-DKAUTH_BACKEND=POLKITQT-1
 		-DBUILD_libkactivities=OFF
 		$(cmake-utils_use_build handbook doc)
-		$(cmake-utils_use_has 3dnow X86_3DNOW)
+		$(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
 		$(cmake-utils_use_has altivec PPC_ALTIVEC)
-		$(cmake-utils_use_has mmx X86_MMX)
-		$(cmake-utils_use_has sse X86_SSE)
-		$(cmake-utils_use_has sse2 X86_SSE2)
+		$(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
+		$(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
+		$(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
 		$(cmake-utils_use_with acl)
 		$(cmake-utils_use_with alsa)
 		$(cmake-utils_use_with bzip2 BZip2)