x86 stable wrt bug #549432

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

3 files changed, 13 insertions, 10 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 8c16787d8b39..27117772643f 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
 # 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.716 2015/05/15 16:02:30 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.717 2015/05/15 16:03:33 zlogene Exp $
+
+  15 May 2015; Mikle Kolyada <zlogene@gentoo.org> wireshark-1.12.5.ebuild:
+  x86 stable wrt bug #549432
 
   15 May 2015; Mikle Kolyada <zlogene@gentoo.org> wireshark-1.12.5.ebuild:
   amd64 stable wrt bug #549432
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 07ca72ea93de..2d71b74769c3 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -13,17 +13,17 @@ DIST wireshark-1.12.4.tar.bz2 29257016 SHA256 de804e98e252e4b795d28d6ac2d48d7f5a
 DIST wireshark-1.12.5.tar.bz2 29208507 SHA256 d0f177b2ef49e4deae4ff7d3299bdd295ba558a3934ce8ae489b2f13927cbd82 SHA512 857f0299290d5ca1a34ec4296bf6ef1da82fb59af1aae2c095599e16c4a95a653987d60611d58874dd8cb3271838b0a4ec476a17c52e781cb56607ac39197136 WHIRLPOOL 00592ebba59532acfe8c4b77efe87370573d1084395a27de0bdc92ce7aa1d8567d9b3a10697fb9469c890d724dfed7f1c720408230b6f39ff0a0c09670df00b1
 DIST wireshark-1.99.5.tar.bz2 29806267 SHA256 d2d5dd1367eb05037651daf7355888f5938d5ca45fcd730fe117605adf9e6c7c SHA512 5c951f189a0904c02897ee81101896215332c39f3ae3daaef92c923f020a6bd46b9158329add8d70e7ffbe06175252b8b477e4ca9bc86ae96b198bda20296235 WHIRLPOOL 2b70ea5df6b9c50bef6df9e05158ad8fd8ac106df1600eb51aa5b42002f05853d76ed446ac6f8b4cfad9e5899e1022f296830f6aadc23c41924ceb8f866c5321
 EBUILD wireshark-1.12.4.ebuild 6244 SHA256 02bc56a450370516854f5724a2f6b0ba0a8f8b07160c8262738c10aae3086dfb SHA512 0fd625acf77240de2115c3dfd853deb6aba2061d000ab89a5deebf432a745a44ab12012087e4b20e560036b600fdccaab9640ef852c52abe5e7b2aed0b88ef5c WHIRLPOOL 99269eae2d3cdb600314bfb6f2503f0cc780eb45742784079368e2af99ac57cd38c7685172964e5d6d2aff24d0811e227c5bc6f486e4a339306d0fb51cebbc0a
-EBUILD wireshark-1.12.5.ebuild 6253 SHA256 2bb8ea0408b54faace72c0099342001e8ac8956dd8671f666d657693f7ffe81d SHA512 dcc8875e8de561d4f4e49bcd506a23057065ee5e90ea6a84e484371e481ce3934a71b2fa44c3926c3aa5132c34deccfedbe0fb229212e17dadd55e539e53a9a8 WHIRLPOOL d8d3be60b95a8a0e5be5f62a0a9f7d7c774622b28a9b6b2358ca4202d1f3efa262d1b0d7acdb0967a9d990ef3f4af9c03e1629764de951ea1f69a8454703a27c
+EBUILD wireshark-1.12.5.ebuild 6252 SHA256 340ade6a060083e6d8c6915b21b8f1497e783bf4abaeb8a47d5725f33b8de787 SHA512 4e6bc1867b378c7e194062f1230635379a3dcbe95eb5210aa7c7ead9d51ae39faa69e2fd44971ac23498c6293eced4c0fcefb562f12dab69f03d575f2383625f WHIRLPOOL ab5285d665c1c47dc92baffa0fbef1b5a692efc9f227fb32c48668c11e52d0d860c76c6f793a14bf0b107831297de3bdaea104751e788c06f65db598b4382a4a
 EBUILD wireshark-1.99.5.ebuild 6372 SHA256 174f69b104d0d08005baadd9a4b14b1b5fbdfc83f9769daaa570f11d7d4638ec SHA512 94fdb4104c692667e2aa77c5614f1ed35cb44f986de2448bcd7267388ffd36d43b96ae9013f51a966a603add0ab1ea711f6e32300210a11b4dee6f6437073180 WHIRLPOOL 4e167885ebebe43c25608633add36d9d2ad0aa9c12786ddbef9e39ee72d956253861d257995131b4d566a164bf56b8fb103e4fe1f4db9f5943153963eff5ee9f
 EBUILD wireshark-99999999.ebuild 6410 SHA256 2e661f057146fc8a4bc364fc93da7b435d89f7769a0faeb0488a0f93883e67d5 SHA512 e80a3b7f08dcffda896ee01d9c08388caf7b6fe59b5756c4954d4041151d99e3b4d85810cc70c5a64ce61598a1c5b58c1369f9d9b4ef49c8570b1b1ff78d9876 WHIRLPOOL 75ddbcdb78932c324c4134e4f5d6f428dbdd2b9ff2453486e7c0d5f41169ac0b97616ab72f48f9448b6f860b3c5a5d5cd8a7892f9ae69fdf34820c0dbcadef8e
-MISC ChangeLog 104017 SHA256 903df9c16e1c679a16ce2aa77765e83116b52248338b7c25c40ac22e1aa8c293 SHA512 554776cc2636c4860e48ad2459957afedb346f5ef371c7b2330c26fb3f5da062d9e002ffc89d288d0ff003f370331bf4ca71734fb5c16d1c67b5d3c55469f8de WHIRLPOOL 6482a88552fb6fbb44e75b425f5cf3a0236916f7240e29ac484623c84c968874e5ff9b7e540db0784b99d3b17fe4c3ed3f6a7c8a8d1255987e6dc9c4a41a7d4e
+MISC ChangeLog 104122 SHA256 be6fb5a6975d8d0e4fc14ec9020ffbd54b64a44ac20119b9550c180ca90da870 SHA512 445d12c881e7f6c12d6ca65414731c0264174d11ec9b7b4671503fc67c81014bb917183ffb850fcfce20950a915526ecf9097a159d8c5d2d0ac1f2156b4bbad2 WHIRLPOOL b2ced006a692e54152b8ae76cabc20c37e66fff4a61eeaf896d7b5754cd5c8ab8299a5f3a82d67780319768bb7602e38395657867d5edf56f9dde9f881857877
 MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlVWGCAACgkQG9wOWsQutda5hwP/bzulJM/ilpquDYvnu4coqngH
-stYGeEqZrHWxP3kWYd8yTUJOhs74aMa08siHqEcM3OKtqptLqfJCH2XpiZO9QK4+
-OCS69E6kvSZX0D0WMIMsiFRWKD5I5i+aAt3vP9wO4rk73lCrvIybuS2c5jWheJdi
-nbR6hqMUT8KOumLR1QA=
-=QT9m
+iJwEAQEIAAYFAlVWGF4ACgkQG9wOWsQutdYWUQQAnMykG58jhUcTrfreUui/2KUj
+jmCO4sFK0lF1o10iP4FAOzIlyTk7q+zYP+N5a91OOkE2XtV895dC063xsNVzznhr
+O8ZkrIIRprk6oAvavHKRwYM7jqs0yY86bL9q8zghNDIEJ1V+s0s095cr6MH1mXLo
+fL6IypRutmWPswn0YgM=
+=JRja
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.12.5.ebuild b/net-analyzer/wireshark/wireshark-1.12.5.ebuild
index df2b8958160b..e0e41b884dd6 100644
--- a/net-analyzer/wireshark/wireshark-1.12.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.5.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.12.5.ebuild,v 1.5 2015/05/15 16:02:30 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.5.ebuild,v 1.6 2015/05/15 16:03:33 zlogene Exp $
 
 EAPI=5
 inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
 	portaudio +qt4 qt5 sbc selinux smi ssl zlib