gentoo resync : 23.03.2018

5 files changed, 10 insertions, 10 deletions

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index e92621b26887..86eaeb7f23dc 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -12,8 +12,8 @@ DIST wireshark-2.5.1.tar.xz 28229472 BLAKE2B ac832e3d8727a20754153949d7dfba9cfbc
 EBUILD wireshark-2.2.7-r1.ebuild 6481 BLAKE2B 36529064a3216f6c9ae71ae23ec31049c6a0d7862be41c333f369bfdd0cb62ac5315883c465d2be517e2a4ddd780d110e59c413725f791f0cf9ac0380dbe36ce SHA512 cd90dd82e3418c000ff142a207a4f05db6bfdb5f8087b4c7b1f595bede0847277fba43a615972c2222e4261c647849ff3165fba64d67dcd55e4441b76324e3d0
 EBUILD wireshark-2.4.3-r1.ebuild 7378 BLAKE2B 1b79f8342f72b96831dc875072c90f53d903e6e750e0fadd0f39aa1787bce4ebbbc8073e47f9945b32e437a5dc1e2e04e98d3e6c5e4cadea10bdbe34fc497e52 SHA512 88aa8d2e67db9a8d309d412a890ff52c91ea296cf1592fe7445ebb9c8707cadbad44d66ccb3c9ea71ceb2cc23dd958028e51db88a3f65b3446c50f3c13c9ad0d
 EBUILD wireshark-2.4.4.ebuild 7383 BLAKE2B b3c2fb215055d0ba48c4edd8a2a846f77187ddb1add61477e03d20a817f0bcf5054876eea2180268afeab0e636325d3afc7de553da6a66fe4fbef98fbde94aaa SHA512 79432eeaa844a0984b35087019dd26c99f4f6b0b4195d3f6cb440a4d13017b42d894718d5d90a0c866502a8aef1a0e92684cca61909c13ae9d32f9809fb3b356
-EBUILD wireshark-2.4.5.ebuild 7381 BLAKE2B 910684b7eca92816c5414e752dd09ce20ee3308ce46bb6c8fbf17f877be650ee69eb4fe78f114d45bfcb100acc7ec16abf06cd73c77b8870b65b9d6f32a8c1bb SHA512 4ec91ba8bc3cd5d6d630b1968a28fe130e007905238bd058a7e34d7b7462dfdbd4fbaef4ce09a8210c5ca3196bea4b12f48c60d740172fe66b12e1305985f100
-EBUILD wireshark-2.5.0.ebuild 7114 BLAKE2B d252f4e884aec64a208b65153ba6464401e90514fd3f22db01fcad74e72fefc2fc924b5b250017fd33694a14906015ef895509913b6bf2aa20bb017ef7cd657c SHA512 bdab94fcd73685fa84892cc4c9e784a024a3ee462d040aa30b4ccc4bf67f3c9a577c9ea2a5b3bb031ea2aa0f1b893f8ea23d49e2762dad1e391680d2de7babc7
-EBUILD wireshark-2.5.1.ebuild 6630 BLAKE2B 200d42a90d72ffde32c1619dff27bd08c6dca406019f725d811ff80811e2f4643836a6da4ce042e27c69a48590d3c44b50b94769a675aa0a125402582665e030 SHA512 7e00d6f7bcdce34a4443f6198dd020e74de2ba4c66ada506adb9ee4ac5f103ab81249572966749317d060859f146a1362ed869818bcd7b0d84098d4b2401ac7e
-EBUILD wireshark-99999999.ebuild 7128 BLAKE2B 9e7037c3cb3635e0c2e39635f98061bc188dc575053bf54824c9fdfaa8b335b4e7c28dbdc1d11e7aebaac989902c675d8958db0b20829ea0e5bef6fdb6791296 SHA512 692cb84ef62ac6dacc77b7002abe5f15000507d16027fa4dd95146a633ac2ab143847ed97f882bc0bf68e6a67e8fc8f02e7ac336b85148df0764c011c85bde1c
+EBUILD wireshark-2.4.5.ebuild 7396 BLAKE2B a38f625603f0e9145dea4624222a8b340405140810a004e0e6947e3238a8253f2fd114d6099571f6e50293e0adbb6555cbaeffc16617cbe0743e28fe717b08db SHA512 38b4a32b44028d1ac95be8ae8b18711c39de84506c5fb188f2352af7033c4a9511481d39eb47f30364ffb43448f41022b60219be4a1820c74eaf0a754dd78960
+EBUILD wireshark-2.5.0.ebuild 7136 BLAKE2B 0d4694ca0f61af34f8b54ac29d43d146ffabe22ec905e78f4ca1f49667d9a09dd4e5bfbb01f42d6ca2003712e2daaf4c52d4c00c03afdf492b638cfae95016a3 SHA512 642a7f788b98b0f820880f14a3245122803ce5f96a4290b327144be3c22f4ea7c23eb9142bf47332defa9b63ed2e8e5a81f20a69137d1ce1d5af84d14377deea
+EBUILD wireshark-2.5.1.ebuild 6664 BLAKE2B a6385ce71f757f3ac7fa7a38b6cacff2b21cbb235af9aeba31088f1965bdad709a848a3f2365c8eb31dd648d5eafb981dd58017719222afda341632b1e9866ca SHA512 fb2d172976a00b24e1bb7507bc0f3f5707a57e515bcccfb6561749d6d0857530c3e7d705ddfb571bc07ef0d4541f9c5d8ec2b30ea966b3e73b165e16284c7af3
+EBUILD wireshark-99999999.ebuild 7143 BLAKE2B 1f37c8e34e6d65965ba0b54056198c7d1fd15f763c987a9a753cf8a6c6c8487ebf977c8ccd6171d1336e1074cad7fe28620721b8b4eae74f1dc7e84b6a0ab38d SHA512 ef42790fdbf27aed911a8922abc7e094e2ccf08ea2c34f04587f17a3b9b892238bc401a4a9a9b017a1025098ddc17a8c47970d5b84811dd6690a742969d276ba
 MISC metadata.xml 4866 BLAKE2B 924525b4564d387c926456f555360a61c531d6e235fd975aeb3bf947355423de87f00a5f3735db99fa89abd106d0929698fb7998660b8da5f9bfc3933e6925da SHA512 4a978831ac7845604c1cd680140cde27e1f202be9743e5559910fa97eb5b71f3c49199d6512a11599b4c1a9aa87fa5d4bb7cf69d88c50fdd8817f38f2e9d7223
diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
index f91e77ad25ff..730f9e0a9b89 100644
--- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
@@ -275,7 +275,7 @@ pkg_postinst() {
 	# Add group for users allowed to sniff.
 	enewgroup wireshark
 
-	if use pcap; then
+	if use dumpcap && use pcap; then
 		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap
diff --git a/net-analyzer/wireshark/wireshark-2.5.0.ebuild b/net-analyzer/wireshark/wireshark-2.5.0.ebuild
index 0a7fd52a45da..48af1f016059 100644
--- a/net-analyzer/wireshark/wireshark-2.5.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +caps +captype ciscodump
 	cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk
@@ -267,7 +267,7 @@ pkg_postinst() {
 	# Add group for users allowed to sniff.
 	enewgroup wireshark
 
-	if use pcap; then
+	if use dumpcap && use pcap; then
 		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap
diff --git a/net-analyzer/wireshark/wireshark-2.5.1.ebuild b/net-analyzer/wireshark/wireshark-2.5.1.ebuild
index e8b30ed44ce1..dd2948907ca0 100644
--- a/net-analyzer/wireshark/wireshark-2.5.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +caps +captype ciscodump
 	cpu_flags_x86_sse4_2 +dftest doc +dumpcap +editcap gtk kerberos libssh
@@ -243,7 +243,7 @@ pkg_postinst() {
 	# Add group for users allowed to sniff.
 	enewgroup wireshark
 
-	if use pcap; then
+	if use dumpcap && use pcap; then
 		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index bb1724389ab4..59a4a67005b5 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -271,7 +271,7 @@ pkg_postinst() {
 	# Add group for users allowed to sniff.
 	enewgroup wireshark
 
-	if use pcap; then
+	if use dumpcap && use pcap; then
 		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap