gentoo resync : 22.06.2019

12 files changed, 20 insertions, 49 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c7db7dfeece1..7e440a175f95 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
index a94533c52325..fbf987895c09 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -4,10 +4,12 @@ AUX fping-4.1-ipv6.patch 328 BLAKE2B e65293ba588b2a653d8f0d1779f3094aa24f0937d4d
 DIST fping-3.13.tar.gz 155976 BLAKE2B 6f5b825fd215a4329c35022e326df2e9dc7454b03e9a960074aef451277d2d99af23ccf451379d44a76776fec135983c7948c8bd54bde98c7f79180e59ced616 SHA512 d6c1c5b9edb97ef59cfb6d22f74f6a055e52465d3ba0f93be35b6fc9615ee08490ee927f3cf9efd087e18279519292f353abe6152061985ee166ba5f7e95e29d
 DIST fping-4.0.tar.gz 170060 BLAKE2B 1142ed700a28f28ff8710b65300754139734f89123db01fa4a3772f0a804cfa58477b30ab749426be384f7e007437a82138d319ab6a702702314e24c915db44d SHA512 5dca650e9c34dd2e1bdbb981df61cf092230f07a15c4ccef105b9f58aaaa43e0d85dc9665db89631feded503ecc6f6be86446719de18e59349adb7c2f3e9757e
 DIST fping-4.1.tar.gz 170851 BLAKE2B 4cad16f05afff5d1755f58be454059d1959cce1c9f50a8af1b20c34f51b3dca9b4238fd934b46ad11cb71c539c3a1f82531b44f585c774a0c28a4786105e3c0c SHA512 cd31ea336985f8d727b0db3c70213b827f0282b0c382694e10c72a89c425f2f7383d07f8f2febdc23aa246ebbf65ac9751b2404be405088963a682945edc80ba
+DIST fping-4.2.tar.gz 171409 BLAKE2B 7f61d7bb06e486c327539443bfd441e494d44cdf0f949c73272e51e0867f1b39b2c3ea7df62856b493e05d9964220e03e632df839a84a15ee92168389cc55668 SHA512 2bab34dae539d942eb5e436802e6f74d57c04aa4b782f9adbd6c27830209fdb47707131f20ed966012bcec3d253c9bb3df9033a60b55bfe560af6bb1f572ee8a
 DIST fping_2.4b2-to-ipv6-16.1.diff.gz 8488 BLAKE2B fe229b5042445665403f40c5a7740e024c836176a375c77440a827463adb3ed219a9c6da73375482baa81c1134764d3cfafebc44aef7596dd380e0964ff130e0 SHA512 6af25324d159df4ddd7dd909e2e1a0d85e08c2f51c31469960c2dbc7a9eb4967fd114eb87361f8c6b1691de60e7f753d371e6c902bec706f3fed3d205fbe49f0
 DIST fping_2.4b2-to-ipv6.orig.tar.gz 63333 BLAKE2B b3495c304d1108732cf5aedbf3665ce2ce50be5ca051b724e92583197f9aa7f84e41655b9c3438e0715eb8210ec79fb17a020904fa0d1cfef43f7178f622ea87 SHA512 3d1a76680d3a7cd361481d6e6de49797fbaf01422a73c784c8b667131afd56de2bfbbeb17014047cd2dea903f87d9f19e38ed7b0a5c2e8f2faf82759bf064ff9
 EBUILD fping-2.4_beta2_p161-r2.ebuild 1201 BLAKE2B bafd4326be5bfadff8be1f7b88c2f7bdf792972775ef9a9db92e683c52968ec1d67ec238b89b2fec96bcd8566b075fc974077e4e1b734a0001b9964c114baca8 SHA512 75275a41e6f5963fec3345a979a4a810e44e3fd21e2a49c23008211107fd0170a255107da3354819e1f20ba274f6cc9a9f74e613191a353ba201da920726921f
 EBUILD fping-3.13.ebuild 561 BLAKE2B 68493cf433016b772efd1b1f3a65ce634071a38c2866ca4ebe313a304a36bb449ccc5000532011786a03fe91cc137772220a3f2198f96eafcd5eecd8c5551014 SHA512 62d2b19a07b5aca14a813d3a8d1c131080c6526ee21cca3b3b398da0d2f96f04e4a791aa729fc993b31e0ca4e6ce8e97d5cb820b2f637b987a6b3c768ba2ac19
 EBUILD fping-4.0.ebuild 534 BLAKE2B 8c45250989fb5e073b14bb0d3d3797a38bc5387826c6258bd75244dc2d901bd8b40b94bcfac8684bb78437eb525e11362603d6a49a66a5aaae4f8148c28a8bd2 SHA512 86b6820adeadbf780e787e7be66ed13b5c23ed7b35265ba49610bad17710aabce0be693847cebb04ad008b847fb71a2a10c2edfc4b21abe3b59d52c92ade3910
 EBUILD fping-4.1.ebuild 583 BLAKE2B 6b4119056de85dbd9ac0c0d4284b60b4a95f6f364f967eb51f867a0ebfe241b330d711e799975dc87cfe42f287acf62fc91bc6e9dddba1873b1085cc3a76e673 SHA512 a038ee6b861f906e16d8807092de6799f753d5dd121bcdf4a9afb8d209ee821632799ae9e5e99af1c56cec9066026e86eeb88f5a8610c21367644a76268cdf4c
+EBUILD fping-4.2.ebuild 533 BLAKE2B 784ca2771351ddf98f7eba36466292107c7df0cab5dad5bb384caf358efe3293209292ae00d3f4a8ae9da1e668766fafac25681f99b17ca44e8b5ef20ea9bd7e SHA512 a63eb45c7766f4bf32852b8e05f58bd01f2d322f72db8bce302301ccda8187e8f2482158d8817a5dea9104ca049dd1c74a8cb799d2c7a550b0df5156a9a1232c
 MISC metadata.xml 432 BLAKE2B 26cf2b8675d43f68216b366862c04fd46072965de423ad87a6ed12feded8e978ebc2378ce582917534699586a69b7690533385c6420c0187cfe0acc089dff5fa SHA512 16121fbc4071e437cac8d026dd418f9e6efd1110424de9e08c32dd27c55d204c566faf3a790f7e301795d19ceb427c565752583ef20e8a1828d3cb3474fb218f
diff --git a/net-analyzer/gspoof/Manifest b/net-analyzer/gspoof/Manifest
index a326d9ab5e8c..b2e9e7609fc6 100644
--- a/net-analyzer/gspoof/Manifest
+++ b/net-analyzer/gspoof/Manifest
@@ -2,6 +2,5 @@ AUX gspoof-3.2-icon.patch 2951 BLAKE2B 952de6a5c1345656da88f52efba8a18da2dc45b4b
 AUX gspoof-3.2-libdir.patch 668 BLAKE2B 1f31874c36368022b18814a6dcbc0c3b8696b9ba12f51c6f5e1bf201ae2e8eb42f21521e9fc9cc1e214d8ee480f198c84b393b483c66766ecffb9b6aee07022f SHA512 d4cd192132d1a7cb12676032cb1d787b44b1ec5c7fd8667c1f69455de3892011407b1663a15d47c7a8aba38b61fb76f6f141c1c01f24420c5dad2b39f347f641
 AUX gspoof-def-values.patch 903 BLAKE2B dff9e5e8bd60a51f2acddf4e553c326fd491aa40670954da6f84cbd4ad5a357327af8833f8eb2b5e0b67653761aeab55e37964bbc1c012b2eddfdf1c3157270a SHA512 92b4a1b682669acd13b4fbf77083b633b881f4933445910976492fd093e1c4db3ef0b9d45f487ef8c3df9f252ca239d5411026f527ed3e0ab2972bbfbeea8666
 DIST gspoof-3.2.tar.gz 69340 BLAKE2B c5769a242d6d388b7606594a01b6543822167505ea6210a05f6a514c47ea875efdea3e81b495b1a635fa15d9a065a35b631b20512b326304e366f692f8a73be5 SHA512 be90aeeb9ac93b5c4a190564ecfedd05ee077afed67696b773cb79949043975807dabed8f49597dcd3b08b9b0ee53c598caa9dced6f97bd9d6170f8e82b8f0f9
-EBUILD gspoof-3.2-r2.ebuild 781 BLAKE2B 6a6daee33cb1f1ce1fde54f17c25296b5649b6c5ca0dbeacd881b159495c3f75bbcc68b59f2473b69ad59328a1215555733eb0e5f35dbc6599559e659d828f2d SHA512 4ae31501fa1ade40bc50c2ff6e52ac15d6bc110eb5e81a312830541b4aa381bc6792bb3804ee292c671d0670475798b84b2aae71bf7810b756278e3c3abf7498
-EBUILD gspoof-3.2-r3.ebuild 774 BLAKE2B abb6523147ce136f1ac634991f6e1a04289a6724d77d9fb42de94f152337e699381d0077f0819aa5eb44cbf634d31ad781badd6d6659d410800ba9a80d312d82 SHA512 44c3edef6ab00bbe199ef94737e31f4a9a5efb75eb3e288b69600a780e424ba103feabce68f0fde6f889ab3e90457feaccf43ee297418578c47eeadf443a037f
+EBUILD gspoof-3.2-r3.ebuild 772 BLAKE2B cd3d1a68aa200ad2035aa951d584eb21204a6c71296cd163e7bcfb7b54272214935ef4b03739e6ff988c2d85a7b7f956b6317c5c572f8b461a7fd9faeef37825 SHA512 6fa2dfb8ed6e989ad827aac4a6714e562d976773a477bb075ab6982b372565890246711c802b4e25e25a4d4fc73ce9602f765b59a16fff8cf9c2b2840e5e4dfa
 MISC metadata.xml 248 BLAKE2B 86f5c3602168393b46b79f56b1bbcba7d32ab183eb1a640932bb91b4876e49e1ee407a9a5807f8bb559b5df9ee3c2fdc9fe6f69ec8b1744b7fcf2746a59e96a5 SHA512 d037f260b0d638df2bf9356b7d50974b341eefecd9e45a07b392d7180233299584f4911df4fd427122afd7e49e5f32417e0f2a3a92996450233e58eb51c34026
diff --git a/net-analyzer/gspoof/gspoof-3.2-r2.ebuild b/net-analyzer/gspoof/gspoof-3.2-r2.ebuild
deleted file mode 100644
index 618d875e8c41..000000000000
--- a/net-analyzer/gspoof/gspoof-3.2-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="A simple GTK/command line TCP/IP packet generator"
-HOMEPAGE="http://gspoof.sourceforge.net/"
-SRC_URI="http://gspoof.sourceforge.net/src/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-IUSE=""
-
-DEPEND="
-	x11-libs/gtk+:2
-	dev-libs/glib:2
-	net-libs/libnet:1.1
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-def-values.patch \
-		"${FILESDIR}"/${P}-icon.patch
-	sed -i configure.ac -e 's|libnet.a|libnet.so|g' || die
-	eautoreconf
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin gspoof
-	newicon pixmap/icon.png ${PN}.png
-	dodoc README CHANGELOG TODO
-}
diff --git a/net-analyzer/gspoof/gspoof-3.2-r3.ebuild b/net-analyzer/gspoof/gspoof-3.2-r3.ebuild
index 938a95c5179a..3dfcdb0fe817 100644
--- a/net-analyzer/gspoof/gspoof-3.2-r3.ebuild
+++ b/net-analyzer/gspoof/gspoof-3.2-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://gspoof.sourceforge.net/"
 SRC_URI="http://gspoof.sourceforge.net/src/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 IUSE=""
 
diff --git a/net-analyzer/mbrowse/Manifest b/net-analyzer/mbrowse/Manifest
index ffdd2c5aa96e..b21ba25269e3 100644
--- a/net-analyzer/mbrowse/Manifest
+++ b/net-analyzer/mbrowse/Manifest
@@ -1,4 +1,4 @@
 DIST mbrowse-0.4.3.tar.gz 146028 BLAKE2B 32b33dc4ec10a7b7ece07c47280b703c871e83a41f3cd8d60f7a177925da9c269020d927b193e8550fe15356c55bb4faa47c195354bb7784553601fc39ef00b7 SHA512 adccf8de707611034db0cbb6a37117f6a4741eb92656eab0e9e5c6a8268b17cc66080ed9663fe59a3fea9b110d83bcff9094b5fec133ca7ceb2650fd532a6cb4
-EBUILD mbrowse-0.4.3-r1.ebuild 584 BLAKE2B 8b1d52ab7d64b5a88c7ad11c2e426c78def328f72e6b05c414b37ac2e216184d89d224bfde5397e97d6b2306c77bd818d832a0e524e54ea5479e4b8f2394d561 SHA512 67af5b3347ce8de5026baf2e18bda82f6cb5e4a5306183911bc282976d6551f21a8b59e6e2a3a78bdaa9eeeb7d65428705bfcfb315beef1a7d12f924fe0cb48b
+EBUILD mbrowse-0.4.3-r1.ebuild 660 BLAKE2B 68a3c11dae8232b10e567f88885c510797da914703e628141aa353b6efcdf81e341a1ef4ca7c4a6b8606910d077c08f54fb61dfba12ba7c9d050970b0942395c SHA512 2cfcf6a8d5bd66e7e204bd2aecb50650362e513c4bcd142729a69f2ef93e11ed4ee2cda2d8bb04c7f2ece49d18c6f7a4909a97eb54b49f30b536a81c99f24e08
 EBUILD mbrowse-0.4.3.ebuild 572 BLAKE2B 88cbf9cc7a4e4dbcf17264eee44137d23e0f3069296fc05700d47158a2263a1b6a8474a83859c31418e2f485fbfbbe7a12b8e2424a5652e2f359985a2334b052 SHA512 c9984d298f30a081068ec8de858c1d7c3a195af2a74c3fc82f4c85f7e801d8aaa1aa27c057fcb8577e95526c98c5b7c1f15786ea556aacfb4c41b80b369e367d
 MISC metadata.xml 357 BLAKE2B 725053ef04034d1a1c6272ed485156e4e2a933ef149a5df00d6a6b8b03bd48d6a1b49564c25d7d91ab78673d49e23f8587b7af091ffe20848b21a0bc157b2ac5 SHA512 5199c9147351e6dc733c1b8f2edaf598d9ae32d0a72de149a2b1550a4aaa1081d80ee5ae175fd9dc4de7e65d177055ee9dad006a81a268f8af6f8497e202261f
diff --git a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
index daa9bedf0c8a..703e99ef3ccb 100644
--- a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
+++ b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,3 +29,8 @@ src_prepare() {
 		acinclude.m4 || die
 	eautoreconf
 }
+
+src_configure() {
+	econf \
+		--with-snmp-lib="${EPREFIX}/usr/$(get_libdir)"
+}
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index c4641902fe10..0b2aac14c41e 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -5,5 +5,5 @@ DIST mrtg-2.17.4.tar.gz 1096879 BLAKE2B 12d485e8bdb28ff3706341d5b53e78dc37291e6f
 DIST mrtg-2.17.7.tar.gz 1098650 BLAKE2B f8191296fc163b950792b8ecee773cfe643a7390d49444ce8b5012b2dbd932093cb4f71745ba2c86bda579fbcd3c73a4f9cebc1fa4e7f791a7b4461ae92ac191 SHA512 b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768
 EBUILD mrtg-2.17.4-r1.ebuild 824 BLAKE2B 34727aafba25ed97e7eb8e5f37806f533eac1d4300bf225c6142dc884cc2d7dcbf33cd0a4367a06427d789c076f78d0d4c6bd75a36c6adf16fd44f1f76d549f5 SHA512 a81daab88b80342d21a46eb8be24135b301e0c1169abd6871c4fa7081a765ed7adb8a39a4de35774f5da151788c7a805e9c7b082a5127074575146f03a9ed9c4
 EBUILD mrtg-2.17.4-r2.ebuild 1000 BLAKE2B 335c76bb71ba16bc1908762dc5002b8ab26e464ce294d6ecab2763bda86fde929bcd826fbafcb9d3b69bc1a64f58ffed09de597914bc4d5b9eb7badeb3481196 SHA512 3c71dfe63faa649b90aba120b148348a2b1bdf5ff6250887006183939f8e94f0d87fc855e94782f3f9aa6c1f355a2ec27dfca5af820906319b681e80a5dddba4
-EBUILD mrtg-2.17.7.ebuild 1008 BLAKE2B 1425567185472439f014548534d2568c19b3ddcccc48ed1c76229ae3944e1213dccd63838d55806fd715a82aea88d3019edf6678b0d639f2a2c999c95bcb3edc SHA512 9215aa63ab6fc3c8c3099dbf36149e2f84f10cd57d615029112e09c4e97acc276bbc8e6c7d14534a22388db74a6197d74d2ef35295ccc005749e70c52285c547
+EBUILD mrtg-2.17.7.ebuild 1000 BLAKE2B ebb31186ba541559e44fb04582b95bd7a9347b29a0e7bccd01b66821b18ee465cd37de6ea102e7c884e7973a07e904f9eb0191b1b39c2c23a9ce7b694e025352 SHA512 bc7023b395cb4197095132a48d05d435cd2853dc549a1c1f0829f359731cb21f11fd6241e23da9b2653dccd6faf1d7afa5273bfbfd764a3ceb86fa421b83fd4f
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/mrtg/mrtg-2.17.7.ebuild b/net-analyzer/mrtg/mrtg-2.17.7.ebuild
index 926ed585809a..d21761849934 100644
--- a/net-analyzer/mrtg/mrtg-2.17.7.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ~ppc64 sparc x86"
 IUSE="selinux"
 
 DEPEND="
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f92270c747f9..106ed20bc285 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -13,6 +13,6 @@ DIST wireshark-3.0.1.tar.xz 30903792 BLAKE2B 583052691cc20e97511f2407a64fbdffae9
 DIST wireshark-3.0.2.tar.xz 30910100 BLAKE2B ffc8f1c5fc09a387c10ec2bbd91f80dcee2b368108c2d93b3c891773dd1d69259fff351adf991d37ecc52fcb69f5ae60ab91333b5bf7b7a3390de2eb9d4f6d9a SHA512 0dab01b614534c9ddea517d045598029c15f24ab54d59110e6819d43d2479afe9eebe04554d25f3b0806cf8c78ed241b0fb261c2024234297eeb25d032fbb982
 EBUILD wireshark-2.6.7.ebuild 6510 BLAKE2B de9400f9081e9a225d4c3e43f715db085b2e420fd5fe91badba9a9ddbb4f78d83715f4505203b54fab0f5d3aab6366b35ad09ed91d9cf681e2ab3f744840bbfc SHA512 6d0f9594348164136a731ea99a82b22bfec73f51f477446a58f85da5873c956a2806d310c9aa74bf2a8b124c7a22e405b7b1e555d903f316801dedec19c404f5
 EBUILD wireshark-3.0.1.ebuild 6644 BLAKE2B ec4baa9e82e85d4d4f12c8d8952fd67fc01c4452a0baa709d4dcf71313a4f01e8c711aa3735a329868b9627099872a3bb4665e6fe70a7caa84ea0fa910947c14 SHA512 9c48c6c03aa455dda7178f77c1fa32d404d36c814043b3bc71ea60437779f85c5d4af38d35599eab548d7fd856eb1227398a78629acbef2d3f9edb3fa7d05147
-EBUILD wireshark-3.0.2.ebuild 6647 BLAKE2B 552641a87d4e5a2878639d3aa7c1c884e40802484d883dd7e4c1465b3bc2dc4325f9cd865e3d937d99a31c238a79d5eeb9555ea528db2cccfd31be82da674353 SHA512 54f545a9ff0758c3f87e9092a8ea1fa5fa72a5cc6ad3d5ce574cc5a0e075b77cc97b9f2da5ebd8c262811fd644370c890c68bf5c717625d37a05a431d4eea72e
+EBUILD wireshark-3.0.2.ebuild 6646 BLAKE2B a83359278ffcc89e54efe7367b13e060884985bc0c4817639b1513815fc62877f6edea5224768ce75f006f569ec01fa950a2554d3048dbad7b32f51f3147c838 SHA512 7273fbcd9a25a1312979cdc244825d6c3139d9b161d396a2f1a6ac58701912228b3a380d415d36d8d37cb1295cb6c0b49f2bd73d95f28853879d4d5917e3dfd9
 EBUILD wireshark-99999999.ebuild 6742 BLAKE2B 1c7c56171e9fa7a768966a6949c00fa8afa7a108c5da6dd912188790541d0a0308618ab9f484e983444b63df3e7960558ad15886277b17fdf053b5640c97e123 SHA512 81ce54ba8d23f0b3f9ab62ab1718bff1bd96981d3349fb779672c3ffb0f155bf2997c62e051e7334188fe12a3b8af4bce1f9f4f5ef1925eeeac7a0970b383043
 MISC metadata.xml 5078 BLAKE2B f6cce66c296cee00dc8409609f502a88ea9acbc76f2bb8ab5bf0ea7468b91899ad301c1f56e32c9244c1acba6b8572e2f0bef0b416a833226d5c91b9f0ae6923 SHA512 1c8b1596001ac29e32fe2252584acbf53495305f5d894927b9e193f224f45c42cd182e96bb32420488e371ef51d4cdb927148de53f2f797ddefcf43a60cfa5bd
diff --git a/net-analyzer/wireshark/wireshark-3.0.2.ebuild b/net-analyzer/wireshark/wireshark-3.0.2.ebuild
index fea66792a834..124702089cb3 100644
--- a/net-analyzer/wireshark/wireshark-3.0.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc64 x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 9a88f887b3df..3c6b6369d928 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -31,6 +31,8 @@ DIST zabbix-3.2.11.tar.gz 16099820 BLAKE2B 7038679ecc9ae1b6684d65b3dd0019865e587
 DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340cb907802722a4f91496a35c7a26fc1c37178c264f606f8a4a95cea350e493763e55f44033eb2aa97ec889664908a SHA512 d210c6576a6c5d67a1f58bb51436c815a191a2ea62f6929784fcac6e0da09febdbb42c11dfb791b6a6d5897dbdda02e10bf56f9162b7f9fb34a57c34b8b1c62f
 DIST zabbix-4.0.6.tar.gz 17162202 BLAKE2B 8f03830d5493719cbabd770527dfc99e1bd2d80a3eaeb691e07cd7d8bfe587317ee045ed13a297494539d3cc2e3a26bafe29cd6eb6126c7fe74ee5de44e98b39 SHA512 43b7ccadfaebc34098a827ef7e27c2c637d4bb74db4d06cdaee7650171b7b5e14787a473a66b638a252c1342e841b546e089bd762de703e99e0a34b0549393ca
 DIST zabbix-4.0.7.tar.gz 17175571 BLAKE2B 3173881e093c58175e014d55c74d09656dbb6e99321f808a3ce6fe61aef56325aa94c4a3ff0b1edd2872734cc970052c63e5db377f8e8d605bf25f2eb8505802 SHA512 67373383ef961426901d8c27e1e51c902d8580b9af1877d4012c934f0ee52c5cf85e3f81fd16b244cd9c8e869cf13dbdd7597d8e2591356efc61570b354961f8
+DIST zabbix-4.0.9.tar.gz 17118478 BLAKE2B 0b3761085c9fac577061ca3a0e5839c3d33f13802ff4e752c575f4428339dfbc7e02e5ae8abbf7870a0286c45777c670aa74cd93b2cdbf9cf62961e4723aa0ae SHA512 4e04d80490f43d2e7833a4e11dbc7ce0ed70dc1f43653eeff923f5bfa16bbeedf37597599d68e0de3194820501d896d785a20d6ae0dce9328c458fd711a6a7bf
+DIST zabbix-4.2.3.tar.gz 18241315 BLAKE2B 38f9e61ccfe68de553e115e35466430b9f8b4211ca72b3c0265a9c9e5494575d8b026cda11cb7ef10644df35b8f168b7e5ca72ace8a412445008299c6c513877 SHA512 2e7d7372d5ce84798743d3c10fea0230aac470b0d9936a722687eefbe818b51e16f5dc64040b8b1b1189f64e8785ceca108914534efecd152473d213b15f7e07
 EBUILD zabbix-2.2.16.ebuild 9436 BLAKE2B 3d7e32e772074500827d0bd469e280f77a4f7319ada11d1556bfa3148d0a25e6b00b84d604ac0cca436d375cabfe9cb145c5e51902c8293668135396d1dfc160 SHA512 c244b2dcff1fc7a1e7dc82c254eef974a4153f3f4bdf1b202d50e3006de3e0237d4dcc587ee66ffcbc16bb39ee4ad29a4dfe283332a3593aba2585f5c970d563
 EBUILD zabbix-2.2.21.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d
 EBUILD zabbix-2.2.23.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d
@@ -39,4 +41,6 @@ EBUILD zabbix-3.2.11.ebuild 9265 BLAKE2B 489884d6ce42e154f3c7c0a9b1f2e0143b9fdd3
 EBUILD zabbix-3.4.15.ebuild 9253 BLAKE2B f381475686894409266e9c642872a728306a89ea472b337709ca45683be504e9ae2822f9d105c256630113f6c874595d130204ca512b6ecd93126fb4926447ef SHA512 d4929f2687c5c0a58ceb7a8a98fed706a62a5a717ba7892d85058b7e1e827095245b022a523daf0d3f53727f42b4ff83c693c1a2195eb3656d589bede632db4d
 EBUILD zabbix-4.0.6.ebuild 9441 BLAKE2B d61df5f8af38fe456285b619b37bf5c8dd80f21c15466893ea5f89de4569f8ba2c9fd3db8922f22b9cc311e7d265f47d17b3580df22073cb3ed1547b3a0f3457 SHA512 8c04eae3cb2b184bfc5dcb6a6ef55d7e6a01f38d4eba77aa7603d1d8f10bb8f82f92cab8be942a85851d387fa36f683c4603c18808277ec5208785d7f6f85576
 EBUILD zabbix-4.0.7.ebuild 9441 BLAKE2B d61df5f8af38fe456285b619b37bf5c8dd80f21c15466893ea5f89de4569f8ba2c9fd3db8922f22b9cc311e7d265f47d17b3580df22073cb3ed1547b3a0f3457 SHA512 8c04eae3cb2b184bfc5dcb6a6ef55d7e6a01f38d4eba77aa7603d1d8f10bb8f82f92cab8be942a85851d387fa36f683c4603c18808277ec5208785d7f6f85576
+EBUILD zabbix-4.0.9.ebuild 9441 BLAKE2B d61df5f8af38fe456285b619b37bf5c8dd80f21c15466893ea5f89de4569f8ba2c9fd3db8922f22b9cc311e7d265f47d17b3580df22073cb3ed1547b3a0f3457 SHA512 8c04eae3cb2b184bfc5dcb6a6ef55d7e6a01f38d4eba77aa7603d1d8f10bb8f82f92cab8be942a85851d387fa36f683c4603c18808277ec5208785d7f6f85576
+EBUILD zabbix-4.2.3.ebuild 9441 BLAKE2B d61df5f8af38fe456285b619b37bf5c8dd80f21c15466893ea5f89de4569f8ba2c9fd3db8922f22b9cc311e7d265f47d17b3580df22073cb3ed1547b3a0f3457 SHA512 8c04eae3cb2b184bfc5dcb6a6ef55d7e6a01f38d4eba77aa7603d1d8f10bb8f82f92cab8be942a85851d387fa36f683c4603c18808277ec5208785d7f6f85576
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a