Stable for x86, wrt bug #494612

Package-Manager: portage-2.2.7/cvs/Linux x86_64
RepoMan-Options: --include-arches="x86"
Manifest-Sign-Key: 0x7194459F

3 files changed, 22 insertions, 18 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index e12b2807bcda..4672915c5b85 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.579 2013/12/23 11:47:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.580 2013/12/23 11:52:02 ago Exp $
+
+  23 Dec 2013; Agostino Sarubbo <ago@gentoo.org> wireshark-1.10.5.ebuild,
+  wireshark-1.8.12.ebuild:
+  Stable for x86, wrt bug #494612
 
   23 Dec 2013; Agostino Sarubbo <ago@gentoo.org> wireshark-1.10.5.ebuild,
   wireshark-1.8.12.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2982f2ff65cf..e8ad3e62b6a3 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -13,26 +13,26 @@ DIST wireshark-1.11.2.tar.bz2 27696007 SHA256 233f7b2e1315982efc34cee60fad6431d2
 DIST wireshark-1.8.11.tar.bz2 24131276 SHA256 fcba2bd7ccd85d0d68cda18d0d6422be45a7f04dcd897b59a4aa859ff48f8fdb SHA512 4b361e6750906c3680d443bbf7bafb3b882577b883e270835fecef541aaaef507230a4699fa3400f955244a0f6b2c724133d52ba8f013b7c8ed02486b733d411 WHIRLPOOL 7da0331c5a5506cb1056fc2c5903b57650b6acb3ca728fd656c8eeb2cfc308c870f82267b026a169b8c7ae927c7f876bba8f188efa3206e07bf9b82ec307e1d9
 DIST wireshark-1.8.12.tar.bz2 24132271 SHA256 f99080ad249b01c22371cc4e0feae9260312053e0162f1785d6849708bc0cb93 SHA512 3bfc8b2c9657a4c5234cf537a5eac63ea6964476785797ddac191d99f6ec6cd8333389707dc1316221291f9e91542fc933550042f344228b3ea6afbc034a8528 WHIRLPOOL aaa8fe6fbba82adfc6ad81780dff5ca9606db74d1358d24a4f5515f04b83d22d97a66cc937b40a4490b817093a8003202cf0e8485b067abfab04a67f15cddfc1
 EBUILD wireshark-1.10.3.ebuild 5694 SHA256 cc44c1d7ed92f5a4ef75f2fccd8ebc5e985e21d637b8ca19dfe7e16655eb0b19 SHA512 21337cf88d2f1d8db8189ef4f7fec2c92dfa28a82ed6fed160c2dc31125867e9e57d26546e44e5cad5b616d980eae534f206ab6e61a2b46f86a3333a4ce6725b WHIRLPOOL 78d634d19fd82303e79bf3db9608e96b6cb57da4cef29e11d3d5e772a84ee0107be6292049bf2738bc06d7e0f0fd16fe10002de36a83f128463b49c5ac2e75ab
-EBUILD wireshark-1.10.5.ebuild 5757 SHA256 d40115ea45b9bd7789d1c291358d9aa33e0110ec023597d00e28dd7c16b0c497 SHA512 c55c2741e1db77fff7b2eba4aeaa638886f6cd81e239bc653d86d7bda121c9cc152d3dd3e3d67d973f943c6fc1ac8001dec3ccb2e6f2c2461dd7f4df2eb36c61 WHIRLPOOL f779c553ad93b548f068f71509d4c8e565fbc0ea7d3360f26d7c5130cec418c371ac52e1655565260dc7960f0f44baba44572b137921c3d3ec9560f6fcf0b9f0
+EBUILD wireshark-1.10.5.ebuild 5756 SHA256 91033c97b5b67fd5eb9d6f3a126c6894bb90106a95c023defe36b7fb337d12fa SHA512 5bfe6cf4d53a922c0abe203263ba7f4a7fbd4a2482c0af66c0ae3138a5af3d59832e745d473f1092432c00a59f01afc8aa020d5a9e09de5be5fed5c50d0bfcdf WHIRLPOOL d93528c074dea25b24a7d149c3ee9c41722f7f275d190d80c9bb3282b80452c4a58a352d66910c7e896f3b54634999cc263a64974a3c34b04c0be6abcccd2b9f
 EBUILD wireshark-1.11.2.ebuild 5549 SHA256 fb771c29ca2d4c0b7634a7cb5e2055dd064e2838810167224ae8752330f58550 SHA512 3537fdcf3b9674015547452d720c602a35cbbec822322249c52b6053da6dceefd00fe36980e059fa3e56d40c271c3afb630f2407bd9c58a7ed1cee389c611749 WHIRLPOOL a76a587905f4d3ff609f14304a3a76d66d93f7a707dcde8ffe2d3d3783e2a8ce24b04904ef6494a6b29ab0ff3fe64928e9f53e401096e7cf9c208f4b8d88ab35
 EBUILD wireshark-1.8.11.ebuild 5504 SHA256 0c2717e88b54db24fed99061651415329b0a9a186834b9b8383bde4ad61c585d SHA512 a78f48906dfa17665cb976f3d53cd73f2d1e6e2c300c12a8904fe78ae3754fe5cec467b2815210d49e57ee2fed9d10575017f7faa7bc586415e6ea2c794075a8 WHIRLPOOL bea372ef4bd0de7b617d2ea2ddd3c05b6dfa506a28af5aa4b2f073c04d58ee3e05aaf271fb5a7e8a425cc1c529a1cd0dc892c98d84d168717da35413b4a0c490
 EBUILD wireshark-1.8.12.ebuild 5570 SHA256 3c3bbe22f644f610190066b796bfc5edff21a645afb307ba80f3f79cccea0e53 SHA512 b818d3e3f5d5f3fb8088105f254b1dde19ad37dc34a461d3996dafa504d01dd9ac9c8cde3cf7acf18d9fe38b08b8b4039b1e7c9560eb2a90fc41403bbcaa950f WHIRLPOOL c0293622e95541621c00a18b615632e6a64630a30a480506b1e1089cf4f2785b434e6351074f7c04ae63527e7f0505eb2d4e5bb4cc0af0df50068342e03cb8bc
-MISC ChangeLog 84708 SHA256 96ead7b75832d6813ac1666facf179765d69b398b5d7edffd432a76424eff131 SHA512 e5c94aa47473254ea6abe6850c3eeb03d751d6fd6aed1330953355abdc3eb15d66a8166f1e4ce8b5f5bf807066016aea6eb522208dd0513c06010e50c354da57 WHIRLPOOL 36e96135ac85f2de4184317268015243fd6ba2b8bf986388770faa5c3ad1475a35e4d3a38c024125c82818df6c922ab27cbea9a6b1e9cb4dfe4e0a080bd4b4d9
+MISC ChangeLog 84844 SHA256 436b3a911e506f85c8b460359644fe3924cc17cae9579b327c2300d134beb0a8 SHA512 acb6b1abc1ade8040ff99dc6aeae463dbc7736142f967dda22dfda813e8f3402d0f8effd4ac8872edf6e6077b96585b4f6b14191ce12cb8e5a0c5e4f85a6b321 WHIRLPOOL f7965a7653ab797a1cf1d5cfc585fb4ee90b453553bf027fef040d7b3925050f6335a8f54520e95ead3ca63959dbc0af6d3b0a9888447ab13efa78453748670a
 MISC metadata.xml 2662 SHA256 aa3e958ce2704697a912374dfd9df72310353b54883e63de57b1f4e925f804eb SHA512 2eaf02dbd17d346b42dd2ecbb10318c08f8cba0e6bf0cd0dd76f145cc37c1eb35788c4a60d90c42b92c8b7e554315a40046b3b94c5d1a004ebb88650eb296dda WHIRLPOOL 21d6545372ed8aae96efb37f295904a3b14a721e754daf3bab74284d2e7527944fa6c75dc34c3229dea0c815641574f46f72b4b173d0653c6a92bf06341b81a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuCK2AAoJELp701BxlEWf5hkP/iLcyOXqK0VM3j2/B2qhBtrg
-xcV+vqkrcfKTPEjWQDYenVK9GO03O4/ojF7bL1ifR2C4qxy9D62BfTHKnAAWsefp
-2wUsEMtkfzGYlk2D827a9W0GgGSdv5qpAi8R+TCa+7wXEYqAzOeSmRUnRgsMsRZu
-VnaNfHPSxkNQ85dJ9AD9GSmrMQg4G+Uc1z68DbX2LQaeQvo4iaEeQQS7NyPFA2QI
-4B30nzy36GNgyFOjTzspWMv+5UXPnRts0WBOeQm/2u7qHbVfqWWokaSjSvZZdRzm
-oMzRCw6tKJjIT5eQdEAYkaZ0dtNIu4ERnwweYR89AEQc+nKkKz8WEzmKn7FI/O+4
-P0AA779oYLQXr0KqitDAr4qRKZN8DH/IlpmvHOO/H/Yfd622Gp1/13k2C1MTJ9B7
-JNpbSnoRn4azVXj6aRxpCLB+wSc7+ZDoIJ1uXIKB1byAF2jCGxMAj69MZAHnAA8K
-QW/DiDzQdAuEB4mJtSvdrrVMeqnHD1Z+w5/0vJrUBG070DNxJ3ZHhbbJ0kYVsLWl
-8AaFFncYdBzUL2h5Dy/ql1cjswwcCVI45yAHSRizsPVWogFSUPYttkDUNNhLT53T
-POQKnGyr1pLf1pf1mdGEuS4wgp6eQd0FqXgFPyWD301uZgzMsvNT8dCLeEF0Vtjj
-l9PfVwyJFxGNUtJrd6jl
-=mZ4V
+iQIcBAEBCAAGBQJSuCPkAAoJELp701BxlEWfEsUP/AkPdmnSZ9FSUbSx2Pqd+pwk
+0Qu2UaeZBw2NUHW84CkWrUxWxnvs4/MsjTfRdcz6mWRVXyha5FaOnaz4ZQdZX/4w
+KeVGuRJgTc/YCHV3Af79DmZjT8qIGqAQj9P+siZ1dqk8zZhPJr0UJPMQMF624xXy
+OUGit2WV1qbaKkTfM+3susQRFIxUqyui94dzgFk11L2L5nWIbNj3Yjf2TLpDgywt
+Nb5vEyVHvuo07Igq7g0dmX5aTYDkNJn9yjjNY/uney9sdhhUspXcJIwXt3gTXp0D
+56lExjHbluAHSlR91Q6okJbLFLaJuawlUKi7UiEZPJ/tXejv52XG4IXkKtefqU/G
+UZ2sMvBfwemazXV7Q3XM3NPE4F0XSfmpvcoDkBqbuDFQd2I1hCg2eJVAADSXXVuz
+72HPtrP/4dvBQ+Zksp8gdqhkquguGtpbxjjdzBk+VstTXJoq/OFEEKMWL/jL7xWv
+wO8uiMA819sX7oOQpLQIoNDlGlWsPVdWtBX2d1Byky+n1wDuix5/I8VtZGJcXM0D
+jDAanp6zjAqrCxUNNDIxCfkrQQ/fydmRL8D+WfHXsHa+XDldEYxxdCaloLEk0NJd
+YKZy+uiovc3cVHYV52IFdPztT/UOu2YD/UvAb+hy9tYb4ue+bOzYoYpTajqUEMwC
+91x4QGLQu6pNrxEA9aW1
+=d1B8
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.10.5.ebuild b/net-analyzer/wireshark/wireshark-1.10.5.ebuild
index 3992cf446816..a57910ea7235 100644
--- a/net-analyzer/wireshark/wireshark-1.10.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.10.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.5.ebuild,v 1.7 2013/12/23 11:47:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.5.ebuild,v 1.8 2013/12/23 11:52:02 ago Exp $
 
 EAPI=5
 inherit autotools eutils fcaps user
@@ -12,7 +12,7 @@ SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_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 +gtk2 gtk3 ipv6 kerberos libadns lua
 	+netlink +pcap portaudio qt4 selinux smi ssl zlib