Switch to CPU_FLAGS_X86.

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

5 files changed, 30 insertions, 15 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 52bc5484aca2..645ff41c08ad 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.692 2015/01/20 08:17:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.693 2015/01/28 23:04:20 mgorny Exp $
+
+  28 Jan 2015; Michał Górny <mgorny@gentoo.org> metadata.xml,
+  wireshark-1.99.1.ebuild, wireshark-99999999.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   20 Jan 2015; Jeroen Roovers <jer@gentoo.org> wireshark-99999999.ebuild:
   Drop obsolete patch.
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 818d0fc2c63b..30e4732195be 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -11,14 +11,26 @@ AUX wireshark-1.99.1-sbc.patch 665 SHA256 c76afab0f03c59001df597948153bf76bbdc14
 DIST wireshark-1.12.3.tar.bz2 29211228 SHA256 69950b9dcb1a630982b5f680554d73d27ee0dc856fc6aeef88c8d04eb5ac33ea SHA512 370ae828a638edac378242a996b0279747a2f54689387fe415f1f66e267a4b52c71a1a369755f3eaa6a2db0e970913dab0b5d3704af3461aa9d7d64abb3a49c6 WHIRLPOOL 4152abb29cc02236449844526207c404628c24a680e059cf8352a8ba8d50003dffca606fca8bf3a157b9970a1fba6943e0d06f51afaa847c4103ebbcbc4aeb44
 DIST wireshark-1.99.1.tar.bz2 29981374 SHA256 59d9fdff72a64626c0bb68bcfb0002d1441a9d6cfe8ec0ec72d23c1d862a4b3f SHA512 055ba559da47441346bbfeb5192884701c8731ab33868b94f432fac02e3d2181f86b3e810d6ec9710297e3a75368a507472157389150cf9c3f79d21e283793d7 WHIRLPOOL 697a2e318f02ad7214e2fe1f8684f70bf2f7cd91fbc715d16f36a72fc9d8275e96da22de6c66ba16c7c9f509eb91fa48017593d929b6f0e1458ca78bb01423eb
 EBUILD wireshark-1.12.3.ebuild 6160 SHA256 15bfcb8012983ff5c18948554c4762eb0a75d9ae61e9cbb34ec489881423a7b3 SHA512 58b8805b3b4f02f9c6debfe479e159718c383d8518b5231fe9ef5c02c04b0b92703e33d776ffe7c37cbee035abfa5c41c9a3d7d4aae90a68e43c4da906e91ce1 WHIRLPOOL 40c5c8b0904dee397fc59a1cd5e3c42c3b64ed40381fe35128f2a1f8b9bba2166d2b2735df331ea71ec955655bf1b7b1a89f5d464ca95dd0a5ea9c4e9798bc60
-EBUILD wireshark-1.99.1.ebuild 6250 SHA256 a9988a51256e96d3682f5f0d847c2596b0d12bd9f5bf898280f2965e9ea7792f SHA512 048498347fd936e176abd5f40a5dcb686fa9edbcda413da76ad02a57ede6b3c018fd9a831b4f5b6aefcc2f692fe9bb0296edabd8b1566f6633e2b3113f22462c WHIRLPOOL 5381f8435daaabf8c9eaf66367ddd81c1d45036a576ce300520d3627d392a85b1086f6575d0653ed8c95b4c0b884155fb262b3c62dac08ed8f166048c597aa52
-EBUILD wireshark-99999999.ebuild 6255 SHA256 7c99effebba3f6a7c70d674425315a892601f9985c63ed66854baf483a8fe610 SHA512 200b2301012f02a2e9c040c7b00b75964d5fd84eb43bfb870cf189b6c3169afa3cd94129d4635de17751699c25fec06342d54b2320e6aa13aba8298cd684b595 WHIRLPOOL 00d1290e6c2273d90940b323cd0ed3422e52d50b75e6127b68c4c086d9b9d87ea3894246567294ba4d8adcab9e1a5473d3093d93784ca17b3d62690c01371dc0
-MISC ChangeLog 100817 SHA256 15cbfa12e4d0741bb16b9f7cf90d0d7167763c766cc1b3dd2344ff9e7fb2237b SHA512 5cc49a9e90b943a8954548bb9ae37d003e2dbfcb9f2ee407c72328e441796b2603df2fedc634947c5bc160b2bb359c72df9c0a24b65b7a642c633a48912453d8 WHIRLPOOL 42fe99d2f9368fa0e9401d3a97f317328f5e4ea59ed2d9d817aa473715093166cd3577e9a9799710ffe66ce18cdc68c3c10002b9b760ae7f6e07b0277cbe4cc3
-MISC metadata.xml 2551 SHA256 043959725e25c500c4f38597224b0fa0da62c4a2db3e34dd1a3947f199829cab SHA512 532d03e6258a65b5462b884b6cdb7cdb230914aa595258c05c2be6fd6a01c9ac859e87ed39542a3106764e9c66c166e400df86bbde453b225c577d514a67e676 WHIRLPOOL e7132f0ba9d29b227e0fa76315951d826a31b78cff3d01a488018e1a826820abe1a67cbdb561e6b5b1da469384e6923172032f9da21a03bbcee64b758915a2ac
+EBUILD wireshark-1.99.1.ebuild 6281 SHA256 afbf4f308514385e4808f7c27b3ff514d2a618d40a4663d7aeaf616376d49455 SHA512 2e9e0c40044bc49e417264b15c20cb231424f592d76b480324dc12d4cab75bada9426b6717f23a5972ca6e00e7e293a5d981d7f77e1abee749ac7fe720c4c584 WHIRLPOOL 79bc275ac12619f537a999119086ae8812a78f1f1d3e60fa85656fe942bf65f8acd3c7baa5cba94709542ab277f3fe70669cc5d85692cc503a93daf1fdbba6b5
+EBUILD wireshark-99999999.ebuild 6286 SHA256 e843ecbc9e5ecfb03f3457bf66e0db317c50453c8fcab03da252c8ec377f290e SHA512 5c1b420d80c38e7f14748ca4023a6774530ef72ee864281fb56f4c9a3474f9935772281038e63b5cd03afb0611f9f934211066e1be9b7df01799a590749ebdc1 WHIRLPOOL 1841d27f0bec41c2e0d412967c13c3b12168f95a64b9e3fbffa8fe397ac7cc5f2d2a8a449d7e9a94ba0995629acb44612c0489241b4845ac0d57ecf4127586a9
+MISC ChangeLog 100966 SHA256 2d86a285f925197c17d71181de99aab46b20d1351e487f48a5a803745b767406 SHA512 a59d833714e31cf40b8c3d398ad37a5a2cdc624896b8fe224512c8e5e705e4e17ea1fef1df8879ea87182eb9cd30adfd441fa0365b2aa6863ab9e61d7d34d28b WHIRLPOOL 4421908e523ac56aaed8176f87d2966976304576977aa092a7fee3d4fd6b2f3e9f569ad954d0a362e51c98ff07fd82a8bf77c15722fbb364a75dab5b218f9da0
+MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS+DycACgkQVWmRsqeSphOHmQCfVWg9qlicIJwzAv/9b7G1WtLP
-XE0AnRhrbg1hcDlAEJTujagzTluy9A3S
-=UK50
+iQJ8BAEBCABmBQJUyWr2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO+rkQANqjk8suV+Tms6R38OMAUsHr
+Cp6Z0fMjNurW1F0cfjKbgIAD6pC+7/yNDxJPlcujmKWEP4OGts2GM0wewCLbm7W2
+sPt0UwMdRWUa50sGgJEYZ9S8/9J/cJj/Il+ooaBX/3nj/zEQN5jiI6f2GUfcT2ri
+C/k3Fpi0R9x6rFXCBxebRoGm5gzSB3KPicjYZUCZXwlh3SmFuwIHS86bQtTuz7tp
+vw4tcja8liRGs/6q32f4p2rYt6nxAoiz9QjNPUe7VYpos/hfzl6ZsPSjWYOa1Bhc
+NfCAWHu572pJ9NTodT3UkvTBsTak61m+3GFaKpVFhq3eQlJTy1MkkkGqctrqpkkN
+s1al07q+wBtvRKCjtrMXBiI6vg4yHUeLzZ8JCTVutJ6KVZJV2/8tWYvfCsk1XkMh
+MacV/2UN0dysWAYlPmhwIW9kpzkPGkhWAEjhLiZtoE7phfxGcVSMdnxp6rs5gEuu
+pTG/1mi7wI9ZjS1nkuLVeYF15Ji97V79Ep3QS0SO8Hp4VZWBweZFkvDqyv6pNXSm
+u8dUw8lDCN0gAf/mpAU3wo2xy2kXp3hNN9g5qL0+jVrdpsx9iu1D9DzJGg6wqyNz
+tvzsadf04BEMMAUJYTYUCN3y5dhTXRGy5Zrw/Y4g8dAlo4kSfzVkMWDgAa9IwKsQ
+8DHTjEOQB3qRZxwwqGbC
+=hV4J
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 6ace076e652f..2707e563ea6a 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -34,6 +34,5 @@
 <flag name='qt4'>Build the wireshark executable with an experimental Qt UI instead of GTK+.</flag>
 <flag name='sbc'>Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
 <flag name='smi'>Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
-<flag name='sse4_2'> Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions</flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/wireshark/wireshark-1.99.1.ebuild b/net-analyzer/wireshark/wireshark-1.99.1.ebuild
index a8beb3438409..ef36b4421000 100644
--- a/net-analyzer/wireshark/wireshark-1.99.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.99.1.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/net-analyzer/wireshark/wireshark-1.99.1.ebuild,v 1.3 2015/01/13 10:35:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.1.ebuild,v 1.4 2015/01/28 23:04:20 mgorny Exp $
 
 EAPI=5
 inherit autotools eutils fcaps multilib qt4-r2 user
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
 	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
-	portaudio +qt4 qt5 selinux sbc smi sse4_2 ssl zlib
+	portaudio +qt4 qt5 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib
 "
 REQUIRED_USE="
 	ssl? ( crypt )
@@ -157,7 +157,7 @@ src_configure() {
 		$(use_with ssl gnutls) \
 		$(use_with zlib) \
 		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex sse4_2 --enable-sse4_2 '') \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
 		--disable-profile-build \
 		--disable-usr-local \
 		--disable-warnings-as-errors \
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 90d8b617057f..408e3fd263f7 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.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/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.7 2015/01/20 08:17:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.8 2015/01/28 23:04:20 mgorny Exp $
 
 EAPI=5
 inherit autotools eutils fcaps git-r3 multilib qt4-r2 user
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
 	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
-	portaudio +qt4 qt5 sbc selinux smi sse4_2 ssl zlib
+	portaudio +qt4 qt5 sbc selinux smi cpu_flags_x86_sse4_2 ssl zlib
 "
 REQUIRED_USE="
 	ssl? ( crypt )
@@ -160,7 +160,7 @@ src_configure() {
 		$(use_with ssl gnutls) \
 		$(use_with zlib) \
 		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex sse4_2 --enable-sse4_2 '') \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
 		--disable-profile-build \
 		--disable-usr-local \
 		--disable-warnings-as-errors \