x86 stable per bug 363895

Package-Manager: portage-2.1.9.46/cvs/Linux i686

3 files changed, 12 insertions, 19 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 6b10d0bd33d1..451e3eb28b79 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.289 2011/04/29 21:04:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.290 2011/05/01 08:08:49 tomka Exp $
+
+  01 May 2011; Thomas Kahle <tomka@gentoo.org> wireshark-1.4.6-r1.ebuild:
+  x86 stable per bug 363895
 
   29 Apr 2011; Markos Chandras <hwoarang@gentoo.org> wireshark-1.4.6-r1.ebuild:
   Stable on amd64 wrt bug #363895
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2155003e8f2a..0293008fbafa 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX wireshark-0.99.7-asneeded.patch 339 RMD160 faa516dd3dfd8bd6218f66d3bedb5490b0896f5b SHA1 ec2b8952f8fe55471e923c086a6e9b48e06ce7a8 SHA256 9fc8b3ec3fcf1cca714c78c28c1883503abfcfce4fe175e43c6d7ec14ddc9478
 AUX wireshark-0.99.8-as-needed.patch 395 RMD160 2e06f641e9789db717544bfd1568e4bf6e85855c SHA1 a18b6fcc85b40c00fc1d30bcdfc81d13dc33e904 SHA256 d2f996a79fa3117296b25c10a1d4a3f0f8027a678de4e37e6c60bfb47a4754b9
@@ -14,23 +14,13 @@ DIST wireshark-1.4.5.tar.bz2 20501797 RMD160 c6e66948c6a6573c85e0812cbd57845d08c
 DIST wireshark-1.4.6.tar.bz2 20496268 RMD160 7ecb1c006eb70858e21019a731d038478a3f7879 SHA1 dd283b3957d1096bd643ab4b83b19dd2d7d6bfd8 SHA256 f923f1e923dcb479b7fdb9bc6d4ce4c27ae8ac1f0148f2820bece476872df1d7
 EBUILD wireshark-1.4.4.ebuild 6421 RMD160 1fbf49245dd450987856071934644cf22ced3920 SHA1 71a83f0e0309cedfd22fbfb8b29a4cac32508bfb SHA256 e0d6357ba32e47652a5b315f955a4e67ae63c2e504d50749804b2d3dd0441ef9
 EBUILD wireshark-1.4.5.ebuild 6422 RMD160 f0438528d51f0e13eef4f471c4cab6c89e5165ff SHA1 04bd74ac6178257681b06e44994bc76b84047344 SHA256 bce48d5dd1005638fbdecc320bf6ec9f2c640e9b1659088a177949864610ecf3
-EBUILD wireshark-1.4.6-r1.ebuild 6400 RMD160 93f5ad493e4e4f6b7ad2bdaf1f61929b912e5c7b SHA1 9d322368046d303fbd2ecddacaedc60f7af187b9 SHA256 dddc50d62d38058e9ff512d9d83437f59b7f571b8124697b1ef9eb1c7d0abe75
-MISC ChangeLog 42277 RMD160 42def0708ff35b08d94c4256e77d2d07a97ac9c8 SHA1 73edf195a4dd838a752a6d904bc5b5f8dcc362f7 SHA256 3941a47f541ad59bc7e1ee30c1ce28473538148676f8b3dae59c2bcb453fea1f
+EBUILD wireshark-1.4.6-r1.ebuild 6396 RMD160 9acee5a2cb67ce35b0bcb8b734d1262b1ecc72db SHA1 122b1d1d78ecb6335364f1adef0882845266ccc4 SHA256 2cc9a6b07ce32a7131c569baee799da234797ff2c88fc7b357d58a409991dd35
+MISC ChangeLog 42377 RMD160 da06cee0d1c35e725921119c23a66390c261e477 SHA1 de3b8a47271472fb298b8630ce54783cd0cebe75 SHA256 894b3488b6a424682a9e1f0d726efeeea8eae4000b3bfe98586f91c980c84a10
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNuyfDAAoJEPqDWhW0r/LCl5oP/ArvAspnKAvR4VSEOQimSBkP
-91uykT73ytnKBtHXcHzCdrm42wXYfpsPFxqlhHmLcnvTCaVos72OweaF9e5oPds3
-F4R7zu85vM4BqyfU//5tuEjMT1zxM3OGpdYGlwOWZFQpTf+Wdx7EUJwWPLVRd3pk
-0/Tp+qU7ipmDF8SxS4qRPoZzfNqc/f9cztVFwgt5ES5gZkRdxBf0qTc/762A6Hfk
-DbAppheh/bRbQQjxVgAASI8eOi1nVkvYqqDwWx2NmbSna7Mcu/A5bbFPXaYFePz5
-ritRYy9DpkCeIvi0R3lrA2TK3wmBD3IlZdh0c7vPlymRF9IwSpGCQUc3EDezPXuB
-i6WdhVCYo9WDBdkrZ8NWUqraqKd1237Up60Gm0/r8DSG+f3EGXD73MXugwKli8oY
-MQv5Z1M3Joa5/iDgUWcpBLVSsee8OkihLhYg6JNQZKVQ4IqFjFikq0IaWrAuaOHp
-EanIscFo3dWPhDD3BIA1O9WoSEuptwkfx7lgoRtfAvyAzIkfrYMvQwlM2g8VPgQj
-Ow+U6KuiVmmf33IVSLMQyEyjWRzGXeFU6NudwBIPCUK22DAHtFJMYbaVhxGWZrG1
-3SNbs8FXgZZlVGITdaSJKFRd/SvrdcyMmSkNrmCVYpV3lAW629aXBzxOP/kEHdsq
-w3vKmtc3CWFZcTK425Oh
-=/7BK
+iF4EAREIAAYFAk29FdMACgkQodBTJSDyo66rIwD/aOb+PwOac46HZWW89QDYTbTt
+HR7C35LdQ2tXJP0IxIAA/1m5kOl22iur3ex07r39GIz/582qEBDUITd0j4MG+8GX
+=NYgt
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild b/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild
index 29c2ef2e5005..3b3805085268 100644
--- a/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild,v 1.3 2011/04/29 21:04:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild,v 1.4 2011/05/01 08:08:49 tomka Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -13,7 +13,7 @@ SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
 profile +pcap portaudio python +caps selinux smi ssl threads zlib"