Version bump. Set dumpcap-group again (bug #490956).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 26 insertions, 12 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 76acffcbb2af..0e71f5ba75bc 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.584 2014/01/12 13:31:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.585 2014/02/06 12:29:23 jer Exp $
+
+*wireshark-1.11.3_pre5537 (06 Feb 2014)
+*wireshark-1.11.2-r1 (06 Feb 2014)
+
+  06 Feb 2014; Jeroen Roovers <jer@gentoo.org> -wireshark-1.11.2.ebuild,
+  +wireshark-1.11.2-r1.ebuild, +wireshark-1.11.3_pre5537.ebuild,
+  -wireshark-1.11.3_pre54663.ebuild:
+  Version bump. Set dumpcap-group again (bug #490956).
 
   12 Jan 2014; Jeroen Roovers <jer@gentoo.org> -wireshark-1.10.3.ebuild,
   -wireshark-1.8.11.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 69a5e8930200..a1bf1ba8a12e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -10,18 +10,18 @@ AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a5
 AUX wireshark-1.8.12-gtk-deprecated-warnings.patch 940 SHA256 9969d68caeb0277ef78b4fa2078aafe6ffb2452de68b17bea5882a1b474ccf00 SHA512 e4bb971475ed019d6231179213f6fc9641d0ea91bac89ae0871e351b4def31741c6d3a9e0ff45fbc741e82804d1db5b1ff3f902d9aa22f598292009716a2f3b0 WHIRLPOOL d482ee4e9c74867e01104a1f85804535e791350006ad90e64c51887904c389d684223c3de1569e0261372e7cb3fa186b0d9cdc75831246644761f170751fca73
 DIST wireshark-1.10.5.tar.bz2 26666846 SHA256 a02190da9573dd381e7598277a31d0c63b05b2af9fe05ab6b7fc058bbea141f5 SHA512 c72d8f23d3018ece52ccebbaa49f6a389e57ce5ab6df93d26f82888b8ed6fb29dd3caf4f5cb022f153f9589261f5666f7bacaf14b2d64b10f56c4e8ef9cc43e7 WHIRLPOOL f2b12e44ebea344e5dafa58892ae03b1cb140eb116c044ea214ec879d2a24daa2c2bbabba377238cddb32a38426e07ed50b0a997ea065b12e3a8f97a0f43b176
 DIST wireshark-1.11.2.tar.bz2 27696007 SHA256 233f7b2e1315982efc34cee60fad6431d2a26f5f68b03b7a439a108bab95f01c SHA512 40b29bc10a106862f521026a1a3e9c9af5a0eeb034fc5f8054e7f9939393a12fe9d3c67df5562461911a1ce2b903624ae750720dbb10c72070b67d5403e678d2 WHIRLPOOL ca193c5718d908ab9b5e86b67423b8aa6c160aee21a678c25039d1caf479d4509b19382213b055588ad284a7272fbe150abeed12c2b9dea8a285b353349f3d99
-DIST wireshark-1.11.3-SVN-54663.tar.bz2 27947248 SHA256 1c2ae4aef2c3212ffa0317dda776e7289fca9cb42a99cf6316101ae842041b54 SHA512 5451868de9e642e75b4811154e38e6863b7104b92dc88dab5857708ec9bad0e3a580f9639915e583c2391d170975eb54b57cbc255e67e3320663f354ff8babfb WHIRLPOOL 6b2a69ff17831718912a7dd7fa99e4714a5c8496a60c5ef3aaa85cf1c8c7f6d2c0ea2a67ab4d5bf9fb38d03b942ea9d7e3c71660ad36eafe120d8dae45f88efe
+DIST wireshark-1.11.3-SVN-5537.tar.bz2 28068219 SHA256 23c6c63213e1e4eae04e0198dbc2cf58b5938e61407c7e93c3d0cf5c9729d81a SHA512 0d24a17eb0f20fcfab6b09b4812ef8594290beccb3265dd941c2290c57e49b3569fe9b066eb8742c54f84b6627b81073fa98bb49b2a2a4b0f2b18b32ee5980f6 WHIRLPOOL b11a72328e3d6afa94ee7a8410edc2ca30a4a5943675ee53618ced708777e1563f6bda958ee832f9bac03a8b550f161d6d4dc3254737a3c8c35e64b9227a1061
 DIST wireshark-1.8.12.tar.bz2 24132271 SHA256 f99080ad249b01c22371cc4e0feae9260312053e0162f1785d6849708bc0cb93 SHA512 3bfc8b2c9657a4c5234cf537a5eac63ea6964476785797ddac191d99f6ec6cd8333389707dc1316221291f9e91542fc933550042f344228b3ea6afbc034a8528 WHIRLPOOL aaa8fe6fbba82adfc6ad81780dff5ca9606db74d1358d24a4f5515f04b83d22d97a66cc937b40a4490b817093a8003202cf0e8485b067abfab04a67f15cddfc1
 EBUILD wireshark-1.10.5.ebuild 5755 SHA256 eb862c327327114684bd5195b30ddd16b524de7bd49a46f76b673a70f8f73fca SHA512 97837836e08f9f3a8ddd97426a56377abf7e468830ac657025e9a6e7ce249fc0625bcfedc7e013f91081f69ee39a9bc878758b862e25246e9397ed94c3d1f370 WHIRLPOOL a4cac2209addbf8c0bbd4af6a2c7aa4df1cd8f6ae7cd5188a68f2a2532a84be23e5ac2f8744d5dd04873c73da4876c468c83b5fe2cb5ce4de6f15d98f8e13e9e
-EBUILD wireshark-1.11.2.ebuild 5549 SHA256 fb771c29ca2d4c0b7634a7cb5e2055dd064e2838810167224ae8752330f58550 SHA512 3537fdcf3b9674015547452d720c602a35cbbec822322249c52b6053da6dceefd00fe36980e059fa3e56d40c271c3afb630f2407bd9c58a7ed1cee389c611749 WHIRLPOOL a76a587905f4d3ff609f14304a3a76d66d93f7a707dcde8ffe2d3d3783e2a8ce24b04904ef6494a6b29ab0ff3fe64928e9f53e401096e7cf9c208f4b8d88ab35
-EBUILD wireshark-1.11.3_pre54663.ebuild 5593 SHA256 a66b9b214d5931b0951de19b08a765579d598dd59a06091e5afcd346d091e997 SHA512 706dfa2640d1d1aec4b36576fd000c9ba7e11cb4a0c755ea9285924f25681ca0fdd460a3becba67647a9ec59ddead588d2ea5c00b1835e1a163b9591b2762280 WHIRLPOOL 8774749ab631b6a4432c107931547fc2177c6f4cfb0927509884cc14e67940f98a1f397859d1e5f534acdaef0aa7018a68a28be0a1c69a322632830539ac6b38
+EBUILD wireshark-1.11.2-r1.ebuild 5597 SHA256 0d9a64142106807d04905084ace0e289f01e2a82de18b1e018490f2c1528b04b SHA512 4dbaf24aedc947d20c66e1a76ade488cf65f44f79f3ee07ccd5613cf333801909b1b1b16dc605882e9013a0a65409e63c0073cd19202e27d8a01bbb0a590c860 WHIRLPOOL d306299d747afcf0dd152f19fc4f7fd7d9b9a607562d8280f88ccc4987d356008058b00b1306bcec9a8212f81315cb60a56293238cc9b578bfa178f20ae2bcb9
+EBUILD wireshark-1.11.3_pre5537.ebuild 5785 SHA256 ff7d16c9ff3f5244fb944d66bd60a096bb72c31e8819d26c18b4dd0526c2539b SHA512 73cd0970bf8c9945541b9e4fb558b58d9f5aed078adc7014dacb0d6681057a29b4281692f63e831b43e36c6b097069ef91196166bd5da2fe503b98ca4031a3af WHIRLPOOL c5233e33b542ddb5c582ff90d1a276ad1d1078a41e79776f9b53f8128ac0ba8ab8a5f06967032460fa058af12c053b77adc18b4339a75b910994b3cc7244a1d2
 EBUILD wireshark-1.8.12.ebuild 5568 SHA256 865ba6b20b946d5a255f3dd3e08301dff890313c1028b70d97a00724bef11752 SHA512 71de1ecd6eb0fc2f20aaaf99d74757cdc66976a444dfe82f95b9b86e99453f429a6e69b459e9d50f1d7296aaac3a763cb09e353324e5c534bb3b5bd22fd85a97 WHIRLPOOL e305af203b4860944dac46f1a1921207fc5b0cdd94376283499452bda2f50844c42cb4186e0b05d1b451172314ce0ddcbfcbfc1e14f6871192ae98bf06c0cc1e
-MISC ChangeLog 85428 SHA256 33329a9eca169c84ad47e06f59af9a6cfc182fb4297033e81f136c7d393887ae SHA512 0f75ada42e04d554e08d0ff0aada47bb9d34d3507cdb169650b860d794a65608c412906aaeec004e30e96ec3ddd84928325c133653b3c618b90c5820a20cbe00 WHIRLPOOL 2f61de6ab371449ab77a962c4b7627b61e9e12afdb288ba139dc6ddbae335fd883cf69d7af04e421813e88af126f3a7c4421196580744f7bb5d7e9abab747121
+MISC ChangeLog 85735 SHA256 2a45ac8f3a7777995c0fe7f27a7c6e8671b01ba15a5d24b3217dbd88e90f971c SHA512 b88d530d566f091b04989fb15139169934bbb3fa88b404951c34ebc94116d60471348f8af22ad5bbe2d30ddd2f58b27f8c99f744086798269840e364da85e65c WHIRLPOOL bf05cdaf9bb54b9d8ebebad59209e7ea5a1c6a51a4aae33bac448e7c484d15b396f0c1be030dc9c1e945d714081ad058f14fc3a80477a9a03d7760106d53224a
 MISC metadata.xml 2662 SHA256 aa3e958ce2704697a912374dfd9df72310353b54883e63de57b1f4e925f804eb SHA512 2eaf02dbd17d346b42dd2ecbb10318c08f8cba0e6bf0cd0dd76f145cc37c1eb35788c4a60d90c42b92c8b7e554315a40046b3b94c5d1a004ebb88650eb296dda WHIRLPOOL 21d6545372ed8aae96efb37f295904a3b14a721e754daf3bab74284d2e7527944fa6c75dc34c3229dea0c815641574f46f72b4b173d0653c6a92bf06341b81a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLSmS8ACgkQVWmRsqeSphOYGwCbBN5rOPwQMwRttEtAlRTNEwsg
-b50AoIAeu/ATAZCPjO1xPBQu/yjZ+vq+
-=BgLq
+iEYEAREIAAYFAlLzgCUACgkQVWmRsqeSphNyyQCfcVwU2WCXuVm6hesvPhP6w70F
+T6wAn29AgWsN1qeGU4QHVckO0tnuq2Bo
+=CzMY
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.11.2.ebuild b/net-analyzer/wireshark/wireshark-1.11.2-r1.ebuild
index 8c45d1d1ec5f..6d289b5c3af0 100644
--- a/net-analyzer/wireshark/wireshark-1.11.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.11.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.11.2.ebuild,v 1.5 2013/12/20 15:22:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.11.2-r1.ebuild,v 1.1 2014/02/06 12:29:23 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps user
@@ -142,6 +142,7 @@ src_configure() {
 		$(use_with kerberos krb5) \
 		$(use_with lua) \
 		$(use_with netlink libnl) \
+		$(use_with pcap dumpcap-group wireshark) \
 		$(use_with pcap) \
 		$(use_with portaudio) \
 		$(use_with qt4 qt) \
diff --git a/net-analyzer/wireshark/wireshark-1.11.3_pre54663.ebuild b/net-analyzer/wireshark/wireshark-1.11.3_pre5537.ebuild
index 26a17431bdbb..365962a049fa 100644
--- a/net-analyzer/wireshark/wireshark-1.11.3_pre54663.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.11.3_pre5537.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.11.3_pre54663.ebuild,v 1.1 2014/01/08 17:10:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.11.3_pre5537.ebuild,v 1.1 2014/02/06 12:29:23 jer Exp $
 
 EAPI=5
-inherit autotools eutils fcaps user
+inherit autotools eutils fcaps qt4-r2 user
 
 [[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
@@ -84,6 +84,10 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
 		"${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch
 
+	# Qt5 support is broken since the build system does not determine
+	# which `moc' it ought to use
+	sed -i -e 's|Qt5||g' acinclude.m4 || die
+
 	epatch_user
 
 	eautoreconf
@@ -142,6 +146,7 @@ src_configure() {
 		$(use_with kerberos krb5) \
 		$(use_with lua) \
 		$(use_with netlink libnl) \
+		$(use_with pcap dumpcap-group wireshark) \
 		$(use_with pcap) \
 		$(use_with portaudio) \
 		$(use_with qt4 qt) \