gentoo resync : 19.04.2018

9 files changed, 13 insertions, 12 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 50de8e22d4aa..55f2828d01c5 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/lft/Manifest b/net-analyzer/lft/Manifest
index e8b0198b4ba1..a58b886d3a08 100644
--- a/net-analyzer/lft/Manifest
+++ b/net-analyzer/lft/Manifest
@@ -1,7 +1,7 @@
 DIST lft-3.77.tar.gz 376369 BLAKE2B be518167608896a43b7e2ef1ca478f3fa9a9ced58737e607af348bd8929a2890356dc6041ce3ea9fa3273a954d4df151a4c6ff5fc5a0e26e25b3849bf83aac5d SHA512 b06fa50cbccb40d275ac604b86c6aed4ee00700cde38fd579de06bb577280f154d0173c4788920410a5c2e0c8ed20d7adf07f15d0b98cf5ad4ea422651df60f1
-DIST lft-3.78.tar.gz 376574 BLAKE2B 0f9a582dea7817fbf8a9569bfddf7e15af7b2f68e038eb3891ca3eb71902a90a229713eef528a5885c7720a100ac5e72524c877bcd5e92c23921b84ad96eecd4 SHA512 16636e60ed1fb0e0ffa52e24c4d23bc83de14f5c4fbb60641be9a8a6e54c1d28c8aa66ad0e8ae502e199e60653c368ed140a1027a9928dd8d76d1e5d8326122a
 DIST lft-3.79.tar.gz 376655 BLAKE2B 4c3affe00a09befc00029029a1da5d530d08bce317e616e7d996a8e31d22632cf43adbe519f4789313b59dc01f4c36d19860effd561b4f691eadcac05c935d6e SHA512 83f35cb24966467a7da180ca8ac9d642e7ca6267a14e752a813f172956554c3d4b278a450d230535c15db1b14d415dca752ad05ed1cec8c1c7cf4953b90a646d
+DIST lft-3.8.tar.gz 376731 BLAKE2B e78e6d32cdaff8864e13477522dac92953d7ba44cb7d64e327eeb126411d6f6c022fe1e2011377df28bc948ae75193d1de2801ee12edc42a5cf70e2b56f5e8e5 SHA512 13ea176362096cc8c20500d61969483642f5d003263b529ec8d601786f621341107859510f9cafa5d365417beafce897bcc9cd631171e291ca3dc07fec1bd483
 EBUILD lft-3.77.ebuild 493 BLAKE2B 49e6ddad7656e1c01304a464eb4c092f1f2e7e423732397645cbc3ed1ce2ada675f59d7668368d6f0e067e39ee875823f4f2f979c34000ddacdfae57449b5e36 SHA512 7d921ace43680f2ead6e1e9a1cd45d8e3a3a505b2b9293ad2940dbe117a3339e1a80ff04b15831459b80a214beaf27efaac57c9696642d4a58933516756c7164
-EBUILD lft-3.78.ebuild 496 BLAKE2B a473d61c76ee7692a243e5fc8bfe20300879aec259336d161ea64c0f62c7ad6b266a3e00e6aa1b84d74e838f3f060265f753c720edbd1f38c6401971f50b68b8 SHA512 763ac7adc467f1517e7dc682ee179f9e8a58b94f67c871a898c55f4545c66219764bef441aece29a575675b54e899bcc59b408f4c755188f176694852c374c89
 EBUILD lft-3.79.ebuild 496 BLAKE2B a473d61c76ee7692a243e5fc8bfe20300879aec259336d161ea64c0f62c7ad6b266a3e00e6aa1b84d74e838f3f060265f753c720edbd1f38c6401971f50b68b8 SHA512 763ac7adc467f1517e7dc682ee179f9e8a58b94f67c871a898c55f4545c66219764bef441aece29a575675b54e899bcc59b408f4c755188f176694852c374c89
+EBUILD lft-3.80.ebuild 518 BLAKE2B aa43152e115169c697369770cc9ab04deecafc9e8e35bd7ba59b322fd1fe02349c539acfe7a2ad45ce237de954b65739598cfb9455b2ff5fe60c2b900c150f19 SHA512 1ac97a059e628e16ed8f1bdf2b87a66b8d7d377298ea2cdf502486599c8f332b813629d6fc5eabf90a34f0c47672dd9f36d590c28199fe7b25146b20f4e528e6
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/lft/lft-3.78.ebuild b/net-analyzer/lft/lft-3.80.ebuild
index 58a145bd7256..bc7acaa2b658 100644
--- a/net-analyzer/lft/lft-3.78.ebuild
+++ b/net-analyzer/lft/lft-3.80.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
 HOMEPAGE="http://pwhois.org/lft/"
-SRC_URI="http://pwhois.org/get/${P}.tar.gz"
+SRC_URI="http://pwhois.org/get/${P/0}.tar.gz"
 
 LICENSE="VOSTROM"
 SLOT="0"
@@ -17,6 +17,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
+S=${WORKDIR}/${P/0}
 
 DOCS=( CHANGELOG README TODO )
 
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index e6059581ba8b..4eb7749bd9db 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -21,6 +21,6 @@ DIST munin-2.0.34-gentoo-1.tar.xz 11920 BLAKE2B 19cb949b8712ad57544b424de0cb09f9
 DIST munin-2.0.34.tar.gz 1349842 BLAKE2B 641a780cd42d07c1a4f370dbf3a2647c99d3d69b5226a50f198ef561ff36e362fe397a55102ce57ef70a4a730ed14e02cb3a4f3043cac1874f36670535e0968e SHA512 db802266842e103017c8c3bc0fc676d0d6146a37b06e69e709cfb396d67c42ac4932b8d4979e4d1a108fc0c2467c66423799212f6ea1279fb9ed64352ddf41cc
 EBUILD munin-2.0.33-r1.ebuild 12312 BLAKE2B f99f25c18c642166cb877f49aa9885227c6da17d7c98030719c956154cba0911c9dfe63f7547fcbced685a6e40868005e938c7fd4720db8150ec4005c3f96834 SHA512 1978ba10bc17d82979b000cdf6983510d173609471a14ae8a7a9d005db94d75c214c32da8cd57e314eb15df53dd5f2b6069d3a098dfe4287dfc5c2aeced08beb
 EBUILD munin-2.0.33.ebuild 12178 BLAKE2B e53b9a9c58c03152f832024532ecfdd78fd0f5489556fb0e36c85fcfe28a7a891f1b5a296cad5038d30d9233b5205c7881e3f8001b9f5addb732869b2cda3be1 SHA512 264679112c768409b98d058c9ffbac595b9c947a7eca496038c9c4e8a366ed3ec80f7a3d937ad21341be3879e7e15dee7d8f77bed1516f294b811ea85e202c8e
-EBUILD munin-2.0.34.ebuild 12225 BLAKE2B 524b11eb76fed38e682546f3018f11c223debb552e5fe692541caaf12db1d56f69f7c09b4dc9d4e4b31149f74b15f28d512a0743248e9d8b05f6586277c4c6f4 SHA512 d5151a8ade8aa56247137ae3f5b1dadc51f7d9dd58ed083eeb77ce6b74d056fb04d40b5755884ebb62539f79cb562c678df96d9918be03c157d124ac68fd4367
+EBUILD munin-2.0.34.ebuild 12224 BLAKE2B 7b68f19c4057c7f408797e9b9b8993a07a658b30826a5e8b5a036f2f0d91e8e9bd6d755d93a75ce264afb722be3b2e9068224e5401b55b3ada58e8badb630356 SHA512 fa57f65b71b2b0e769b2fe7ffa2bac4a15deb4c6e1bc7253047cc926b7505a848c7d5e1ce28f4e2ea558e174ac5e40cc729250fedcb69ebd46fe293a27a4b81f
 EBUILD munin-2.1.9999.ebuild 11520 BLAKE2B 7f55a4e139ddb37419299ff65fbda91e22a3e890c86c23bc7d83f902fdc81f36ad665d3f0c6d7bbfdb60684740e1ae86ec9ec9f34dbf15f49e5385c72156fa55 SHA512 6069e6d31b9385885e98e815d4bf33227689fa8e74c48f4aa7b6af673be76d25ef26e777ef819563a8978a3cd73bc518b0ad3e5807c58a5b0e575aeb712f5ce5
 MISC metadata.xml 4116 BLAKE2B 652f8bb067b024f91b3f2fb9d885c93405ccd3e4fdfa141ae5e2996f9898e757d7be93d7e74d027a82403d2b9b472f7c6fec95815b18a0b2975e20e328fb7862 SHA512 ecfa257040277d815c05693724e9ff454b5ddefc1134b6afb38d66783a5e415aae78bdb35aeb0e80882a7b8ff19499f2b3b3646cc2a139e7797a0a718c2389f3
diff --git a/net-analyzer/munin/munin-2.0.34.ebuild b/net-analyzer/munin/munin-2.0.34.ebuild
index 2a50f5c696d9..0cb73d8f961b 100644
--- a/net-analyzer/munin/munin-2.0.34.ebuild
+++ b/net-analyzer/munin/munin-2.0.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc x86"
 IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
 REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
 
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 08eb6eeaedbd..aa088f4785e4 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -4,6 +4,6 @@ DIST pmacct-1.5.1.tar.gz 874563 BLAKE2B 7dfa381c6f6fbde0c01d790046a087f0291f2347
 DIST pmacct-1.6.2.tar.gz 1311678 BLAKE2B 123629ca2e5e58bb4e684001b1c6d2d510e18450eed1c6e45bbe79ec7bb37072ba9b844fe0d8826a7923d0b09cf6923ea87d4e22fb2f251e7ebb9744d1c59b93 SHA512 8495f97752ae586fd842eed49ce91db3e4753133f7d380d067e7df153abeea469e5126800074e9071cb7227a3f1df64d4642dfece624fbbfa39b4537fde38b46
 DIST pmacct-1.7.0.tar.gz 1351888 BLAKE2B d80d996bd247a90074b79bab69d709f70df74c7d89a552d01d86e718b165bc0091c560f4c5164db0c770b952d7bfe6660ac8c3a057f5ae8f321c015b9bdc40d3 SHA512 14f1cecc562f008d9b79259f885fc3a1d0a74efa4840d6150277c9bb3c67a233ca9a6b921d9d83fd488d1eb6f535075d7fbf53de0036c48611ffcbf5eb7559b5
 EBUILD pmacct-1.5.1.ebuild 1613 BLAKE2B ee811680e02b2ee6ad710c38520247935720da1f0e49011ff7b8ae6ec3f2f22793e337e872e41d206978130e331e58ad73af31bd4fd485aad7c42c8016b9a0a3 SHA512 7d59db86eb9a0bca64c83b4b51af301f183affbb492960949bf4ae9f69b2dc69c1120d0dd31c50c80614101ac82523d5b7af7e355af12fde708dee96f2774793
-EBUILD pmacct-1.6.2.ebuild 1792 BLAKE2B b83603b5294fa7e6ceaa232ca3a8eacb20306a4cb04f9692e58fd857b2fd3e085898710a2b9af7142acb7b98231b860863a2b0a75d770b7029c7d35003c1ef32 SHA512 ef4fb78a56a8ffaec1d26bb736bace51641f68f4e67e42dcb7356019000889225cac7472b0074924786521dfcfcc03854a91e88fde6d7ac48d1939b7f99a6fcd
+EBUILD pmacct-1.6.2.ebuild 1790 BLAKE2B be2fe64588677200a54a4866e2946cb5516fb65d4f1ac0bef07287796321d3832c4acba1284f8bc285bbacf6513493a297880bccca350e6d7286ef6569e1d6e6 SHA512 6db9673c145cec1da55e4cd18428f64fb334066eb0a5794adc6127a0ba27144301237aa6e30e1c4a93ce892ad4306369da46e9572b41430df7a776080b7edcc0
 EBUILD pmacct-1.7.0.ebuild 1969 BLAKE2B cf2c83edc5ede644a2673e471418967a74e1c882e6fa736773f779ffeff3355f0f0aa0b6d0aa3f6fc83a8e3f7e2a779e731969c6bbc78a280fd4d81e9d8691e4 SHA512 3692ebc01a464fb66bf4fa1891ad8ae5f9c9c2299b9038a1bc49fb742a54312c10005f8e860c268f5727b93ee1fe9059e6d87838318d2940d1048d3f6950928a
 MISC metadata.xml 1140 BLAKE2B 293f22275f422c2fe1c4961c08e9215b471e01a9b7cb52b380fd6c420cafd9fa4dc32db96cb6f529eea0f58dbfcb1ba08db3edb645a204933272808cf47dd223 SHA512 1b35f356c2991f002b7803897442c78040d41cf62cc60833454642e2389c256463df47a43ce125441239370cbcbd388d529146841fa7cb98079e85e23122f51c
diff --git a/net-analyzer/pmacct/pmacct-1.6.2.ebuild b/net-analyzer/pmacct/pmacct-1.6.2.ebuild
index 72d65265800b..a2934f5a2a94 100644
--- a/net-analyzer/pmacct/pmacct-1.6.2.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.pmacct.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads"
 REQUIRED_USE="
 	?? ( geoip geoipv2 )
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 85b8aa9592ad..c224504f6743 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,7 +8,7 @@ DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 19a69d077b794ab07fbfb22b7cf9e61ff54
 DIST wireshark-2.5.0.tar.xz 28197388 BLAKE2B 5d50d3752078a71d1d83f48a85ee564d14950efab39d5679430a61a266f9b93749278cd19d155036326753fbab86f83c5edb764adec5d68325730dbba19a920f SHA512 963c03dd363850cd0ad8a32a3e8c85410f2b23fadc081f00e4e3a2ad3a324a5f35626fbb7e490ec01c61260500363fef93c52bf7796b917e9490fff4044ee67f
 DIST wireshark-2.5.1.tar.xz 28229472 BLAKE2B ac832e3d8727a20754153949d7dfba9cfbc359955e55c06a9181ecbd3c9d9ddac269a745a430c47907b3e205d1b593241e0908b5b6c232613cbd4d23c96c4f61 SHA512 c3e1abb1c8b6a035640d655c59bfb8a9a846c88f49035b8086ae81a6e74cb296419f15bc4969489208fdce6578d279663c6fbc8d6eebff1b6097d1dbd0e71b75
 EBUILD wireshark-2.4.5.ebuild 7392 BLAKE2B 833313e93273e8a70800ace0fd0118b0c110d57201ab93fca9874deb5a31054151c38b18f9d8afab1f9bd3d32937500d587f96687341b4c34552fd3f026d0f89 SHA512 f0fd759e54e070e1821c63f998711c59f0d12aca3511f6bbe5b1b04788e4d7f69c26c387e9ce8b0468bfe6e83e61157869f905016759ccb383a87fff1a395c82
-EBUILD wireshark-2.4.6.ebuild 7401 BLAKE2B 606cd6e55b9a7a0f908339ef9a37f4e32f7c003ccdde1943f30df236e948d703379e2721720e186e61c438c4261c6a4cfd1ae5f6df6e461df68f205d6884f44d SHA512 a00141ca160866de798b248772ad7d0793bb0fa99e0a5b5d87d348ee81bb0607855837dc0d0813fd06708ef82f3fa21ec124508a0bf1155a8819695839c7ccd3
+EBUILD wireshark-2.4.6.ebuild 7400 BLAKE2B b7285588257633fc37bd8065c9dbef66c5a89cc2fe181bf3a4345beb8f144d889c6227939265ba152795eaac3cc08c84828455f35dd431f54f8e51e4f6536077 SHA512 f372729872f52aee8ab308bb97f284b198308af4abc9fe25f2edf2b6b9535ac17c548fde0720a46e409a53708067b8e00bb67811a79907fff5521585e1a926c7
 EBUILD wireshark-2.5.0.ebuild 7136 BLAKE2B 0d4694ca0f61af34f8b54ac29d43d146ffabe22ec905e78f4ca1f49667d9a09dd4e5bfbb01f42d6ca2003712e2daaf4c52d4c00c03afdf492b638cfae95016a3 SHA512 642a7f788b98b0f820880f14a3245122803ce5f96a4290b327144be3c22f4ea7c23eb9142bf47332defa9b63ed2e8e5a81f20a69137d1ce1d5af84d14377deea
 EBUILD wireshark-2.5.1.ebuild 6669 BLAKE2B 71ff363e37f83bdf5529346c7943b2c758d0ed50bf01471630b8f3f1f669bf7faea0e2e10373b36a453023b24b165b2c2575ebd0437161ff63a85ab29560cb0a SHA512 517a363489eff99f5d8dfa9e64025ac9940598824253c2b59598060804a7bcc1cc10fe94aeb007ec8f4fcfec0e8b02b9be0465b0373d76f403435b4c947132e5
 EBUILD wireshark-99999999.ebuild 7143 BLAKE2B 1f37c8e34e6d65965ba0b54056198c7d1fd15f763c987a9a753cf8a6c6c8487ebf977c8ccd6171d1336e1074cad7fe28620721b8b4eae74f1dc7e84b6a0ab38d SHA512 ef42790fdbf27aed911a8922abc7e094e2ccf08ea2c34f04587f17a3b9b892238bc401a4a9a9b017a1025098ddc17a8c47970d5b84811dd6690a742969d276ba
diff --git a/net-analyzer/wireshark/wireshark-2.4.6.ebuild b/net-analyzer/wireshark/wireshark-2.4.6.ebuild
index f80d12f33c76..f0e31f02e870 100644
--- a/net-analyzer/wireshark/wireshark-2.4.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
 	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua