gentoo resync : 05.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
commit: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree: c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /net-analyzer
parent: e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
63 files changed, 1133 insertions, 790 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index b9337e800739..31326d64d1e1 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arp-sk/Manifest b/net-analyzer/arp-sk/Manifest
index 2019556d80d2..e84b9eba8d99 100644
--- a/net-analyzer/arp-sk/Manifest
+++ b/net-analyzer/arp-sk/Manifest
@@ -1,4 +1,4 @@
 AUX arp-sk-0.0.16-libnet1_2.patch 1362 BLAKE2B eb3f8387f9d43d957e6a2a111bce2ea336d705d74761f22d4d4adf92f00c00b4f81de66112b4134540aa86847874c8abca19af4bc62fc75635f149d62effa336 SHA512 04cd17513d19f0e70b54840148fb8d603c06385e601f352cfadc381de5109b547e204414830fa195cfac56e662ffdfb234f54b8fec9ab68316cfdd4220bdb922
 DIST arp-sk-0.0.16.tgz 211636 BLAKE2B 9ba786829061161c0c38950a7c374968126d4cfb269b10b67b5a1dce2a7cb1016833a4a2adc9fef0f8fb61dbbdc8d959a7cf63379e69bff3fc4dc9a9201348af SHA512 d827ab5c701e1e3a6444dbe7e1e7c0a73ee2bfb2339a55fc7d3591ee8e9e9aadef4dfd4aaf331251fbe22d83c9b1135068e5afa6303eae934b3fd149ca0819a6
-EBUILD arp-sk-0.0.16-r2.ebuild 767 BLAKE2B 0f46b731f5c075665a90f047fb4844075ddc71e4bd5190ef10213d9a724503785fd425c96873fb4ab851222d64fe67d31829c56355a335887b4f21831c5e03a3 SHA512 b8feda546f715dfbb97234b049f1d8d1c8676d431c572e9e6b7211b4d4748bafcbaf76f07c4352f232fd1d8e0410c3f3ce4dde341f91f40cde0621317d71bd1a
+EBUILD arp-sk-0.0.16-r2.ebuild 760 BLAKE2B 24d5b43e586342bea79aae0fe95178f1a26f2e044a92077de2e858911ce09d126fa78c68cc209a31c58c051b836115cf365764898a6180e986537b5d45f29310 SHA512 b65c40cf304b8a8c49575a77896e2a81329bafd11388baec86ca68b176b1ee0fdb25ff9d874989f8aa695a4e642b3e78d294282e03ec04f9ea7afdfc0ef44e97
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild
index e18045a7f774..6b9187db0bbd 100644
--- a/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild
+++ b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit autotools epatch multilib
+inherit autotools
 
 DESCRIPTION="A swiss knife tool for ARP"
 HOMEPAGE="http://sid.rstack.org/arp-sk/"
@@ -18,11 +18,14 @@ RDEPEND="${DEPEND}"
 
 DOCS=( ARP AUTHORS CONTRIB ChangeLog README TODO )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libnet1_2.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnet1_2.patch
+	default
 	sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
 	rm missing || die
-	epatch_user
 
 	eautoreconf
 }
@@ -31,5 +34,5 @@ src_install() {
 	default
 
 	# We don't need libcompat as it has a potential to clash with other packages.
-	rm -fr "${D}"/usr/$(get_libdir)
+	rm -r "${ED}"/usr/$(get_libdir) || die
 }
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index a6019ca70408..921f4c3bd08a 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -2,6 +2,6 @@ AUX arping-tests.patch 5643 BLAKE2B 154071667f814ec720a6fce36612d251ab891eb3972b
 DIST arping-2.21.tar.gz 50067 BLAKE2B 67b76cc48e9717117dbf43702df7f422634ed40196ec44d273a773610618922ddf7de47ffdf32cb7296db1dbce0a696c57b7992e6ad11f6fddf52a16212154fc SHA512 e976ce1a3ec0e4f57bbded09c6a07934e21df66ce7931422c420f5335dafcd88968f03ba6987d192dcdf51cca89180c86337aff50806713c7b04cb13e3e83504
 DIST arping-2.22.tar.gz 50152 BLAKE2B 2215773b922219537339550e8034bb6eca82974469ebd0e399c73bd259ef4ff7a4510d9a5ff108cef3dac492477c54fc2517c2dfd4035158d0269f03c0e2a0b5 SHA512 0b36fff2c14c1ff89453ba63eea04de3343fcb19da7dbc1c8749bc926e441c54915cd628d54171d449e66e92663e31f12e057c30a80cd49c4412650e2cd00ef3
 EBUILD arping-2.21.ebuild 853 BLAKE2B 815e29d2d3ad9641bc0067f69a41eeb9741eacbcc08c5535eb88f4219fdf8860f6c9ae36c5b338b41221a7155d64725dcce0db6f471f3d6274ec66fb967a53ab SHA512 b60dbda113926dbaa2718cb70953546afc440f988db472c588d9e287d9595dc86b50c6c6a85748ec02f6489587c8892677825298de6ab691c9d50ab308402a7a
-EBUILD arping-2.22.ebuild 779 BLAKE2B ce2cc2d6cd7828d195eec621b4f48c6868cf1122e932883d8d94ab573be854f4159c3890945202cefffcf6192bf76be770a30cd74ea17a34d48fd0a217c24c8f SHA512 8121822e9f945e699aca78a672f398c13b00fae53fb1e61b0b151dd64dfaada0c15ac9a00f75ddea1fb42388590bfc7433c86536041c340da7a1d7337f95595e
+EBUILD arping-2.22.ebuild 778 BLAKE2B 0257dd7a86931b7500ba213dc19898addd30fed2c736b1433812df7dc656578c117a0e785ca70fab969bbcc88da630b830119801939917bb9ca2498cea905c87 SHA512 2c74c021c55f5703822f9cacc8534014286a5ce80445baf3204dc6191568bee38dc23691640dd15a73927010ffad9f7d806da3d690ea1aab7c094f56e30e9884
 EBUILD arping-9999.ebuild 675 BLAKE2B bcc653ec32f180d4642889cdfa4b5e3461a4a6a8821faa9faffebfa2f63bc60a96a3a3f5bccdd91e55b18845b0c83b112dd1c0be7fdc1e12454427e5c0e3563d SHA512 268cdafccae462ee61ffa4ccb1c8664242c766bb7429ea764f470f3434b428ee77b1fe0f40a3a537bcb9daa0cce736d49bb445b3ee8ae91d25c2d48baf4e7abb
 MISC metadata.xml 365 BLAKE2B c7c563e88cea335d25b5d88b725a3e05df1c3b59f5c5d5d2a18f888cbbae869520b3f9749d345cc10c066524d60d8ca456d799ab27c7a7bf8dbec0fb0ca40e3b SHA512 368117a86a11e3a6d8a847eb43c8b44c40c0cc0f774a4b06f4da6e31eb6cdfdc0820918e651c481ff1e1424f0f15a59e64a7b893621c456c2496dccb9de2b66c
diff --git a/net-analyzer/arping/arping-2.22.ebuild b/net-analyzer/arping/arping-2.22.ebuild
index 619cc522a115..55d11b15175d 100644
--- a/net-analyzer/arping/arping-2.22.ebuild
+++ b/net-analyzer/arping/arping-2.22.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 767e1054de25..4a027a502635 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,6 +1,9 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.13.1.tar.gz 7585070 BLAKE2B 5a81d627728f8afb0c19761972d45606db246c132dfeb92d2fb32479631add8aaeb1d0dea66f354d3638ca346a3e8bcc266e8397e5246f984566f75c2b5e8003 SHA512 450df3ee36457006c78ca244331d111f65642ba5e232be28e60f189de998f5bb8ed70f2e1d46ea61374ae7bd6a5cf950e487bada1c7af7064970a149cc86baa7
+DIST icinga2-2.13.2-9092.patch 1118 BLAKE2B c63342b8eff6afead9bf3ccec5c6df6583c2e327edb1433731ca14743ce9c6b0bde0797c6f251480e3bbfb5e6cdaae3444ea6ae6f6740bc228bd6aae5380044d SHA512 1056ff8bd66f2da86afb9664e3415d713be03b80def6d256b6db57f0864d150bc26c0fd3ce05d836da126a2616f2c70ecce05a83bb5425c25f6204d7e522ef94
+DIST icinga2-2.13.2.tar.gz 7589357 BLAKE2B 6e1ba570e0286f09f37b3cea3b1cd833fd3005c5788e24b750edb100346c46958e97ed5df05947dc47c2bbf856cc6090d661e741072f473b8308aee5e1c0e94e SHA512 39a6f996bca671a2a22fc04e5995714b874e027888a7c9e479d5b526b23104915b7f99afb1220d440af482013043e5b969b0a0145041ac55009d1a81053e2906
 EBUILD icinga2-2.13.1.ebuild 3953 BLAKE2B 3c77b7daa7343916baeec5a8a7bd4562e4e6de07b3edbb457f04f8e5c414d7bbf0f422957a8c11b3363d90185d4eedb1245af05128e109294b3d16c1079ef0dc SHA512 216c9c67fddd1b81e22b87e98bb8ba1972f99d6b75a052669ad7e89d69e15db898405901b147be74a389f27c2b122f7cfe30a9c834594c4bd84afc23d2e76054
+EBUILD icinga2-2.13.2-r1.ebuild 4094 BLAKE2B ff27de26959fc439d064a9010ef83bcde85500c48a191dc0fd88125714135da2a7b23ef143ba356426f2ec7e10f58c1c0dc21be6be93b736d81308ae7cdcf6f8 SHA512 135fcd7e8f5cfb55ae6bc87d3c85aaa4332d2439db4ca337176e61d02dd6d62915f5c6b6aca6a57be353620b9a2710a45bed9b71671b4e289d619f1b6f19ee42
 EBUILD icinga2-9999.ebuild 3870 BLAKE2B 6f3f86826465ec9e5049b6c712fc0c55558b966da4293fad9e8307dafb5f3830e61859e54525ab4e1ac887a6115eb060e78d95b6b326b7bec04efe89fa47f91c SHA512 5d3987b0c536f04b00f131ab320e353f55f1b3023233468e3702c501da277ecf1cb687d2304672f0ea1576b98841b0b2bc01bbe70b68056e93a5f6d56e9f63b6
 MISC metadata.xml 871 BLAKE2B ffd6aeebf603ed90bfa4cc34d557e947e435d204c84e062532cedecd3e811710d9bd39f9f43dd70afd575104be5661b5f7e7de3f79365a961d45f61835a602c6 SHA512 3ca0916252061c1705d194066a30a8fc19cfe4341911646b7ed797e131e02f40eeddc91c2449a5b049888be749d16a5103e70678e5d6c1604db0ac3fe9f4e0d7
diff --git a/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild b/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild
new file mode 100644
index 000000000000..a6919631d7f1
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/Icinga/icinga2/commit/8cde21ddfd66a0fcfac704544a0fd7990cfc94ec.patch -> ${P}-9092.patch"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.66.0:=[context]
+	console? ( dev-libs/libedit )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl:=
+	acct-user/icinga
+	acct-group/icinga
+	acct-group/icingacmd"
+BDEPEND="
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+	# https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
+	"${DISTDIR}/${P}-9092.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DICINGA2_RUNDIR=/run
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+		-DUSE_SYSTEMD=$(usex systemd)
+		-DLOGROTATE_HAS_SU=ON
+		-DICINGA2_LTO_BUILD=$(usex lto)
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres)
+			-DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+	if use mysql || use mariadb; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/run" || die "failed to remove /run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}
diff --git a/net-analyzer/ipcad/Manifest b/net-analyzer/ipcad/Manifest
index f477635d65d8..cc72a7f54b23 100644
--- a/net-analyzer/ipcad/Manifest
+++ b/net-analyzer/ipcad/Manifest
@@ -4,5 +4,5 @@ AUX ipcad-3.7.3-signal_h.patch 480 BLAKE2B 01aaca726279c0b16da451cfb880e27a2569a
 AUX ipcad.conf.d 320 BLAKE2B a2a71e5ac427cc9b37521c3369f48197f6d08ce1ef23f8f96f38906e015f9bb50e689e9ff259d2a1e35335dd4e885d1e11beafff6c2aef60ad7eafb1b45949a5 SHA512 bfe0c3b988cbe1442c5637728ef2f51e58cb8f8d6752a94eb9ce42ec1ba4a1ed7129c65e11971ab227901a91e23872eb38ee47ff1bb539b04948d91d227a8944
 AUX ipcad.init 818 BLAKE2B 22a4c75a552f148bc0ffffbf2c8d4cef2a07259fadafa8d9c7b7ac83ed40873c4b9e0b3a74234860685991b0e99e8c4dde750d36b0ae37d217ae0b93bb3186d1 SHA512 638c527ea723cd1cbadf24dcafe84803575251ee465b8e0cdf4a3a8e76302190694f75153ef33086fdf47a17be335d136b9fc38dc962fbeb143c784d1e2caa3a
 DIST ipcad-3.7.3.tar.gz 172457 BLAKE2B 900f71fae715b4a18ae9d4f0aacc2eaf2cf08f727460c6a1d3baf0d3622f19c042387272a7e943ec08933ad79a05f426d21496e32e42322ae6f16558b9c3a2a2 SHA512 a25a2551bd88727c20f969b780e09d2776bf1fe4f684b0a7a6e571bb7b5684743ade0571b7993849b65c58def4550aa88bcb52a91d5cc6c21e562627fb3b80b6
-EBUILD ipcad-3.7.3.ebuild 1134 BLAKE2B bbedfaba2eb1d2e65540fdab1da6053866621d8fb05d324a94ffa398101f7211cba46b3465fa0efdae48175c359b4ce77d48c3256d81e9be158a554491046a34 SHA512 21c43f8be9c5242a1a4c8b622db2d8681c408d31a7c86055853351359ff4e80e5ce6469dc6b1c79a365a2be7c8e11fb2d235d8f9d27ad6e7c92c1a04ea3330bd
+EBUILD ipcad-3.7.3.ebuild 1132 BLAKE2B 43f0408e1f2041ee413cca0de72422fd55c2390890298c5d70c3c860bdf5235e1fce31d8b86394b38cb7eee99f00e7a605a07605dc96bf442b20f415ce4912a0 SHA512 7f064ebc537782418ac6b2b66fae20c0b0f56c151931d281be65a8434b7f75f8bd7bbc7a12f4127fa72ce0e6953228b9d59d007a0c337cd5d563fafa5b48fc22
 MISC metadata.xml 356 BLAKE2B fdd92848081bd4f33800bb1ef8fb006e4519973e15e9a515d7bdfdd0ab356b8948327971734c236fc391223f33376509a7a6957ab22817df44b1f0a1165c447e SHA512 fa6cee2b15f79867e30523210811d2394185720723778010e9cc130b56441ead7bd8c32d2759a6f83404157f26b58ee588b613033b7feed36712d5f033065b42
diff --git a/net-analyzer/ipcad/ipcad-3.7.3.ebuild b/net-analyzer/ipcad/ipcad-3.7.3.ebuild
index bc87f905d363..7c8d36c02083 100644
--- a/net-analyzer/ipcad/ipcad-3.7.3.ebuild
+++ b/net-analyzer/ipcad/ipcad-3.7.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit autotools epatch
+inherit autotools
 
 DESCRIPTION="IP Cisco Accounting Daemon"
 HOMEPAGE="https://sourceforge.net/projects/ipcad/ http://lionet.info/ipcad/"
@@ -19,11 +19,14 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.7-linux-2.6.27.patch
+	"${FILESDIR}"/${PN}-3.7-linux-2.6.35.patch
+	"${FILESDIR}"/${P}-signal_h.patch
+)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.7-linux-2.6.27.patch \
-		"${FILESDIR}"/${PN}-3.7-linux-2.6.35.patch \
-		"${FILESDIR}"/${P}-signal_h.patch
+	default
 
 	sed -i \
 		-e "s|^chroot = /adm/tmp;|chroot = /var/ipcad;|" \
diff --git a/net-analyzer/ipv6toolkit/Manifest b/net-analyzer/ipv6toolkit/Manifest
index b0d51e4c4d05..a33b61a879b6 100644
--- a/net-analyzer/ipv6toolkit/Manifest
+++ b/net-analyzer/ipv6toolkit/Manifest
@@ -1,4 +1,4 @@
 DIST ipv6toolkit-2.1_p20200412.tar.gz 987247 BLAKE2B 7fcb07c0cbb22e377618f62b69a16e4a5aeda3b3ebc32bd216cf9fa3beb2d8775cec6543482609361bb23304e3284e770ae82ada053fb172c432adfe360e09ba SHA512 480245e4f5ed31d6de726467ab8e1726285ccc7eeb6c84bd75caf62af35409ebf5ea63a29567200b387592317a5d5989c76ad38d3f0842ebdf5392f28e81be9f
-EBUILD ipv6toolkit-2.1_p20200412.ebuild 1158 BLAKE2B 69d0efa873b40f8a7fc99712e0016430c66e4645cdcba74f59279045f692e5e8e4c06545a364b32e11326949d300dc349bf596ff5e7d22a5e6da4951673da226 SHA512 bd1b16447f98146e93ec9735c01fd6b63232b82fb8eade13ab472d5ecd75a4a9b3a72ce91af0a24b33e5d47fc09539bcdd6ac0ac398bcb515c45b3f99ff4345a
-EBUILD ipv6toolkit-99999999.ebuild 1029 BLAKE2B da79779c2bb84b817aa197e86931e8fdc8a14597916a867bd01cc211b770425e485bfb19f28345a85a62b60e8bea8f5c2065c26b5e89699d67e306f5746d2a3c SHA512 376b1b2b881e0285f084b8edad8f4aefc83683d3f4c947e3ca4ada0518bc9291ed8f09bc3bbd275e27f32532857ef33ae2006277c6341adf800a5471274d39c1
+EBUILD ipv6toolkit-2.1_p20200412-r1.ebuild 1012 BLAKE2B 1a0319bac28e17163bac42e43ae460d6293f7c09edb34b49f8c9e2639be6c63fdf5d46edfb3727cb67596d37420ddfee0d7e3eb8f545d3f5030dc8151aae060e SHA512 a609584063f4ca1ee3a9a26939b1400010a91f8b0e56bcf52edbd30741aa00cc2abb5141dc7316b1810b51be1a7fc504fa47bdd9fb6719aecd0d6ee9ca669184
+EBUILD ipv6toolkit-99999999.ebuild 883 BLAKE2B bbd8f3401f03f5b62f10e39c080c8bafdd606a9ba9e48e1109d6b424e64a378c9a783cc86b96c8f0430de71f585d1a02a5972c42e37e152ac57a17f5e3796d3d SHA512 4f732cf3be9ed616d0be0b35c83bbe60bd5dcd30acdbe091c471a73b00446c9dd222bf9b8fb1e2aa1dcac7f45f5f5b0eb7f056a61124030a107dd0686717bf89
 MISC metadata.xml 363 BLAKE2B 7f21a55a7ad34ab0f3ec1ace13f8587a2953d92f38472103a3e719bc0eccf76611875ab8840724dea5be0b6429d1a7a980a87556a5f41d8a4ae6c1978523900e SHA512 b87dddd052f2ea042bf918df0808eb4b3892e511361027878fe774b71ca2b687771dd74bd8ec7dc51ef24d2a8e4a3d486ef45c8f1480f06cacd1ed770c319a58
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild
index 2d692fb0ea06..afe8e856acea 100644
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,27 +19,22 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	sys-apps/hwids
+	sys-apps/hwdata
 "
 
-HWIDS_OUI_PATH=/usr/share/misc/oui.txt
-
 src_prepare() {
 	default
-	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
-		manuals/ipv6toolkit.conf.5
 }
+
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX="${EPREFIX}/usr"
+	sed -i -e "s:ipv6toolkit/oui.txt:hwdata/oui.txt:" data/ipv6toolkit.conf manuals/ipv6toolkit.conf.5 || die
 }
 
 src_install() {
 	dodir /etc
-	emake install DESTDIR="${ED}" PREFIX=/usr
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
 	#remove the included oui file
-	rm -f "${D}"/usr/share/ipv6toolkit/oui.txt
-	#fix the conf file to use the one from sys-apps/hwids
-	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
-		"${ED}"/etc/ipv6toolkit.conf
+	rm "${ED}"/usr/share/ipv6toolkit/oui.txt || die
 	dodoc CHANGES.TXT README.TXT
 }
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild
index 8a862e677183..78d911dcf494 100644
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,27 +17,22 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	sys-apps/hwids
+	sys-apps/hwdata
 "
 
-HWIDS_OUI_PATH=/usr/share/misc/oui.txt
-
 src_prepare() {
 	default
-	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
-		manuals/ipv6toolkit.conf.5
 }
+
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX="${EPREFIX}/usr"
+	sed -i -e "s:ipv6toolkit/oui.txt:hwdata/oui.txt:" data/ipv6toolkit.conf manuals/ipv6toolkit.conf.5 || die
 }
 
 src_install() {
 	dodir /etc
-	emake install DESTDIR="${ED}" PREFIX=/usr
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
 	#remove the included oui file
-	rm -f "${D}"/usr/share/ipv6toolkit/oui.txt
-	#fix the conf file to use the one from sys-apps/hwids
-	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
-		"${ED}"/etc/ipv6toolkit.conf
+	rm "${ED}"/usr/share/ipv6toolkit/oui.txt || die
 	dodoc CHANGES.TXT README.TXT
 }
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index d645c5531979..06ee7657b85a 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,7 +1,7 @@
 AUX logrotate.d-munin.3 678 BLAKE2B 56c5e73e775c51898290707f324a305aa024ac732994b7e8ac2213a29740f481012d6433a6e72879524fbb3f958420919441265b0b5943b022267d47ca847640 SHA512 77853b9f0465da10e1844e25225350b7351126b19ee4caaad168b7b27003bca65bf34176293c610d5a4cb790a4a5d380fab482844ab23d6063208b2ce0fe1349
 AUX munin-1.3.2-plugins.conf 1760 BLAKE2B 97d853698470c35dd4bc305a559be6b1160a6877e557f6146eeddaf7d91f72c7ade36e1f5571c5ad742560a2f5f400fc51b481ee7ce305db9546af6b211046ac SHA512 c3498c4364cedd27016562568f918995be92dd6b3c2735ddd008190de0a729f8ea59e61f8517f6f48beaad14edb349af7476a39f55d246ab06d6cbe91679565f
 AUX munin-async.service 201 BLAKE2B 2de35c4577d097525b75fb812042627702e846daf908b8deeaf9980c76b31135d5ea906b0932dfe3b4d589e3c635e37e8198cf2b6e9d60cdc305eb499815266f SHA512 55a99866cb9ff50723a223b8a45b418f13ed754b6ca919260af8312a323aad432aca047724a5e32f6aee2f8f541ae829bf6bfdf19d22e7543ef2e5a7b9cd9d6a
-AUX munin-asyncd.init.2 452 BLAKE2B 3f368195aa6896a726068b9db0ce0d1fc5750fee69a4ca5b60bfc2897486625cb83dab1ceec5cd6c1cf4d4aa0fc517eb0e41548004254abc8ad25657b0bfd422 SHA512 5d2ca928ea953e5fec8451dca218165f2c058c6d57519fea65e94148c0dff5ca0a06a2a22b09f416e375e825463d4d2a7c1a424c60051fdb4fa0d79af9463c26
+AUX munin-asyncd.init.2 432 BLAKE2B db8951dba2369c5a7e2906547597de202a35354131950e6cdf216ea1f18bd50c29388ec05742e19c7ca87ac9ae5090ce1b5261955610b426bd5482035b000918 SHA512 eb1d2efc60fc79820fbfe29c81dad27c9685f6ff936216950edff767a3743e9affd5165bf69da5c6ef8b493678bfe641577bf087485a2225e8102739eecc767d
 AUX munin-graph.service 208 BLAKE2B 0234016852b69c645ee7184fb373dd5435a111f52e44b2c0e0c716a39e8356717042ffde25d9292c396b410f563af5894f8a78bd1baafb43e25c2d5257c9bcdc SHA512 3c0ea1cbcaacca02d2e36dbe0dbf02a553ce899db253510a17cbdd1a21275556101117f5d2701bd5519a8813c9ae022465c7fe89fa6000c857ca09c6aed6989c
 AUX munin-graph.socket 131 BLAKE2B 9cf26e00b84131ac634776e67ed58776144e913fdef5eddcf38adb873ed088221155d7c756cee529d90a414aa7b248d4f781c59a956eae7e3398f45d2a72faa4 SHA512 b63bc777330b5beafedcaf759d6de1809b0daaea2a811b2138a7bbd0afec7f3f03204674be00d0aae845f30cb09b5d0fb72c46a77be0f6746d6f7dcea061c3ef
 AUX munin-html.service 205 BLAKE2B 9a731ab89402169c4886cff22a8b866bedd3566c851c9d6224f960f5b843955082a2df2ad263468bfd2f17f9b66921b8c92f6fe5dca5504920932e136754a0e4 SHA512 dde77279c0804d7cb83333dafbb2afe5c5231c25fc6c3ce31d0a6711325643ee6a9fc44b1a62accd9cec8bc12077e562adfcf2efbe2667b25ff72145fe1cc472
@@ -11,11 +11,8 @@ AUX munin-node_conf.d_1.4.6-r2 188 BLAKE2B 419e475fb422a74d1c094145c25b7ad371e10
 AUX munin-node_init.d_2.0.19 598 BLAKE2B a6442b2873a01d3846ae502314bbdee4ac08ce94ee1dd9e2ca9dc15ba322b531fe4564a76e5cd6526b5b1be5bf06e31ca6c108e8e9f05c89d718c7531ef18a5f SHA512 c2429156972e6db9c75160dcb3419ea67a59801a70e4a13a07899ebea84db079d1efcbeb653e2abea3212fa7cfb96a35ff020daf4918d8fe2839b670ea63b31b
 AUX munin.apache.include 604 BLAKE2B 796293be594baefca293b6cc5f5d6f31c9ab28ecaa209c776aced2d2a0916ff4b61c195393f19355a6460bf2bde8baf41892e4f41905332996afde32e99397ea SHA512 de4797ccac5c9299dd55140300276f746febf3ac5bfebfc48901ca71fa0e035017917eba054b251cc2383c65f1e209e244906b34eebad237f43a7bd7171f6087
 AUX munin.apache.include-2.4 577 BLAKE2B efd0a424cb058b77aa19d6384fac085345f789264b19d878126ca826eda84e79714741529218d9715ba51e175cb1628839e1ca09733f67b370b2401e019c9351 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4
-DIST munin-2.0.66-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
-DIST munin-2.0.66.tar.gz 2257034 BLAKE2B b0c5412f32a54857acbe4baa5cf1447c7cf7053cad79ac09216ddc1aa8696ced813c3ad373517a8a48c5a08fae76154a0dda069efc036b7773e0557f078f8ff2 SHA512 928f727c558db6699524f3f3c2822404638e10e95678f4f211ec445ad6fbbdb7685a3d28343dbce616f60ced3cabff3b44e21a0a0e84b1d05032d295b81afab0
 DIST munin-2.0.67-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.67.tar.gz 2258670 BLAKE2B 374b336403433d612b7998c77e6eb4f0eb68ffda4204ae6bc3c303f7667154c2ce606ffa27226c5644f3e6f71655c939b749da925136f59be4762891af49e2b1 SHA512 a8381491dfa15572438d9acda7a09feb0c3918ebe49e7bcfce5c172b36b4a5a0472bd6d06f5fad41270af0510b3fe115509d146f372df7fa47ed4aa1ec5f95d4
-EBUILD munin-2.0.66-r3.ebuild 12294 BLAKE2B 38acab7fb05b587bde64f914c8b0260297bbda56101fbca4dde767b4f7c5c7a9218d7aa5201294c1ab993215fbd0d67241099fcc2b3210f1f2a296dc3724ee7b SHA512 95a026d0ad372c7e77fa05c236af93e4d6563a586dda018929fdee212023d24f137fcbb33ef46344905e4d3b6cee5a2cc19931bea259576794f6371434905aa0
-EBUILD munin-2.0.67-r6.ebuild 12296 BLAKE2B 55e6ebc6ac0986714302310dd3590e9c0307dcd4fba115b25f3eeb129b33a369a7e3dc723bca9a442c151e3d1fb57580c0bc091a13d75299ca5f365334174635 SHA512 ac7a188837e04d499137e8f470961255a4443d23906d19864424412b1eb162dee94c397e10fcfc1c47263459a0a238a82877a8c3f76e9e8bdf4d0b3e9ff82086
+EBUILD munin-2.0.67-r6.ebuild 12294 BLAKE2B e671fe2f048d8bc5fb25920de9cddd4fcbc8fc1f48145b50cb68c78afd7ebfe856d6e2d7ecb6ac7756aa6f599d3b555abcc07d28e2b72d2094db711515ed88f2 SHA512 0ffc4b4d8500bef896caf1574b9eb9e62bfdaf6d55fa0c660b5e66f02158b58ee65e052edd9b0773a40d7b3691cbefa710e9c1ed57a30556ebdafb8c26fbbe7c
 EBUILD munin-2.0.67-r7.ebuild 12206 BLAKE2B c5acf7bba358087ff1063db553b6583954339f610caf272cb4f5378c6be138ecc94b6cb6150c0ed600e86a5d898749b7a1b64d4f05ecc351c62bf6b3c90cf52b SHA512 156281bb0393c3316bb5a6cefd2354635caab1b028aa51e2569dda9ec475271a26bc22941b8ea396812535383dbad3965c3a49805d326a303ed3cd2d71fca8cd
 MISC metadata.xml 3933 BLAKE2B e13958d477a85e5f2327ffb529567dc129e6531a114b304d930399fe9cb81e6581f1df9d884860294984580c5b3e4335dfb623fca85e18e1de818430476eacfb SHA512 f824ef7f1a950ab81c4e3f2e81f44c6b3a49dc56a4aab977fad14e5d757875f8cb4900d8cd528c16449fafc8d08ab3792be8dc5a2a820932add7ce03ca35102c
diff --git a/net-analyzer/munin/files/munin-asyncd.init.2 b/net-analyzer/munin/files/munin-asyncd.init.2
index 59ef4c6b0280..15a17a7bef6c 100644
--- a/net-analyzer/munin/files/munin-asyncd.init.2
+++ b/net-analyzer/munin/files/munin-asyncd.init.2
@@ -1,11 +1,12 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 command=/usr/libexec/munin/munin-asyncd
 command_args="--fork"
 pidfile="/run/munin-asyncd.pid"
-start_stop_daemon_args="--background --make-pidfile --user munin-async"
+command_background="yes"
+command_user="munin-async"
 
 depend() {
 	need munin-node
diff --git a/net-analyzer/munin/munin-2.0.66-r3.ebuild b/net-analyzer/munin/munin-2.0.66-r3.ebuild
deleted file mode 100644
index 4d6837047b53..000000000000
--- a/net-analyzer/munin/munin-2.0.66-r3.ebuild
+++ /dev/null
@@ -1,418 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHSET=1
-
-inherit java-pkg-opt-2 systemd tmpfiles
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="
-	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 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 )"
-RESTRICT="!test? ( test )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
-	acct-user/munin
-	acct-user/munin-async
-	acct-group/munin
-	dev-lang/perl:=[berkdb]
-	dev-perl/DBI
-	dev-perl/Date-Manip
-	dev-perl/File-Copy-Recursive
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/Net-CIDR
-	dev-perl/Net-DNS
-	dev-perl/Net-Netmask
-	dev-perl/Net-SNMP
-	dev-perl/Net-Server[ipv6(-)?]
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	virtual/perl-Text-Balanced
-	virtual/perl-Time-HiRes
-	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-	asterisk? ( dev-perl/Net-Telnet )
-	cgi? (
-		dev-perl/FCGI
-		dev-perl/CGI-Fast
-		)
-	dhcpd? (
-		>=net-misc/dhcp-3[server]
-		dev-perl/Net-IP
-		dev-perl/HTTP-Date
-		)
-	doc? ( dev-python/sphinx )
-	http? ( dev-perl/libwww-perl )
-	irc? ( dev-perl/Net-IRC )
-	ldap? ( dev-perl/perl-ldap )
-	kernel_linux? ( sys-process/procps )
-	memcached? ( dev-perl/Cache-Memcached )
-	mysql? (
-		virtual/mysql
-		dev-perl/Cache-Cache
-		dev-perl/DBD-mysql
-		)
-	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	!minimal? (
-		dev-perl/HTML-Template
-		dev-perl/IO-Socket-INET6
-		dev-perl/URI
-		>=net-analyzer/rrdtool-1.3[graph,perl]
-		virtual/ssh
-		)
-	"
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	dev-perl/Module-Build
-	java? ( >=virtual/jdk-1.5 )
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-Exception
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/Test-MockObject
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND_COM}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.5
-			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)
-		selinux? ( sec-policy/selinux-munin )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	echo ${PV} > RELEASE || die
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	local cgiuser=$(usex apache2 apache munin)
-
-	cat >> "${S}"/Makefile.config <<- EOF || die
-	PREFIX=\$(DESTDIR)/usr
-	CONFDIR=\$(DESTDIR)/etc/munin
-	DOCDIR=${T}/useless/doc
-	MANDIR=\$(PREFIX)/share/man
-	LIBDIR=\$(PREFIX)/libexec/munin
-	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-	CGIDIR=${cgidir}
-	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-	CGIUSER=${cgiuser}
-	DBDIR=\$(DESTDIR)/var/lib/munin
-	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-	LOGDIR=\$(DESTDIR)/var/log/munin
-	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
-	JCVALID=$(usex java yes no)
-	STATEDIR=\$(DESTDIR)/run/munin
-	EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-	emake -j1
-	use doc && emake -C doc html
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	local testtargets="test-common test-node test-plugins"
-	use minimal || testtargets+=" test-master"
-
-	LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-	local dirs="
-		/var/log/munin
-		/var/lib/munin/plugin-state
-		/var/lib/munin-node/plugin-state
-		/var/www/localhost/htdocs/munin
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-	# we remove /run from the install, as it's not the package's to deal
-	# with.
-	rm -rf "${D}"/run || die
-
-	# remove the plugins for non-Gentoo package managers; use -f so that
-	# it doesn't fail when installing on non-Linux platforms.
-	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-	newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die
-	d /run/munin 0700 munin munin - -
-	EOF
-
-	systemd_dounit "${FILESDIR}"/munin-async.service
-	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-node.service
-
-	cat >> "${T}"/munin.env <<- EOF
-	CONFIG_PROTECT=/var/spool/munin-async/.ssh
-	EOF
-	newenvd "${T}"/munin.env 50munin
-
-	dodoc README ChangeLog INSTALL
-	if use doc; then
-		cd "${S}"/doc/_build/html || die
-		docinto html
-		dodoc -r *
-		cd "${S}" || die
-	fi
-
-	dodir /etc/logrotate.d/
-	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
-		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/spool/munin-async/.ssh
-	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-	fperms 0750 /var/spool/munin-async{,/.ssh}
-	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-			keepdir /var/cache/munin-cgi
-			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-			fowners $(usex apache2 apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache2; then
-				insinto /etc/apache2/vhosts.d
-				newins "${FILESDIR}"/munin.apache.include munin.include
-				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-			fi
-		else
-			sed \
-				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
-				-i "${D}"/etc/munin/munin.conf || die
-		fi
-
-		keepdir /var/lib/munin/.ssh
-		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
-		IdentityFile /var/lib/munin/.ssh/id_ecdsa
-		IdentityFile /var/lib/munin/.ssh/id_rsa
-		EOF
-
-		fowners munin:munin /var/lib/munin/.ssh/{,config}
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		dodir /usr/share/${PN}
-		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
-		# Force the shell to bash
-		SHELL=/bin/bash
-		# Mail reports to root@, not munin@
-		MAILTO=root
-
-		# This runs the munin task every 5 minutes.
-		*/5	* * * *		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#*/1 * * * *		/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#*/2 * * * *		/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#*/15 * * * *		nice /usr/libexec/munin/munin-html
-		EOF
-
-		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
-		# Mail reports to root@, not munin@, only execute one at a time
-		!mailto(root),serial(true)
-
-		# This runs the munin task every 5 minutes.
-		@ 5		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#@ 1	/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#@ 2	/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#@ 5	nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#@ 15	nice /usr/libexec/munin/munin-html
-		EOF
-
-		# remove .htaccess file
-		find "${D}" -name .htaccess -delete || die
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	ebegin "Setting up cron ..."
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa \
-		-f /var/lib/munin/.ssh/id_rsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa \
-		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-	tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf
-
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache2 apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache2; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.67-r6.ebuild b/net-analyzer/munin/munin-2.0.67-r6.ebuild
index 4edd18845a10..fe50e885c3ad 100644
--- a/net-analyzer/munin/munin-2.0.67-r6.ebuild
+++ b/net-analyzer/munin/munin-2.0.67-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 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 )"
 RESTRICT="!test? ( test )"
diff --git a/net-analyzer/nagios-check_linux_bonding/Manifest b/net-analyzer/nagios-check_linux_bonding/Manifest
index aa08d233bb05..2a99436b7364 100644
--- a/net-analyzer/nagios-check_linux_bonding/Manifest
+++ b/net-analyzer/nagios-check_linux_bonding/Manifest
@@ -1,3 +1,5 @@
+DIST check_linux_bonding-1.4.gh.tar.gz 24921 BLAKE2B ef582184471e4ca9d4b9a1d5cdee481852f1f452806ca081e04e74b7b469109f3a5998708cdb7ee6d3ffa9240cdbf721f0cbf6b3f4be2c4cc62042fce6647ccd SHA512 e8195d012a3da53983acdb8ea54d87995541e4e303dce28683ca04b6a6f84826c37db42c295b7e121092482a49268f57355284b57bb77a2212c46b834dd57088
 DIST check_linux_bonding-1.4.tar.gz 24670 BLAKE2B 6f136043fdcc74f677963ad4798ea18a8f813c3bf6cf1d00f6649d72dfc7d953c01a43bd3050758a8461f255ce3a9d3ddbdd1bcb29de316ea6438f20409ce699 SHA512 2b1e11007680accd8667ceb8710c7a7448766fd0c5aa3be60a34209f1b25892e7fecc46f9fc5e7cc0d4776f68cc17f8db8d8f2758695c82045a5832e8a4c7e81
+EBUILD nagios-check_linux_bonding-1.4-r1.ebuild 781 BLAKE2B a0bc633cf091f8cfaf90e5b1954c721bc357ae978b45027476e92f7a581e7f994bd4149d77c94f5c510daabb909a9cdb899d37a6167d1ebcd59e3632c77858ee SHA512 3e9cb89c4d0b8f150a26fc809e056e7ff4aa1d87e793da524a83b8593fef4ca2fd5b5589b203228b110adad300bf58d54c32a2162ec86e2e5752a60035e5591a
 EBUILD nagios-check_linux_bonding-1.4.ebuild 713 BLAKE2B 6abd0a186a51daaa22173147c5fdcbcbaa55cc7d78e582779f6d94d6d83123e2f86aee250fbae1ab914e820f8a0e136ce5985f4e65d848ed57b7e6a97d2f7952 SHA512 6e787e6b2ac2cae19094712b7680a7eb6323c67159e18ed73aedb279feb856d91c05c35a1efa367d0e7074cc179e4f1482f6e7ba2276a275eb1f719c026f98e3
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4-r1.ebuild b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4-r1.ebuild
new file mode 100644
index 000000000000..0dfb488a8078
--- /dev/null
+++ b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT="fde23cba225870ceb1162d918a6307c608e654a5"
+MY_P="${P/nagios-/}"
+
+DESCRIPTION="Nagios plugin to monitor bonding status of network interfaces"
+HOMEPAGE="https://github.com/glynastill/check_linux_bonding-1.4"
+SRC_URI="https://github.com/glynastill/${MY_P}/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.gh.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}-${EGIT_COMMIT}
+
+src_install() {
+	default
+
+	local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
+	dodir "${nagiosplugindir}"
+	exeinto ${nagiosplugindir}
+	doexe check_linux_bonding
+
+	dodoc CHANGES
+	doman man/check_linux_bonding.8
+}
diff --git a/net-analyzer/nagircbot/Manifest b/net-analyzer/nagircbot/Manifest
index 2c873cd1d317..b426b54ec06b 100644
--- a/net-analyzer/nagircbot/Manifest
+++ b/net-analyzer/nagircbot/Manifest
@@ -1,5 +1,5 @@
 AUX conf 125 BLAKE2B 9577a1460d92434f7ed46654557b3113ae5b592b89285e0af3cc18708cf961e6ade4633750ddff9272c31afd8f46f9c3cf71b234bc51e7f13dfb460b23d52808 SHA512 4bcf5127e8c8b8b23fc1268ee67f2bfe1f803f9ca552fd8f74dd41c2ebfdaa5f1445a51cb2c56df4f1b83059e94277ea25993dc2496266ac763b0ea30da951fc
 AUX init 435 BLAKE2B 8815caebe680209174eb693b968a44b0c376fa839db65da21bff89d67ebf38fcd6f8a8ec3a0232733feda99800cea3f4e0d574bd5d756c9b8e6c62ff1c4e4867 SHA512 5fb4711b20a85811be2932e961a5192f5f6a13311c3299c45d125bb7d7aa9fa564488085408e4ee3c4d01c7051d8ac693b1ac9555164cb635dba1562f47f1930
 DIST nagircbot-0.0.33.tgz 20085 BLAKE2B d419d1a7bcad1164c74490db4fb8a66ccbb0c9fbc761fe2807fe12d74d05297af3f307f9686971f246c9308a1f9e02c879f4461c116c68f4f403bf59c3836f63 SHA512 1e4d69cef4a425e8540ff408688cf7899c04098ec47acbd6da601f48e01f808958982e7d8a1519934bd5aa895fe0f8dedc51d80460f85097355d5bdea79fd708
-EBUILD nagircbot-0.0.33.ebuild 843 BLAKE2B 375b7acf1b17440cdf8b14a9d7ea0e0c56b4eb51cedb96be5ac86bddd5727d1c69cfe3b21dd4572ffb6c557a869e0f422649256d639d44256dfc7d5583caf727 SHA512 51f7dbb8ec387a67f4ff8331665215e2e605a243a4423a7714237037ed06e64d86f5275e67ce2df17aab89880934a7f13e974d052a3fc7bdd02bb5381ab232cb
+EBUILD nagircbot-0.0.33.ebuild 847 BLAKE2B 27f44c89cc91dcfd52586438f70b68fc8aa0391ef1474b7be9884cff2af1268e5d8029d641d1c48ab9674d5d9d0989cdb4b38b6c54541e80ac584790b644aaf6 SHA512 98a5015b735a0074b6e3578401b79d3a040642e45eb6be9e61f52f13755b359d0f08a8de9a96128fd440e94505d239267300d6a03cefb860e05d930b35294097
 MISC metadata.xml 266 BLAKE2B 13d5b21d5ecb46db5bb752f47c5474f1add347a0b8dfd57219d8dfc4d16a040926a8707515e6072a97f2dd5f5b8d1beaafd195054a2afa350c585fb28355c329 SHA512 6509a234cb18499c8c4ba2c2aa0d8cf0225bc9ca7ecf0a566127c796c038ff48633076ec44d0a62a6ee4241fb75b2ef9a12672509d08fba9f77efc74eef4a0c1
diff --git a/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild b/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild
index 69e3cf007436..74adb3d2cf47 100644
--- a/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild
+++ b/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -13,15 +13,14 @@ LICENSE="GPL-2" # GPL-2 only
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-CDEPEND="
-	dev-libs/openssl:0="
-DEPEND="virtual/pkgconfig
-	${CDEPEND}"
-RDEPEND="net-analyzer/nagios-core
-	${CDEPEND}"
+DEPEND="dev-libs/openssl:0="
+RDEPEND="${DEPEND}
+net-analyzer/nagios-core"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	cp -av Makefile{,.org}
+	default
+	cp -av Makefile{,.org} || die
 
 	sed -i Makefile \
 		-e 's:-lcrypto -lssl:$(shell ${PKG_CONFIG} --libs openssl):g' \
@@ -31,7 +30,7 @@ src_prepare() {
 
 src_compile() {
 	tc-export PKG_CONFIG
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX)
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 }
 
 src_install() {
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 395ebb62e931..aeaf4b7d52c8 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,7 +1,10 @@
 AUX nagstamon-3.0-setup.patch 1139 BLAKE2B f399c6c600785629c7c90b1de396c17805882554f3d4d9e0932cbf0c8761496cccac57b068b7a7c161bcde11223db2ed4a0c5563a15267f13d3553147044ca0f SHA512 7ec4f621e1dc91cb941811aaacb6322fee8024d39dfa65e39b3a19631a3ef7c78d4fcd4d8df5630b76904e3c415290b35ac777c4d0e863ce83e15832d061ea4d
 AUX nagstamon-3.4.1-unknown-version-id.patch 745 BLAKE2B 9e9f4619f98cfdea4a0f90fbf5d0b3c34c9e940449752110018a9b72a5817e0445f79cc30a9f720a390d40f09e0a28d491f692c6cd7515eb42f4035af54d483d SHA512 d4100c8f334309fd8711e2113c8e00d00fde124328e0ecd3c50762ff2be1b53b3832995922924170f7c695cdcfb48ba0100fda93a046ea802c56a4a917f77d43
+AUX nagstamon-3.8-setup.patch 1190 BLAKE2B 39eec86dc7fcd69d0e6ef5c3b986e1e1c3096bed7e9e60eb1b7986bd83b9542805cd78a46813ba8af566243d4890565c5670c4fa41fc209f3e261a61bc5108aa SHA512 172a11999da5aaba979c800278a2524c9f3de269f7c3b2dd994ea0f658d48ab6891723ba1e03296cbdd4f979b2ca84b391a763bf19279f22588b570be677a3c5
 DIST Nagstamon-3.4.1.tar.gz 563745 BLAKE2B 3ac35c90757eb525e7e7953f63a8798a0087470e4a94161987f3c382b6be43240aa8b5c44f279d23d841dbf9e4536f38d3f5e2f63234538a00fe6b6e0ee9c680 SHA512 68f8a7345c606b8ad4511b34e2d76383faf8831202c9429ab24eeb215073984f00f580c83a7f5e348f7d4104d3c82bd6f4661939801444e463c3fcf64c8240bd
 DIST nagstamon-3.6.0.tar.gz 573998 BLAKE2B 6cc1e7918d8a7a53255fbd1661b8a41c0f3f414341da64724e566ceb95378590ed325fea757fffcdccf33533c8e34ca235036b47323f89bfcb3d06007a0cf43e SHA512 4da9b20c518129857ff86fa4aa4aa7507fce6c5b43fc917a4b8681d36e69f267045ab35c2f6922bde55536bf55e753f61b4fc184165e2f6d9eb6cb9b00703c69
+DIST nagstamon-3.8.0.tar.gz 585689 BLAKE2B 8ab52762bac4797ded3834a94a382174855504b8e39224938f8f720a4aaaf4b3885fb487504ed09d973210b90f612852964bdcc87a6b2dc7c6b07bebfdeacffe SHA512 d34d1c52ddadbafcd583a5e61f7f305ffc8f722d8c007bbefeee6501475f01612e810154bc5815abe27e9c43e4e695a8ec189dcc5b2b487840d79f92eb3edc43
 EBUILD nagstamon-3.4.1-r1.ebuild 1511 BLAKE2B 96d5d67c73d8398fd72f1d9261cbe46d04005262ab43b7627900444520360e4c148f475908067fe26fca3cda577828ff2988db09cd42bad810e7a27b6b90255a SHA512 8079a99e4094a34723d2513a41e5ace06811e367693b31c5474cef3c38ddcfd0ab396f29cc409582c8ea10132f4f9b17106d08a140fa39fb7d8a6a270c076bd0
 EBUILD nagstamon-3.6.0.ebuild 1548 BLAKE2B 4f0922dba9329ce92b126e786b1f8ccc7d9f229b297f9e3d29049fed93c73469d6fc1ee5d69f2badecb0c11434d46a75f8153c20a043ec69504c5a0806af4ea9 SHA512 a8af930643b7dcdd166e8ee14983b05f3f9583ae62478ee9fd045056cb7dc3e8c7a3234387734d3b6ebbe84ea0a9ac8820ca4e9b136de3235ddfa1fbcf85c27c
+EBUILD nagstamon-3.8.0.ebuild 1546 BLAKE2B 996807b8963a63e0801432f375e579cdbfe12b2b7167c613ff1f437d164fe0eb8c688adad82cef578281e73d8a1bc633d75826c531c2b7c3cc7439b6afeb4848 SHA512 1e51786b9917716a712bfb0c19a4c484bf9f05eff59614f79fddbc880e243ffc38cab5a724fe7e5815fa8e60e508c658556b6cf7d9ff41019a6444691b0b2aab
 MISC metadata.xml 640 BLAKE2B 34b93a2ef41d53a41934b76630930a01821fc4bf45c4a2ef8474cc65dec4e7d4327b391982284b5d3a9b94175f664960440fb563a3aad253a58d800066f610c1 SHA512 d9c9307d3754bc9766e70ec595c32325708f8807e309f2aacaac69c2b4f0cd9d37e49fb912901046c6da7da8aa8b76b1c1ddd2342ecfa2c973adc26fa703daa1
diff --git a/net-analyzer/nagstamon/files/nagstamon-3.8-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.8-setup.patch
new file mode 100644
index 000000000000..637ef0c25616
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-3.8-setup.patch
@@ -0,0 +1,28 @@
+diff --git a/setup.py b/setup.py
+index 267ced2..538c5bb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -37,7 +37,7 @@ if OS not in ['Windows', 'Darwin']:
+     NAME = NAME.lower()
+ VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION
+ 
+-NAGSTAMON_SCRIPT = 'nagstamon.py'
++NAGSTAMON_SCRIPT = 'nagstamon'
+ 
+ # workaround to get directory of Qt5 plugins to add missing 'mediaservice' folder needed for audio on OSX and Windows
+ from PyQt5 import QtCore
+@@ -130,13 +130,8 @@ setup(name=NAME,
+       packages=['Nagstamon',
+                 'Nagstamon.QUI',
+                 'Nagstamon.Servers',
+                 'Nagstamon.Servers.Alertmanager',
+-                'Nagstamon.thirdparty',
+-                'Nagstamon.thirdparty.Xlib',
+-                'Nagstamon.thirdparty.Xlib.ext',
+-                'Nagstamon.thirdparty.Xlib.protocol',
+-                'Nagstamon.thirdparty.Xlib.support',
+-                'Nagstamon.thirdparty.Xlib.xobject'],
++                'Nagstamon.thirdparty',],
+       package_dir={'Nagstamon': 'Nagstamon'},
+       package_data={'Nagstamon': ['resources/*']},
+       data_files=[('%s/share/man/man1' % sys.prefix, ['Nagstamon/resources/nagstamon.1.gz']),
diff --git a/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild
new file mode 100644
index 000000000000..dbacd751d085
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit python-r1 distutils-r1
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_p/-}"
+
+DESCRIPTION="status monitor for the desktop"
+DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
+HOMEPAGE="https://nagstamon.de"
+SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	>=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
+	dev-python/requests-kerberos[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-3.8-setup.patch" )
+
+src_prepare() {
+	default_src_prepare
+
+	# pre-compressed already
+	rm Nagstamon/resources/nagstamon.1.gz || die
+	sed -i -e 's:\(nagstamon\.1\)\.gz:\1:' setup.py || die
+
+	mv ${PN}.py ${PN} || die
+
+	rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+}
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index 54281d557339..703d9c695fb4 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,4 +1,4 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
-DIST NessusAgent-8.3.1-es8.x86_64.rpm 14581716 BLAKE2B 468ccc4bc41e68c0ae3b1418ab81a6405857e9fd66ecd26663f4f342b2cfdd2a119b0dfc6282c93fdefb80c7265147318b336ffa5a1fe1c126f0c088d683820f SHA512 e14838af063d9ee5c2701d2f1130bd4e28f23bdcbb865b1303906b83b2d228c34697891371ac84d2891cd10fe20aa2ea2c3735a44569657bd39ea1c82a243bb2
-EBUILD nessus-agent-bin-8.3.1.ebuild 2361 BLAKE2B 9c2eeacc92af425c8ee90c7fe7dae1d8de389aa7eecb31831abd49d6d44cd99323b08d3f84df158c4d06825ee231c55d9ff5846f26dd484a684954280d77bd92 SHA512 0f4d46b6d030b3b7847048d6e4ff2d35f766052e0051f94f7b7dd17ca699010fe8c00a7bf3a8ffad56d38a402b160eb03be1019aee10cd74de2ee60b73ec30f9
+DIST NessusAgent-10.0.0-es8.x86_64.rpm 15610556 BLAKE2B d7c2e761978998374d484aa061ed12a32a5eb1c458ebe56a1e2c27bf2777132d8aa467b9f1bee2668895f7fd1cca84ee947cd8ba8230e803168faed98c6c3005 SHA512 eadbf52e410354771aee27c6b90254727d5764404552c0d3c0326c48421fecc2ed19be8fb118bfc1784a9dbeaaa79f1d1d3e55278814bd4dcd6d3f2613996d64
+EBUILD nessus-agent-bin-10.0.0.ebuild 2361 BLAKE2B 9c2eeacc92af425c8ee90c7fe7dae1d8de389aa7eecb31831abd49d6d44cd99323b08d3f84df158c4d06825ee231c55d9ff5846f26dd484a684954280d77bd92 SHA512 0f4d46b6d030b3b7847048d6e4ff2d35f766052e0051f94f7b7dd17ca699010fe8c00a7bf3a8ffad56d38a402b160eb03be1019aee10cd74de2ee60b73ec30f9
 MISC metadata.xml 354 BLAKE2B f3d046b6610423bd40c2cdbe29c8aa35d8111c56f6565d5b84aea31e03a8612b3a173965496833ec2ad2a38412b68d39f09d389e41797a0cda399758c85034a5 SHA512 1f4021d2781ddbccbbf0bf91492b50af18f142200bfc959a36b527941b9e8452a7814e12a1f720fcc62f6d069158cdb5093ae3760bc1b3b09d2cb73e4ab7f715
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.3.1.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.0.0.ebuild
index c347d77eb5a2..c347d77eb5a2 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.3.1.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.0.0.ebuild
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index e152e1dde0fb..e225cdb1843f 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,4 +1,4 @@
 AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
-DIST Nessus-8.15.2-es8.x86_64.rpm 43867848 BLAKE2B 6292dbece6db78dd0574d0800e91f8435c31e96d0682a19256b1ec6d146bfe9090deda7e156fcaa8876e219a202bb4d3bed70e2f46836e2bb58ecc73a5d45789 SHA512 869c1f29f8d81081f56cf4a279dbe3d13e92f2cf0a6d13a26b4f264a99a442da8f4fd106397601cc8f96c79075159b6d7d2be3158977ff50db76a11dab0a5bc4
-EBUILD nessus-bin-8.15.2.ebuild 1989 BLAKE2B ac48b9a95507f50cc029de2c9e1ce018bb73f51442e459f7f8e4f4e62540b6d7a9f728534133cd748be6bde5d222494ddb7f68da506c49458dd283df8c5d9bc0 SHA512 5aa02507bf22b6fc7e23e46a1ee51886c64af45b444e5b0a71a3df74da81612b0819771e4960b4a589d4cf4ad719e4edeff169766e1d6ea42b4d29f8bea05811
+DIST Nessus-10.0.1-es8.x86_64.rpm 46334128 BLAKE2B 3ec2a2177978bd07767c9e04c62b4c83b9050d73adbcb18d6bbcd1f60f7e489f06b2d49701a56b4c0c239d12359d63f107fc28439604e10e958f072b7ea6273e SHA512 b97e2231a5f05317416757449b3cae27efcc8ec0a7f30333268bf4dbbeaaef61d6db740a3e389ab2c34ead0eae0a19c400f9bbac26f5bd1e8380ead141e47496
+EBUILD nessus-bin-10.0.1.ebuild 1989 BLAKE2B ac48b9a95507f50cc029de2c9e1ce018bb73f51442e459f7f8e4f4e62540b6d7a9f728534133cd748be6bde5d222494ddb7f68da506c49458dd283df8c5d9bc0 SHA512 5aa02507bf22b6fc7e23e46a1ee51886c64af45b444e5b0a71a3df74da81612b0819771e4960b4a589d4cf4ad719e4edeff169766e1d6ea42b4d29f8bea05811
 MISC metadata.xml 346 BLAKE2B 5e72f68ab557c56cc09cedcaaa9760f3619723bd6fc58b8ecc921526b1b42b6b65e971876ec569c1e68a26e55def24767c5d896fd9eb6a706041b485a8885023 SHA512 ab7e122c344a3f5078b2d497ed36a63f6af74fcfa7f2b98d6299ec7c82e7cbaf427da8fa595e6445e49ee041114ac581fb5b1d703f16fc70a54ee98375062e82
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.15.2.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.0.1.ebuild
index 6620c073f75f..6620c073f75f 100644
--- a/net-analyzer/nessus-bin/nessus-bin-8.15.2.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-10.0.1.ebuild
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index c324cf818f62..0c3f8b88179b 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -4,6 +4,7 @@ DIST netdata-1.29.2.tar.gz 6234502 BLAKE2B b34314114c41e1fd80cfb1c495f34b2dbcc54
 DIST netdata-1.29.3.tar.gz 6234406 BLAKE2B 975b27e8cb66c174d7cf01de0e5b76d57b0eac8005d5da19aa308df530edd8fcacc97b1ba5956ac38ffb9fcd55b2c58f4a1dec3bc691a5b898e886de19b365df SHA512 67e661328d76b3b9d4837e5acae16937300f1b91bc37bafc3ee606aeda88d2775c606126b9f072c682a1b24f5610b7993fedb808fd9032b240702d12cf063b54
 DIST netdata-1.30.1.tar.gz 7153879 BLAKE2B 68553c000ee3a63cbd79cce5fe4daf75239cd76572160e1903f8325548d0cc4222f0c5e43f1488c31087b40de5222115bbe491cc00e36aea331992fc87b9f1ec SHA512 c3d116bf3459ca6224f5cd8341933c2696581178262a37887c532e09e98e5d075217fcd66574e00cc644fc16ec583b7e2fe54be95c98c477fb20fbe7ad9ed1a9
 DIST netdata-1.31.0.tar.gz 12528280 BLAKE2B 739538b26a07f9f607a2f63f50225ce6ea50feaae8bbb2a60e6a2548ebdf36e4bd37f28d43d414cac44eec4ad9459f40e9532ac61f62f947bd0bd61e64803114 SHA512 62deba75e41fca44015a4e36b6791f7f10ea0a2658bcbd640e231abbbdbf56c7317c9fa72218fbd22a3312b33e7ec7886ea254cba331da9b3a51923e45393576
+DIST netdata-1.32.0.tar.gz 22486361 BLAKE2B 45959a367301a9c2b1e77c2cec33063728356095394a0c3241f669f4b0da61ad55a782dbcddbaa52d1bc7e8870ae971f431341678e2fbe4c6e30893774a9503d SHA512 b90e61b76aae8eb4922ff920434b4c454314fe11438c21565ec186a2ccd116161e6830b5093108625517bbce567e9ab87428044e610bc5c9cd4c9d3d4b59c3fa
 EBUILD netdata-1.29.0.ebuild 3390 BLAKE2B d07855d29c4dd438dcb86c9aca06063ce4207f9ff3c23eb9f8261833b0789935a2f0cd1f3d2e11240c32254325a5161dda00876826afcae5a85f3f2f0ffc6094 SHA512 0cda9b196543f54982f93fdee46f38caa3d9149d20b1443a0a7aee81201d8bb9d52c06a1d4a77b2b72c0b3333a6ca74bd269c9f91b4d2ac2e5082aeba426f1f7
 EBUILD netdata-1.29.1.ebuild 3390 BLAKE2B d07855d29c4dd438dcb86c9aca06063ce4207f9ff3c23eb9f8261833b0789935a2f0cd1f3d2e11240c32254325a5161dda00876826afcae5a85f3f2f0ffc6094 SHA512 0cda9b196543f54982f93fdee46f38caa3d9149d20b1443a0a7aee81201d8bb9d52c06a1d4a77b2b72c0b3333a6ca74bd269c9f91b4d2ac2e5082aeba426f1f7
 EBUILD netdata-1.29.2.ebuild 3390 BLAKE2B d07855d29c4dd438dcb86c9aca06063ce4207f9ff3c23eb9f8261833b0789935a2f0cd1f3d2e11240c32254325a5161dda00876826afcae5a85f3f2f0ffc6094 SHA512 0cda9b196543f54982f93fdee46f38caa3d9149d20b1443a0a7aee81201d8bb9d52c06a1d4a77b2b72c0b3333a6ca74bd269c9f91b4d2ac2e5082aeba426f1f7
@@ -12,5 +13,6 @@ EBUILD netdata-1.30.1-r1.ebuild 3456 BLAKE2B a11fb3094aea689d1b3e637967c6ef8e31f
 EBUILD netdata-1.31.0-r1.ebuild 3560 BLAKE2B a9e13b381407f3dcfe7838edaeb5b9ae8395e7f901d44c5d53f7d8f3645e347d73acc9b9108f23b61eba7240fae3879be5b031a0cc1f270bac7a6057be0ec934 SHA512 5a329c86ab57e02f109483477244d4a114eb9625788c856f7efd70c63ceeeb430be009b7689c318601b58c57fdb1451436f1838056bee1cdcf6b8aa47b38ea95
 EBUILD netdata-1.31.0-r2.ebuild 3663 BLAKE2B 5ba967aea9b55f5078aa87ef87014a43f2e4f63840b8b3dbf10b79d23c2641b15964cea501df6cf1131ed5cdcf5915541da58bc04b4998b5d8dddd583ff73966 SHA512 ef1ef8ddef62a215c2014498ca595231c26e1bb06ac1848cdfb47587e9a3512e2af22cc88bca2a51ed2043861e03ddf665411407746d06801142e3bfa7efe11d
 EBUILD netdata-1.31.0.ebuild 3463 BLAKE2B 1d037e46b9e988c5c6db463f28b28f7ffef76628b85340fefb1f2f6307edaea3a7362e857fd92a54defdca5203a6bf57e59e596d2f33ffb12fea13cab60c45b2 SHA512 44eca85269f4d4335873640d9367ab56670ddb11fe2ba5a0ce2e013f620a275782cb2c9ccb6f0ec6bc7cafb061aeb39f8bd03a001f44d96b36c0fd3bb635e928
+EBUILD netdata-1.32.0.ebuild 3663 BLAKE2B 5ba967aea9b55f5078aa87ef87014a43f2e4f63840b8b3dbf10b79d23c2641b15964cea501df6cf1131ed5cdcf5915541da58bc04b4998b5d8dddd583ff73966 SHA512 ef1ef8ddef62a215c2014498ca595231c26e1bb06ac1848cdfb47587e9a3512e2af22cc88bca2a51ed2043861e03ddf665411407746d06801142e3bfa7efe11d
 EBUILD netdata-9999.ebuild 3663 BLAKE2B 5ba967aea9b55f5078aa87ef87014a43f2e4f63840b8b3dbf10b79d23c2641b15964cea501df6cf1131ed5cdcf5915541da58bc04b4998b5d8dddd583ff73966 SHA512 ef1ef8ddef62a215c2014498ca595231c26e1bb06ac1848cdfb47587e9a3512e2af22cc88bca2a51ed2043861e03ddf665411407746d06801142e3bfa7efe11d
 MISC metadata.xml 1289 BLAKE2B 8c18928662fdfb9166a3dd147b73206d41b6038268121b23b464f5e8ff8cacf929ac6374aa8b54b63281599be21dd92c352ac229a0e0ff180a57b86faf020ea2 SHA512 e3a344e81572b366848b51022febaeb9f9f5df3555343757061370dc42757817b4b77de85a4f0efb6b52032461cb97edd4b9d41b44b9cec7681b06448f706484
diff --git a/net-analyzer/netdata/netdata-1.32.0.ebuild b/net-analyzer/netdata/netdata-1.32.0.ebuild
new file mode 100644
index 000000000000..d1b0ffa89e2f
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.32.0.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_8,3_9} )
+
+inherit autotools fcaps linux-info python-single-r1 systemd
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-libs/libwebsockets
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	dev-libs/libuv
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	jsonc? ( dev-libs/json-c:= )
+	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		dev-libs/protobuf:=
+		app-arch/snappy
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		$(use_enable cloud) \
+		$(use_with cloud aclk-ng) \
+		$(use_enable jsonc) \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable kinesis backend-kinesis) \
+		$(use_enable lto lto) \
+		$(use_enable mongodb backend-mongodb) \
+		$(use_enable prometheus backend-prometheus-remote-write) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_compile() {
+	emake clean
+	default
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+	fowners -Rc netdata:netdata /var/lib/netdata
+
+	fowners -Rc root:netdata /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use nfacct ; then
+		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
+	fi
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+
+	if use ipmi ; then
+	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
+	fi
+}
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 9a0116f0f37b..b3a18f6772b3 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -19,6 +19,6 @@ DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb
 DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
 EBUILD nmap-7.80-r2.ebuild 3302 BLAKE2B 1067cf3f8cfc655936e8326cb74adbb27c86fa2a4b64a964a68442beb8c496adc968fcfdbd991f90d54e62f7004ac6876a85194c9a198b99fdb515f8b812f9d6 SHA512 5547b397864ba934196705250f714e6bcc7a10613745cef95dff817acde8386627ad494da7748f5e1d0a66e8e74727632f61840253e95d5a191ea2ab16df77ca
 EBUILD nmap-7.91-r2.ebuild 3235 BLAKE2B ee342955c8d38eb326b5de456c986eb7be3da4998333ee085a3600d497ab7f7dfdb630f750184de0f15989a276a7d7c2ec886f27b2c980af0d10d2fd54f56e0c SHA512 1b6124c5f6b1e58cea5834e3662d985343101a3f1bed150f4ca321cfbcd1290f6c91801ba2360552b480874c0193c0f93dc682dc490ce393602ed2af5bd3aa6f
-EBUILD nmap-7.92.ebuild 3177 BLAKE2B 46763833cb3b3c578f27476fd2bc93a9cfa41d500099f5f10e6971a4dbb3826b7e2046f457141abb72574d63520819dec0f7e220036fa4104d78b092d4d9b890 SHA512 f26f4841a5e5f7838eb06699982bbf72468a129d44ec9ff62bea18c8a674fe788fd8a82cf85d6b400e4f23d1fc639a710cafdab8d38878a1df04db87d38abd1e
-EBUILD nmap-9999.ebuild 3222 BLAKE2B fde1fd8e24e9f912f02b16bd92aaa5f4981114cdbf300a657eb6e3ce60e463cfff45f82bd9755481c884db0534823f1f43a758e9243a31cd8193b3b569fc9558 SHA512 e65d00ee53d629596e0255471a200ea5ed1ea70be1840e6ece49b2d475342226e814aaa5f51fad32b35dbbaf003b5a789f5d42436fdaa8e73b087a907a771362
+EBUILD nmap-7.92.ebuild 3173 BLAKE2B c544828871eda5b71909c77efadfe48398ff3f1221f408311ace6cec1bf4fa1cafa53dafae9ceddbc6f91bca8e445071b062cd08b347e17fd2834e9e10db87b9 SHA512 b664dd7f90db0505a35beee5874f1468f73ca9dd3a5a2b1d5e69dc5e5dab668ff8fc1ed27172fcda11ba3096d73aeb163b06760f1c462473c7fb5b53cfa85668
+EBUILD nmap-9999.ebuild 3218 BLAKE2B b59927ba96e976a85f28526f15c4453daf0b8976f8882aa0e5f197e0897d541e3208daab4bd9f8c14d9f73e34a12705b1c5dd43c235210a284f34b1e3aea09da SHA512 a2844c0303768c0658897cdcdffbedc2bcdce868807f86a73ec046e9cfb92c04b3b8eb05f1d2ceb69a4ec5c6b00c167f3407e2080b40b87f3ce9018c9332ff44
 MISC metadata.xml 980 BLAKE2B 846ba0a3b3f6da9185f8d8ef3a30e76ffa84da73a3714724493359729af26790cdbe7148058a45d289dbedade8a55ef5608c334c6bfb4cbc61b5ae4db15ef31e SHA512 40bf1717c4f450cf0221c6760b03d33282fb500f29afe0bbf72977d0010dfd57e8a0e07ae67e5ee8ebc671f5ad502722ca0b068a527f98e9506be869a603b074
diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index ab5c1cca1c67..b24708e3ba63 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -121,7 +121,7 @@ src_compile() {
 }
 
 src_install() {
-	LC_ALL=C emake -j1 \
+	LC_ALL=C emake \
 		DESTDIR="${D}" \
 		STRIP=: \
 		nmapdatadir="${EPREFIX}"/usr/share/nmap \
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 58f0f67de1fa..996ba7b0df85 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -122,7 +122,7 @@ src_compile() {
 }
 
 src_install() {
-	LC_ALL=C emake -j1 \
+	LC_ALL=C emake \
 		DESTDIR="${D}" \
 		STRIP=: \
 		nmapdatadir="${EPREFIX}"/usr/share/nmap \
diff --git a/net-analyzer/quidscor/Manifest b/net-analyzer/quidscor/Manifest
deleted file mode 100644
index 3f0c23babe4b..000000000000
--- a/net-analyzer/quidscor/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX quidscor-1.2.48-curl-types.h.patch 226 BLAKE2B e569686e8c61152c3d2488718ea04838e3f7e4a8098ed6a3ed3f72c8d958b7add36b88223456dd0d4f5d29643b8cd7d012542948d082fb6192000b3f6b8af62b SHA512 05034662e86afee3f33639c906485f65bcf7c020dab63ec467fcbcbfe7802b9459a5b34324019ebe46e04beb2a3706e45853f6a4e80e1b092c9926ffce1a7541
-AUX quidscor-1.2.48-paths.patch 1170 BLAKE2B 26c7b2d329bca3c08bc5cabc6e51709d8af669cad635fff10072d39b732554bcf39dce8a8d158bd357d768f0086ddc8358304d24a13221e0aa821a4fd762e1d1 SHA512 b96b376b9645b7d10860a8f0228c827c400c09e7d1a6e087d10ac093e26311b4beb82457456dd8575f597594153ba0a1f0f63cc1517b3faf0d32d095b87c7adb
-AUX quidscor-1.2.48-strip.patch 225 BLAKE2B fbcae9a756e57ba64b99d5e60dd00e44fdff44fca0ce215811a2d7e8d7d24e1d362020c17cdb5ff2b655509e1edbe31aaf1a19a4f62d4f269366fb1339c3b447 SHA512 aa74a95847acf7064cdd264da611f7d63b84f2c8d60f48facc77b0100a89412f93f9630841afd944681a780ff4a0f44526730fd30c860a60869e4869bf597965
-DIST quidscor-1.2.48-src.tar.gz 77843 BLAKE2B 4f9feffb67acc8f32c4f922ce882a0799549ecce8e439dffeee5d0e4ec967739646a0ee4912a189e99c9f39743a74ae1f5528050daa82689f35ba498b2bad87f SHA512 8272a1a4ed406d3429f0438dabddd15092be0a33a8fce3c5b0af0ae13422c8918f1a5971b2c2ea639fb87ffdeb1bc89085f07f89856e732f0b270b57eabb7010
-EBUILD quidscor-1.2.48-r1.ebuild 978 BLAKE2B 47d15bb48fb06869c3cab09e5a0f8a5fcadcc95561c9574e1c48d3fe73d78f800c94134ffeb8091ea777a8246eba24901865eb08ae663837fab5b78cbfb1a001 SHA512 35b0512d93ada9b291d3232307550bed46ec3181887d36267dd3084218cb3c6d1c81b3848a30e46ebe47f7b33f27cf61d1bda6a7b2590a8d3474dd0913f5c95a
-MISC metadata.xml 359 BLAKE2B 9de0e2d01ad18f8137a637ed55f532b2dded2dea661b1221bc3958c4ef7d6df01b98abcb275848a859b4e3a6d6e743a879b0b349c077da92481e2eeffb686fba SHA512 a6c10c2e43ab0b92735ddc5fafd59c4f6ab3011bddeb7914c42956b26f1491e14620c9c2979868497531649ac422ac6ddf737177bf415f28bf84afc4b98a0fa6
diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch
deleted file mode 100644
index 5f1e035c81d6..000000000000
--- a/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libqg/libqg.h
-+++ b/libqg/libqg.h
-@@ -38,7 +38,6 @@
- #include <arpa/inet.h>
- #include <dirent.h>
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <string.h>
- #include <strings.h>
- #include <libxml/xmlmemory.h>
diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch
deleted file mode 100644
index 6168720cbdf4..000000000000
--- a/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/quidscor.conf
-+++ b/quidscor.conf
-@@ -15,9 +15,9 @@
- # Logdir: directory
- LOGDIR /var/log/quidscor/
- # Cachedir: directory
--CACHEDIR /var/run/quidscor/cache/
-+CACHEDIR /var/lib/quidscor
- # Rulesdir: directory where .rules (for snort) live (.lib for dragon)
--RULESDIR /usr/local/etc/snort-rules
-+RULESDIR /etc/snort/rules
- # Expiretime: time_in_seconds
- EXPIRETIME 86400
- # File for custom mapping (must be absolute path)
---- a/quidscor.h
-+++ b/quidscor.h
-@@ -85,7 +85,7 @@
- #define AL_UNVER                "alerts_unknown.log" 
- 
- // Directories
--#define CACHE_DIR               "run/quidscor/cache/"
-+#define CACHE_DIR               "/lib/quidscor"
- #define LOG_DIR                 "log/quidscor/"
- #define CREATE_MOD              0700
- #define MOD_PID                 0640
---- a/Makefile
-+++ b/Makefile
-@@ -84,8 +84,7 @@
- 
- install:
- 	install -d -m 0700 $(IVARPREFIX)/log/$(PNAME)/
--	install -d -m 0700 $(IVARPREFIX)/run/$(PNAME)/
--	install -d -m 0700 $(IVARPREFIX)/run/$(PNAME)/cache/
-+	install -d -m 0700 $(IVARPREFIX)/lib/$(PNAME)/
- 	install -d -m 0755 $(IPREFIX)/sbin/
- 	install -m 0755 $(PNAME) $(IPREFIX)/sbin/$(PNAME)
- 	install -d -m 0755 $(IPREFIX)/etc/
diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch
deleted file mode 100644
index 9d169e619c0b..000000000000
--- a/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -69,7 +69,6 @@
- 
- $(PNAME): $(PNAME).debug	 
- 	$(CP) $(PNAME).debug $@
--	$(STRIP) $@	 
- 
- $(PNAME).debug: libqg/libqg.a $(OFILES) Makefile
- 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OFILES) $(LIBS)
diff --git a/net-analyzer/quidscor/metadata.xml b/net-analyzer/quidscor/metadata.xml
deleted file mode 100644
index 3d6e480239d4..000000000000
--- a/net-analyzer/quidscor/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">quidscor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild b/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild
deleted file mode 100644
index 15a6af1294c1..000000000000
--- a/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch toolchain-funcs
-
-DESCRIPTION="Qualys IDS Correlation Daemon"
-HOMEPAGE="http://quidscor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quidscor/${P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-DEPEND="
-	>=dev-libs/libxml2-2.4
-	>=net-misc/curl-7.10
-	>=net-analyzer/snort-2.0
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-curl-types.h.patch \
-		"${FILESDIR}"/${P}-paths.patch \
-		"${FILESDIR}"/${P}-strip.patch
-
-	#yes, the fix below is as pathetic as it seems
-	echo "#define FALSE 0" >> libqg/libqg.h || die
-	echo "#define TRUE 1" >> libqg/libqg.h || die
-}
-
-src_compile() {
-	emake EXTRA_CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake PREFIX=/usr STAGING_PREFIX="${D}" install
-	dodoc ChangeLog FAQ MANIFEST README TODO
-
-	# fix ugly install
-	cd "${D}"/usr || die
-	mv etc .. || die
-	rm -r doc || die
-}
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 578d65378422..7de4563a3920 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,12 +1,4 @@
 DIST sslscan-2.0.10.tar.gz 110417 BLAKE2B 88c095096dd615b13e3c68e6ece7eff8588e7debe65c5c6b228392d78c806029a2bc18a6c42bee480e2bb669b39753b39de160917eafbb654f5d8b64ba50d309 SHA512 d6adc76579dd99648359e9694b615bf1d9be90d71736e49305fefa0c0e1e386af2457c534136d8da2219c080b1119873f54a4cdf1b82675f0ce24f4e6ae068ee
-DIST sslscan-2.0.6.tar.gz 109597 BLAKE2B 30c0dc329d252fbb91800e470cad84214fbe30694c33fa388040838da24ca73b0857f19603ca7e71dc84fe4ca10977b2d4c0145a752718225f5225540184dee5 SHA512 2f7236f101e1ab75a6fb2efc8fed2949a410b4c67156e88865724e0f399a6e749218253d49c122f1e046022634ef62dcc2b4f97833fd33f90a3ba5a2b7e06c6c
-DIST sslscan-2.0.8.tar.gz 109713 BLAKE2B 3c28eda337145556a968be66bb7924f95cd7ad8eb9bab04531cad7d3a274f5e337804d3223903369df63c97884b6373f0b207e3691857a6b65591e7d067f51dc SHA512 5260e8da881b7757d69b1f8a9640a9c1593c6537a9f66e9250c9183697e7768488d24bab1eef713a1907a773689587bd1b2856caebe6d8df3cf509273a2cf7fd
-DIST sslscan-2.0.9.tar.gz 109501 BLAKE2B a979d6da6fee9e206ce2676aeceaa224affd26b216a67caabe8ba5ec3959b0aa27e005ad79f067bee5c4801d292a35ce4fc061a94f58125437e64bbe8ef2c2d8 SHA512 968b55ec34320784983cfddc796fb798871534c5561661b1691dc3516537763fdb0541c2f89fae1ef1dd586b213d743f01e1b040907434191713af981a2fc495
-DIST sslscan-OpenSSL_1_1_1h.tar.gz 9985614 BLAKE2B 78f8bcf04a5a03636efe4ea2f82cfbbf6528ed1b02f64b7b7cf773809f5bed11974fd6d2f9f9bddb7fc31e986997f0987a0a773da2bd10b842f3ace977c5c56a SHA512 619dc7b28151571e4410844263a6727c9883701c11a064a2df55368659a63d548179165c9b96910b0e739cec1142f109eae9503b688cbade7abd6b4f3a7563aa
-DIST sslscan-OpenSSL_1_1_1j.tar.gz 9994760 BLAKE2B 749886716739dcb909bd79b29cf714640b64039917f64f6cfc4bee9861e797380d0df9ff11d7f6bb084508b322cb0db4ef7a2f871ee304548ec919d387cdb2c5 SHA512 f94ef129514e69b70f800a599ae726eff6a2fac0dfa8e42982973d1328f6fac6b1da1124e1a7b8aa3d579b720ecf9c71a8bae45db6b1630c052b0c3a22b9360e
 DIST sslscan-OpenSSL_1_1_1k.tar.gz 9996510 BLAKE2B 755bbdfa5738e2f2d0a72b0e01861acb2df33f499e140b46a40562b0d6035992f5aae084c480d9fe4e82e4a4f74929e686c31b04f126859375357a0f9c207b5b SHA512 b963e24f598d4c95455733a1b06f73b802ccf18c3a4aa8e1436ef597aba3daa6020d032051439b35f72bd566e9e62d24aaacce770567e2b9e5c82958698d3d97
-EBUILD sslscan-2.0.10.ebuild 985 BLAKE2B 03b334c4b0dff0ec57f2d37f5c659ed190b9dc8da0d171e6d83ba3700e1bb1e960a6d2178d4b5cbd4fcd382dd61dc4889c7b5d5b823c88b998027cd34aeba774 SHA512 0e0a7a9de0bb42598130ead2ec982c331d08daa4cfec1142c9158c9928fcf33e6c367b89e888df103c0acc66faf837f0bb7769c9f948b029d534e1654e494659
-EBUILD sslscan-2.0.6.ebuild 983 BLAKE2B e77a70c644b03756523a436f7db37b79c486bfb23bbacd8392e59706f8fa351e8142c30f5136338112ea0aa52292c8289f0cb9bb4c8b6449a084429ee9934a3b SHA512 7371a4939df9f33352baf7c8916b76fd57749c6b6f928aab74e098a6ae4f827e279f759c398f3296983c5cf701a6a6499d9a1f85a6349cb47066508d3d2ef7f2
-EBUILD sslscan-2.0.8.ebuild 985 BLAKE2B 9149d38f1bfe75175a85e5ec04a1f3e64f2d111784b91e4fd04076b7ea6a6ba9ff062582c14301aadfa567c0b65901ce222108e72732d18d9ff27d1abd1a4d40 SHA512 45e47a2dc0d68bcc7ec26242c8250957c40da6845af8ec984ede6cb5689122a2e315c71f2bf3afe4520ed31791dba7bdafdcf0e39ac67b7a67c466393eddc8a1
-EBUILD sslscan-2.0.9.ebuild 985 BLAKE2B 03b334c4b0dff0ec57f2d37f5c659ed190b9dc8da0d171e6d83ba3700e1bb1e960a6d2178d4b5cbd4fcd382dd61dc4889c7b5d5b823c88b998027cd34aeba774 SHA512 0e0a7a9de0bb42598130ead2ec982c331d08daa4cfec1142c9158c9928fcf33e6c367b89e888df103c0acc66faf837f0bb7769c9f948b029d534e1654e494659
+EBUILD sslscan-2.0.10.ebuild 983 BLAKE2B 8b6e43d3730bb5e65816b674d7c003ff65b1371384e6d9cb8894fcefcaa888e27ff9bb9ec301ed91f220c51e046f4bd26c32935d853816680844c5563329b6b4 SHA512 769b197f27f6054f219e8730a68d901692c60a99c2ee44662f7b6b57f7935cb459a799479eac9fde86cd331ee44df28ba79c9bd4ca6bbe90717da81cf3b5bd00
 MISC metadata.xml 296 BLAKE2B b16b4e5a187d36ca8495bd63c691f67ae420fcc4cc742cdd8e477534edbe36414cef5eaa60eca31bdb62b9fbd7a6922754ea0d3d2adeb6d0d4181fefcbe3cb81 SHA512 650f60a88d140869a64a7287d094832e0e553f5d0093d248c3b94f9f3565bed26784ba2e6629128b602c3fcb56496fc4a92d1cd5148acf3b00b72aae22f16780
diff --git a/net-analyzer/sslscan/sslscan-2.0.10.ebuild b/net-analyzer/sslscan/sslscan-2.0.10.ebuild
index 01672701213e..a404662eae73 100644
--- a/net-analyzer/sslscan/sslscan-2.0.10.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Requires a docker environment
 RESTRICT="test"
diff --git a/net-analyzer/sslscan/sslscan-2.0.6.ebuild b/net-analyzer/sslscan/sslscan-2.0.6.ebuild
deleted file mode 100644
index 0cade5bca7fd..000000000000
--- a/net-analyzer/sslscan/sslscan-2.0.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# sslscan builds against a static openssl library to allow weak ciphers
-# to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h"
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
-		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Requires a docker environment
-RESTRICT="test"
-
-# S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
-	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
-	touch .openssl_is_fresh || die
-	sed -i -e '/openssl\/.git/,/fi/d' \
-		-e '/openssl test/d' Makefile || die
-
-	default
-}
-
-src_compile() {
-	emake static
-}
-
-src_install() {
-	DESTDIR="${D}" emake install
-
-	dodoc Changelog README.md
-}
diff --git a/net-analyzer/sslscan/sslscan-2.0.8.ebuild b/net-analyzer/sslscan/sslscan-2.0.8.ebuild
deleted file mode 100644
index d7a03ebe0b4d..000000000000
--- a/net-analyzer/sslscan/sslscan-2.0.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# sslscan builds against a static openssl library to allow weak ciphers
-# to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="OpenSSL_1_1_1j"
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
-		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Requires a docker environment
-RESTRICT="test"
-
-# S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
-	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
-	touch .openssl_is_fresh || die
-	sed -i -e '/openssl\/.git/,/fi/d' \
-		-e '/openssl test/d' Makefile || die
-
-	default
-}
-
-src_compile() {
-	emake static
-}
-
-src_install() {
-	DESTDIR="${D}" emake install
-
-	dodoc Changelog README.md
-}
diff --git a/net-analyzer/sslscan/sslscan-2.0.9.ebuild b/net-analyzer/sslscan/sslscan-2.0.9.ebuild
deleted file mode 100644
index 01672701213e..000000000000
--- a/net-analyzer/sslscan/sslscan-2.0.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# sslscan builds against a static openssl library to allow weak ciphers
-# to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="OpenSSL_1_1_1k"
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
-		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Requires a docker environment
-RESTRICT="test"
-
-# S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
-	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
-	touch .openssl_is_fresh || die
-	sed -i -e '/openssl\/.git/,/fi/d' \
-		-e '/openssl test/d' Makefile || die
-
-	default
-}
-
-src_compile() {
-	emake static
-}
-
-src_install() {
-	DESTDIR="${D}" emake install
-
-	dodoc Changelog README.md
-}
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index ad923f89b54d..4afc17b882c0 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -7,8 +7,8 @@ AUX suricata-5.0.7_configure-no-hyperscan-automagic.patch 739 BLAKE2B 38e73c88d8
 AUX suricata-6.0.0_default-config.patch 833 BLAKE2B a8a63f838452531feb9f1b69e9756c0385338f4a1b8f6c36b22052cc7f8a41cd07e31b882e2e89402c5eb43e599390cf6922f9dcfc869416d57aa3426516f8f9 SHA512 8edff1be84dbe29a140889040a7d9310ee8dc5ab82cf9ff64298ecfab07a75853caa7ac907cf191a62a1c2de9833311fd090eb2f82c9d3745b5f3fc01adf6efd
 AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee3538bd7f0deb9d76bb8552761b4666a3ac80673fe31ffd95424f2ff71e35db0f5fe6667b32478fab4c4 SHA512 4e4e87735731fd0e18ab26e536e7904833a19ce8785ffdd15b22d494673c73044137908feee74800486960f9efd09d1ddc2c75a490a2e35ef06caf23c7439a0c
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
-DIST suricata-5.0.7.tar.gz 29211384 BLAKE2B 939e672d9df61863c7adcc4bf52f5620e3760f0d6178362828474b1a72c4e3a69bf1ab52a3220c0069ae5a545c56307553c2796166af488a72a25dddd68782a8 SHA512 dce3929c796e04778eb9437bd4c7203aa9dae56be0baa4b7d986d3eedff3bfc71aa2886ecdeed9d87ec3d88cd3060ff8ef01540d15eb857698a2c4696da5899c
-DIST suricata-6.0.3.tar.gz 32421197 BLAKE2B c1b339823f2caab73aeb82f96fb703834cd3ca9f0f60662cf340cbc36734aea47106d49869bd70cf3acb419e954ca37bcd22ad1b2d789597bf36f8fe7ceebe11 SHA512 186b871959988ca7cbd0d69e725aed18af915f93363c7ecc0ffa20d8ad8f50a326be08452d085772b1df84ef25258ef0dd6b35d41b0988cb1c653e60aeb103a2
-EBUILD suricata-5.0.7-r2.ebuild 6470 BLAKE2B 08fb2adebf4d1dc11a22f04002d75c846e8f26f44ae76431e5bcea09098734b4bb5d2d5accc8421fd40047bbb5726bd91f9e3e507c35adff8a1218592463e717 SHA512 aeeb96b5a8355530f7d592a1daa1dcb0fc1fd7f47b10a004395c763639a14f18b1705c80fdd51f0761ab96b42586010f8b0fcee383245bfe3905eaa677220cf4
-EBUILD suricata-6.0.3-r2.ebuild 6753 BLAKE2B dd6b148a12687c0f400625ccb4e3606e874642bf0836e7d3216e5858bd6a83d7390fd796fc46f574ab4dc833dc9c29c9ce951c5909eb9fb414088f66b2aac32e SHA512 f78de6e2aca5034e9d4486df037c9400bf373f39184fe2842bd061f42864d7a5df9478a7171bb861c9817f6be11b06d64781182e08b2df72cf9bcfedf0f4815f
+DIST suricata-5.0.8.tar.gz 29272209 BLAKE2B 5c13aea176b6666477c620d1ed294310ee84ec706abbc740a23d66722297c09b61f253bbe17700cd58f8ce439987c9b13f312aba37d911b6522e4848e7c1b0cd SHA512 a3b355f158f72ed7b43304069ed81b1ebcb331a9fc3e7cfd2e4d04e33369cec1f654f80a2d3df86af74b631235c49068ff992c8715fe868e5ae6b5aff5642891
+DIST suricata-6.0.4.tar.gz 32498036 BLAKE2B 083c08ab0878352c425e18184c07866640e5cbe4838749eeb934857bfb486e4b78e7f9ac724289e8ea30b33fe637484cc6da7bc78231e5419b747e22e5a9b6dc SHA512 8dccea669e50758def06fe3f3e8d5048d76b27a80b5f96a7b56d2ab6e4da358d8b17ec2d764e1b53cc6a1334ee0b14191cc80f5dcf18cc4d804d5c530290adf0
+EBUILD suricata-5.0.8.ebuild 6470 BLAKE2B 61b6abe7e46fbeba700ffcdb5fed0a855668377f82db62af921e4916df736000af667c1f6ce0501049d2c7ef26edb336cf9741988a9a3d9299cf39802578dbc7 SHA512 c58a9bb5dace45513e3d3ad54b90651a469bfa6bf3f998e9f03a77151f007ae2bea827e2d52e2d3c0eee3235074ce765a516814604f421862842b5b5c0af466f
+EBUILD suricata-6.0.4.ebuild 6753 BLAKE2B e0601f29118510ec9898143bb6de877e893f93c8d5804624002683688c297da06e77d0cf7be409a4960210339b16b83e12e96d08a120bce2a354bd4e236daf3b SHA512 3555390ba0d41787111a3e870764ed2eff82bc4d5b1a5743f6f1caebc26903f16b8ef8bb912f89d2cdd797fab72c7362443775ccd6047a26ad5350412f934516
 MISC metadata.xml 1047 BLAKE2B 8418aaa86ecf0e2baaf3f927c764dd8f0471f29c0b691ec3baac6988291e9e591ea4263b89a4a25b44cc2642d58bbffcfa5fdecd628ea101e4dd3d67e1914515 SHA512 1e6e38f2d0cd4335e274ab1ac72a445a3bfdd7a5c028d06a387e0f879cf7859681856ff03986816d5dae1ac841958652003b5c8057187885c579a695f8bc11cd
diff --git a/net-analyzer/suricata/suricata-5.0.7-r2.ebuild b/net-analyzer/suricata/suricata-5.0.8.ebuild
index 8fb9132b46eb..ed531092db95 100644
--- a/net-analyzer/suricata/suricata-5.0.7-r2.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.8.ebuild
@@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
-	>=net-libs/libhtp-0.5.38
+	>=net-libs/libhtp-0.5.39
 	net-libs/libpcap
 	sys-apps/file
 	sys-libs/libcap-ng
diff --git a/net-analyzer/suricata/suricata-6.0.3-r2.ebuild b/net-analyzer/suricata/suricata-6.0.4.ebuild
index d8e374f6afc6..398159ce0adf 100644
--- a/net-analyzer/suricata/suricata-6.0.3-r2.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.4.ebuild
@@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
-	>=net-libs/libhtp-0.5.38
+	>=net-libs/libhtp-0.5.39
 	net-libs/libpcap
 	sys-apps/file
 	sys-libs/libcap-ng
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index cb22a53cf3fd..b68a1f5c2af5 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,5 +1,5 @@
 DIST testssl-3.0.5.tar.gz 9224554 BLAKE2B fed4f02f4c5db3975f711e5e1fa0f0018b5e89f8a3afbd94763ec86dc4f739ee25504769b61fc1dd0000ce7ce400f4d3267116cd21d14b003d9b6fd5706a84cb SHA512 0f3fa081f047bf2d3fb2f3b65fcdbec976af54143a2d8ffbece6eff7545cc2a6e134247f9533fb1614d52d900fc66d7f50c97f02678b5dfb9842c3c69c0f81f0
 DIST testssl-3.0.6.tar.gz 9217988 BLAKE2B 840eb0027f6b3e9ae919c9d8765c138a10ef9789e14dadc7d1e6e27fef2e906e8182309b2ef504312fc7577fc84b25d4efa59121c4c641a6bbaf91ab14259f18 SHA512 a118cd3e6d8e560f6c739356551091e6186e87bdaec24c8bc987c3503b5c22276f69a5fafc1f73cfd65528844ca7c37f3ee473cfb1de0646067ee0a48089eb26
-EBUILD testssl-3.0.5.ebuild 1509 BLAKE2B caec077df5630d62cc64069c759898b011766bff45caa68a37d791fcd81a0bd8928311d7d22191b2f13e6ad27be2ba982580e8736379d56299fe46a4af9c022d SHA512 29cbeebce5e934054f8458c6d87288e2ef940b03f7c185c8ef35b4be2f28291d7c152b04b1213f37f5d23530ffb3cfff7cfd24deaa8b0f425c3471e132d75a31
-EBUILD testssl-3.0.6.ebuild 1512 BLAKE2B 4535ab40f5061b3d196429a7625b3fe92f6ff64bd9e1889eab7928cc27d545afb2ccafbfbd0f96388054cee4aae517c3ff003bdeb75cdb568dd3eae55777df7e SHA512 2d4b9b6fd3bb1c722b17bde4fab45723e4ab3516ce8b94f392464401e0256e9854e9d692c06bd80d9ff25742a932e04bbcecdf12396c535ca87578dac2c1f6f1
+EBUILD testssl-3.0.5.ebuild 1508 BLAKE2B afa8231522f3c74583cf7797859ef851eee280702d7d5c642188add2114e2ead7d653e1837f0f973ec77861be077f11ead26a05bd0743e7e8a13a4adf3e998f5 SHA512 8f60fce722b2dc13c5c1079f7434c55fa497261bae039bcceba1ba728c0c39910c87a174f2b58a68be1fc6013c9eeb926ddf208dfc432338f1062323e7a81359
+EBUILD testssl-3.0.6.ebuild 1511 BLAKE2B 327260cf8374e38b0296e34b277f430f0bcf9b175e746e83077712b2d0e4329c2863b1d8594f364d3c039180256dec33651c44a2e2da93366d422748e2dc136d SHA512 56aba1c500c354280909770470b9bb1528dace03ef1862e94e28c2a7762fb749044fbf8a2f5f75e43a088dabaf0153322262978e5de20668cea6f5914368f5ef
 MISC metadata.xml 428 BLAKE2B 70142594046143c3a60e555b8e6dd361257c2bcafe57f98562735201a2da4eb2fe56531e9dcb3428259e99809c136732848b48a898ad5c30f6fb84486b40bede SHA512 1eeeda8d3017eaf49471766ae67550453b8097868115d1a247cb4a18bd67df88e78115aaeffbae7c9ce2da139be8eb0cc87d8561534dc8f1192a950580e7cd93
diff --git a/net-analyzer/testssl/testssl-3.0.5.ebuild b/net-analyzer/testssl/testssl-3.0.5.ebuild
index dc84aed1c822..dadf1b91fe8a 100644
--- a/net-analyzer/testssl/testssl-3.0.5.ebuild
+++ b/net-analyzer/testssl/testssl-3.0.5.ebuild
@@ -37,7 +37,7 @@ QA_PREBUILT="opt/${PN}/*"
 pkg_setup() {
 	if use amd64; then
 		if use kerberos; then
-			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5"
+			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb"
 		else
 			BUNDLED_OPENSSL="openssl.Linux.x86_64"
 		fi
diff --git a/net-analyzer/testssl/testssl-3.0.6.ebuild b/net-analyzer/testssl/testssl-3.0.6.ebuild
index b55c96e8e4ed..1e810aacaae1 100644
--- a/net-analyzer/testssl/testssl-3.0.6.ebuild
+++ b/net-analyzer/testssl/testssl-3.0.6.ebuild
@@ -37,7 +37,7 @@ QA_PREBUILT="opt/${PN}/*"
 pkg_setup() {
 	if use amd64; then
 		if use kerberos; then
-			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5"
+			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb"
 		else
 			BUNDLED_OPENSSL="openssl.Linux.x86_64"
 		fi
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 1c2e73bb8aa0..f5330d3f1101 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,11 +1,15 @@
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
 AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
+DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B fe2ececd4a02530176725d62524fe000816f7f12dd58082d4966dfe7e5e0b90be669ed216c5a664f6496e74cb5dc5e4fb5beeaf513570ae503e3181692635563 SHA512 8a57d5279e9f3821b6ba3dceba89ad77fa8d0cf8cf421eab4d32e039497b429444c147b31abebd65b11b0b3ff73cf10d484480bcf0aedb206011819df8ab0257
 DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5 SHA512 26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
 DIST wireshark-3.4.8.tar.xz 32314976 BLAKE2B bdd70b77b2582339fc563c91596b0419789f08c6a9e4895910cc703ba5726229acceeccdcf41b3c5831df711f3d635217f123759b86055d1b03742afed7c68e5 SHA512 962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8
 DIST wireshark-3.4.9.tar.xz 32335284 BLAKE2B 95b3e6804225af7043fa1f4e5dc53785d939b56c81983a010a579c61b10eed989e695601c7ac67eb3aa00f9314236dd03e1e9ebb35c17ca81b832bad654523de SHA512 479abcf7b44504a269b73201da5aabac0d7770cd779a325df3214b6df5dc37e175f2889165a933c2902001a06c8141768f35cd8ca35cc55fc6cf30a482ea27eb
+DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B 17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7 SHA512 7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
+EBUILD wireshark-3.4.10.ebuild 7362 BLAKE2B 1aa51cc5aabda25aaba2d339d2a47e9b350addb1fdaf3be3b28d2cd920940291a7a045609f092de07934f9010cf0ee72560c97ddea07f827a274c391b27aae80 SHA512 5bb8dbb307ef8037b8c54dc6d58ce00c2093a61a5855e6b686efc08e1bd24249ed7dfef8e27dde9af2bc8d543fda0f5f9463ef84e0a8d718c1296e53bd02f0af
 EBUILD wireshark-3.4.7-r1.ebuild 7218 BLAKE2B 455d0e7f02eeacc08e69f0fd9783ccb72268904f87588a9196ed5b8b6cc813a81b5ec7da2bccb253c3c938462082e3457dde1c3bf44b99c18c7688f914f3acf4 SHA512 a90633a35895f79526a6d56380fc4930159a0e2c315b8f4fed800a8dd707fc377350311b64cb251d9591983b3d864d546eb1c7076bcc5c6f28053cb7e15bc0d6
 EBUILD wireshark-3.4.8.ebuild 7266 BLAKE2B a25fc049d2b849bc87b8e2237a79c1d26a9ce29f39429a9fc7d1f50a2f4248a3c245dd7ceee36cf508a35789becb91faaac9cd74418e9ffa8413b0bda7bd0be4 SHA512 ce1533bd0618150d5640d35cd6711c5c596ef839c8f63b610d3a493d2e2c80ef70ad7320897c213d3879cb2df72f1fbb665054c6bcb6960ee67d608efc113283
-EBUILD wireshark-3.4.9.ebuild 7271 BLAKE2B 3251502459142ab9115b5c3d8a598c61a1a3adad28ad9ace5ec1911e33b9022df22b790eb79973b1d6b0cad6f1c203f17698266d0ce0a1e2552bd322fb8a8a2e SHA512 2db3952ce3bfb7c21cd9fdd5d0530a4b34d21129a246d3b4c45e63622690b538888965eeadc4071842bc46a5282166ee8360638f032966ade6ed2bc3ac8943f5
-EBUILD wireshark-9999.ebuild 7271 BLAKE2B 3251502459142ab9115b5c3d8a598c61a1a3adad28ad9ace5ec1911e33b9022df22b790eb79973b1d6b0cad6f1c203f17698266d0ce0a1e2552bd322fb8a8a2e SHA512 2db3952ce3bfb7c21cd9fdd5d0530a4b34d21129a246d3b4c45e63622690b538888965eeadc4071842bc46a5282166ee8360638f032966ade6ed2bc3ac8943f5
+EBUILD wireshark-3.4.9.ebuild 7266 BLAKE2B a25fc049d2b849bc87b8e2237a79c1d26a9ce29f39429a9fc7d1f50a2f4248a3c245dd7ceee36cf508a35789becb91faaac9cd74418e9ffa8413b0bda7bd0be4 SHA512 ce1533bd0618150d5640d35cd6711c5c596ef839c8f63b610d3a493d2e2c80ef70ad7320897c213d3879cb2df72f1fbb665054c6bcb6960ee67d608efc113283
+EBUILD wireshark-3.6.0-r1.ebuild 7258 BLAKE2B 7965cbdbb122ba5a0ce3c27fc9fa86e084280d3a60e2f04997d7db87fd4bdcd9454d96693891d300a5b6a7a07ca3a58df29f4cc7dafc7705770f78cf9a3b9a38 SHA512 48534b6a1111d27a670a051fc25b3a019ebae54d571695bf1017df6d20de288e017564723528c5b8ee410b155c32cedbb7e0073828b5c6935f21c78181eabbfb
+EBUILD wireshark-9999.ebuild 7258 BLAKE2B 7965cbdbb122ba5a0ce3c27fc9fa86e084280d3a60e2f04997d7db87fd4bdcd9454d96693891d300a5b6a7a07ca3a58df29f4cc7dafc7705770f78cf9a3b9a38 SHA512 48534b6a1111d27a670a051fc25b3a019ebae54d571695bf1017df6d20de288e017564723528c5b8ee410b155c32cedbb7e0073828b5c6935f21c78181eabbfb
 MISC metadata.xml 5328 BLAKE2B a030872929b89f0ead3794d8bbff20354b3a1b7a35aa7c3ce37baf5170ced9d39bdc665bd23e03e70d94550085a88224ec6cd260679b2d01501b272c595442d0 SHA512 cbadc90c858ef008b763253ef548e3634643b98bf90069b3fa34bd4f947d93ee8d4a2f3c6d9c7fe4c93b4169e34681e00905b28e64f8edcff02f23867d75b265
diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
new file mode 100644
index 000000000000..6380c0c2f9ab
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
+	inherit git-r3
+else
+	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+	S="${WORKDIR}/${P/_/}"
+
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
+
+RESTRICT="!test? ( test )"
+
+# bug #753062 for speexdsp
+CDEPEND="
+	acct-group/pcap
+	>=dev-libs/glib-2.32:2
+	>=net-dns/c-ares-1.5:=
+	dev-libs/libgcrypt:=
+	media-libs/speexdsp
+	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli:= )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2:= )
+	ilbc? ( media-libs/libilbc )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( ${LUA_DEPS} )
+	lz4? ( app-arch/lz4:= )
+	maxminddb? ( dev-libs/libmaxminddb:= )
+	minizip? ( sys-libs/zlib[minizip] )
+	netlink? ( dev-libs/libnl:3 )
+	opus? ( media-libs/opus )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd:= )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	test? (
+		dev-python/pytest
+		dev-python/pytest-xdist
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	plugin-ifdemo? ( plugins )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+	"${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_BROTLI=$(usex brotli)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_ILBC=$(usex ilbc)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LTO=$(usex lto)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_OPUS=$(usex opus)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test-programs
+
+	myctestargs=(
+		--disable-capture
+		--skip-missing-programs=all
+		--verbose
+
+		# Skip known failing tests
+		-E "(suite_decryption|suite_extcaps|suite_nameres)"
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+
+	for dir in "${dirs[@]}" ; do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking
+	# in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if [[ -d "${ED}"/usr/share/appdata ]]; then
+		rm -r "${ED}"/usr/share/appdata || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g pcap -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the pcap group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-3.4.9.ebuild b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
index 4871d3fcafeb..68cb4ab7a929 100644
--- a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
new file mode 100644
index 000000000000..145ec1e5d572
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
+	inherit git-r3
+else
+	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+	S="${WORKDIR}/${P/_/}"
+
+	# Seems to break libvirt?
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
+
+RESTRICT="!test? ( test )"
+
+# bug #753062 for speexdsp
+CDEPEND="
+	acct-group/pcap
+	>=dev-libs/glib-2.32:2
+	>=net-dns/c-ares-1.5:=
+	dev-libs/libgcrypt:=
+	media-libs/speexdsp
+	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli:= )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2:= )
+	ilbc? ( media-libs/libilbc )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( ${LUA_DEPS} )
+	lz4? ( app-arch/lz4:= )
+	maxminddb? ( dev-libs/libmaxminddb:= )
+	minizip? ( sys-libs/zlib[minizip] )
+	netlink? ( dev-libs/libnl:3 )
+	opus? ( media-libs/opus )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd:= )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	test? (
+		dev-python/pytest
+		dev-python/pytest-xdist
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	plugin-ifdemo? ( plugins )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_BROTLI=$(usex brotli)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_ILBC=$(usex ilbc)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LTO=$(usex lto)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_OPUS=$(usex opus)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test-programs
+
+	myctestargs=(
+		--disable-capture
+		--skip-missing-programs=all
+		--verbose
+
+		# Skip known failing tests
+		-E "(suite_decryption|suite_extcaps|suite_nameres)"
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h
+
+	# If trying to remove this, try build e.g. libvirt first!
+	# At last check, Fedora is still doing this too.
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		wiretap
+		wsutil
+		wsutil/wmem
+	)
+
+	for dir in "${dirs[@]}" ; do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	if use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if [[ -d "${ED}"/usr/share/appdata ]]; then
+		rm -r "${ED}"/usr/share/appdata || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g pcap -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the pcap group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 4871d3fcafeb..145ec1e5d572 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
 
@@ -18,7 +18,8 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+	# Seems to break libvirt?
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -29,6 +30,8 @@ IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +rand
 IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
 IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
+RESTRICT="!test? ( test )"
+
 # bug #753062 for speexdsp
 CDEPEND="
 	acct-group/pcap
@@ -102,12 +105,9 @@ REQUIRED_USE="
 	plugin-ifdemo? ( plugins )
 "
 
-RESTRICT="test"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-	"${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
 )
 
 pkg_setup() {
@@ -200,6 +200,9 @@ src_test() {
 		--disable-capture
 		--skip-missing-programs=all
 		--verbose
+
+		# Skip known failing tests
+		-E "(suite_decryption|suite_extcaps|suite_nameres)"
 	)
 
 	cmake_src_test
@@ -214,17 +217,19 @@ src_install() {
 	# install headers
 	insinto /usr/include/wireshark
 	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+		"${BUILD_DIR}"/config.h
 
+	# If trying to remove this, try build e.g. libvirt first!
+	# At last check, Fedora is still doing this too.
 	local dir dirs=(
 		epan
 		epan/crypt
 		epan/dfilter
 		epan/dissectors
 		epan/ftypes
-		epan/wmem
 		wiretap
 		wsutil
+		wsutil/wmem
 	)
 
 	for dir in "${dirs[@]}" ; do
@@ -232,11 +237,6 @@ src_install() {
 		doins ${dir}/*.h
 	done
 
-	#with the above this really shouldn't be needed, but things may be looking
-	# in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
 	if use qt5; then
 		local s
 		for s in 16 32 48 64 128 256 512 1024; do
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 70be3fd65295..f3b0d29d8d3f 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -11,6 +11,7 @@ AUX zabbix-jmx-proxy.init 849 BLAKE2B 14a312911a11d765210f3bd86d38c8ce3a2f230c82
 AUX zabbix-proxy.init 487 BLAKE2B b094521d1ec12ea27f1dec78a858ff3b78acde6a0473a2f8a53cbf46c75c3b0f72a1f44f24dc5294b7157576b06abc631dfed469dcf1a1c7b8c4609a9c81b2b8 SHA512 55f1df96d7d7e6ec16d16162e37a7a494131f4dd53d5988b28663b82a6bbe17b16e901a8f4870f14fd2e1c7dd96a84fe6aa5cd9e6a745462af7b83b3f0455839
 AUX zabbix-proxy.service 275 BLAKE2B 19b594aa010bea3320de1d90277881b0c42ae1ea7f787bd4a456d8960401b0dd0ea4bde21b683e27c84123fefd681fe4f64b81dd9771273b4b6199f4af17d045 SHA512 2522b68c725e80b98655b9ff8cfc97b51add9f095e77422a275b3a30cb34d58e107ee03fdcc293b4ef37c60bd5d9ca2271aef48b727c91da44d507a888578c18
 AUX zabbix-proxy.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
+AUX zabbix-server-r1.init 598 BLAKE2B 53026be133378595e83de14f939eda655d871f8caa524bf3c6496da77dcf4582a287e4365737317d710e8488ad93164eaffc5e5eca4d78f05cde820cc519d8c7 SHA512 c18e454b8944572af737052156c5985ebfa35504be43aad0465b4fa48108e9e60cf3a1326480762b89263df0d495fc793a45faea24de62f337ad2bcf57eb75a4
 AUX zabbix-server.init 494 BLAKE2B e58063bfdb0bcb6ea70325d31bff4ffebab2686b7063916619aaabc5b39b1ff5d960b968e382615f84b18531465cf0ad0eab5ffa171c0b4b1797e70d58ed3450 SHA512 7dd55ffe8062bee9104218bf673aeeeea56a4a332ef6a5676b83e7f026a2b6ebc70446c63d6116b684ad16abd95de355cdbdf07c81a51daf1424b3fd8d627c74
 AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2ef61de4715c25b0e0c97a627e6735a67c4114484950f0334fffa344d94f9192ada63887a21b617122eaf0d SHA512 d20fa4aa3a545d2f36388d7cac78c70c5610f5e7529348447e6fa6bacc33f42dd6e1c37c50b1c2711900a3f29bbbbb0ebc7c54f04d3de717aadad48e18c46e28
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
@@ -252,18 +253,18 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
-DIST zabbix-4.0.34.tar.gz 17614409 BLAKE2B 6e0997e232d57c638e61f2c0617b071d7c7fed5faab37fdc38adc29569f203d816cd60361c46e9f47993ecbd38f052a0378aef68f4785f7e30ae656775044730 SHA512 547df1d0ec8b0831499bb0233236ef13ab3666ef48aabccd8733d2d093f6822200c09184445001403639066e9149f5133226082078b8a818b02f4323d4e55e3b
 DIST zabbix-4.0.35.tar.gz 17619679 BLAKE2B df90b7479ebb8ad706b090e25aca59448a90dd41aca154457ce7efd46b783a6802cd64594848cb87cf93b750b162e3cebf521db226572c864604e6b0f592cac6 SHA512 ec8956a7849fd861c1f01bef476bd9db315ca4909b7224b9740055202df5e76a8fe317e916034f8bbbe7bacd7daa434ce26c0b810b1fef809927ac7afba52268
-DIST zabbix-5.0.16.tar.gz 21312183 BLAKE2B a3950f468815df34484750d4f398f161f7a35d41c2c7044181673f696c52ad0a30bec547b92cd84ad780c9eccc904c71f9858bc3e593a78a891d20217aeb051c SHA512 786b1781fe8cbe41eae11172bcaf1474d280757f9f0e278232dcc5534d69815a1c8bfdf58f1f9e2c8ebd3ccc4a75d3b16bbce3d0e87c9c9d3c5a53f75406710c
+DIST zabbix-4.0.36.tar.gz 17619115 BLAKE2B e64cc78c589cf42dd72e20be18a723fbcce8890de0ccf48d2328b744533c3a9b8d4cb7dd93b5e7b4f7f31c724b2aa797a70d5e6eb8db53ece9ad9a39edae4fb4 SHA512 39ff2a58ea189b75891bf59ebb0e4d85c97595f9754684622f4d3e3f5614ca38408ecf10e62c4055dc1bde3fbca621e41152bb7006c539fb88ca40b1969c49d2
 DIST zabbix-5.0.17.tar.gz 21326776 BLAKE2B fbf0af5bfd98c0e1a9a39799adb5ae4837278909065d4a2aef914052dd66d893063c1ea1b1c90b53833fec900e7dd0d3c3af4548cf432a488ece07a676f4eca6 SHA512 f7a23b51c3d2fb5f80ec888dc9eaf592dd13de3a61b9d065e6d54e1bb406e18ffef1b8e9d3ef516b2034d94fb7330bd80c2cb7b7d22eed7e57021bc66e1ee159
-DIST zabbix-5.4.5.tar.gz 24324118 BLAKE2B 3144b58d6dc3fc12d114cdd138219d071afa748572a983a988e3391b2fb48a7a31eb036a2fa8f7e67c05e39f9a5237c78667edc452256edb226eac085696795e SHA512 af23cd55fac98e6a0f14e4b302fa8519d06de27c8cb02eac5127b8788a11a1ace4365a1a1535500b274dbcc543d63d20b73ef0ac5484c5a3aa504bf340383edd
+DIST zabbix-5.0.18.tar.gz 21377940 BLAKE2B 4143dd2b5c4b04795e2f1b43637e541e3108abd19b489cf720b8256cc3d992bc20e2693846ee53d138df22b1404f6cc86dcb22f1e0805dda444172f18f1c48a7 SHA512 84a6684e413bd9180bab3e19a286c5113e41dab036fe76cded4a7ffeb931314648260c5e379ddea07cfb5a95b05e630a4c5952b5f96cfe03a5022e61f6da8095
 DIST zabbix-5.4.6.tar.gz 24371783 BLAKE2B 3be879a9b0452f2ee1b36c94511d6ee1a79214f14f3e9438da0035f258c70b190671e9991b0691209be9440b0103ec10a8c2a6cc4f3304a4638ebce0d8eb58a7 SHA512 4ca755bd715d5ba70cfe99894351cdf8ee82e8e8b2316fa7b95c083b9f13e6b3d986d87a52f157b00271bed7edaede5cdda020ca43015d7cf848f51ed169089b
 DIST zabbix-5.4.7.tar.gz 24424262 BLAKE2B c89bdd91ad8702d1edb60288013447aee910822d5a877a348f8770e4573906569393bb3e12a1b050f8550f8f5ac35308ec35795c2a1334ada5230c6e72b48286 SHA512 f87fd158d74c289765ddc3394bfa1c009d72d2756596c2060d567b5e44123594f00307f4df28a67b38c0e59a9d26f7d064afe73e7a3a0bd4e9bc02529334b1d1
-EBUILD zabbix-4.0.34.ebuild 9601 BLAKE2B d7a7dae9b4a10c5010b56f10929b5d8eaf047d2bb89cbf74164de8045ef0d7f85220ae66e155924f197da1ecd9a2f2cd4e5236d9100f78a2a7cdc120a3cf5b74 SHA512 0488a771c886f35e1be321ad9b32845149131347f21ec34c9e3a8826cbd9aefd41c08cc359447b1ed5e1265017f81adc3aca629dd2779f269ad6d208e06fa6b6
-EBUILD zabbix-4.0.35.ebuild 9603 BLAKE2B 710091e33a13efa1aa26faacf94f2ab8453a03e83039c7f8ab615f30df820a1ae0973e58c78623661d2e2d18c1d04b88ceefb0f085bf7d160385c816f07045f7 SHA512 f378e43a9a92a5bdb26fd20ad91246a640c879a413ffc77a3d6feba5c936574cd7dc66be20f0b5cc8683fab282e310a0b461bd5ef04ea289aa7273c1f2a733f3
-EBUILD zabbix-5.0.16.ebuild 31366 BLAKE2B 55a203eb225ea619a1dd41b97028dd35d53fd4ca5e5db6aa5427850b80ea3bda1b0b2af4516e95431123e29446200c6d4558bba35ad18d789fb90a14936f6ea6 SHA512 5a8bcea6d75cedfa930412c5046b7cf276cbea09916efdb26658b1d72fdcc3e93a6e08de7282e86d9e4afabc1a86f4efc3955bd291ef135e9f460df306263f19
-EBUILD zabbix-5.0.17.ebuild 31368 BLAKE2B 970b69ea6fa00d40041127080dc2832c3dd1a20a908526d2457a3f9427e94d8ffdc418e8d53b541da3e30e7a38fca2d16243ebae398a9395493e25fd08aa0ccd SHA512 ad7a801aa6d36ca036dddc4e8b13eba2994f1d2dafef6adb6612f46c7b262cb61d25a3b789d6da23a312483effbe2d919bea04ed39ddf8beda241ca93defe471
-EBUILD zabbix-5.4.5.ebuild 33756 BLAKE2B a61e42b825891c6e2d5bbe38e6b7cc4b43e791904af43b5d52843bbdb9482efc67e632df0b93c9cf5d700a3cc8158ebf61b66c7c7612351ecc4c281f25771969 SHA512 6be0da5265e003821b45209d86863fd1fd9404ca1e3a4faa65b7db71b62fc862f23d06f8a1004dc0a1ff88f41db89af99e85cf849bfc52c66a2303ae2567f811
-EBUILD zabbix-5.4.6.ebuild 33758 BLAKE2B b1a66bde6ef709643cfd1f9d3545c1c8cdddc74d10e1977ca0ff45b87beeee72e182a3185105e3c630be0353f3f6c121246b97154760a964a7895f5c2e92516a SHA512 bff80821affda6f2fee97e1c007dddb3b0090a60c5d5c32f6a782b4ceb0bcbf6ee97579cef965b6aa6284257ce4ca10d466be74b94610d5f955ab3fe2ec9a044
-EBUILD zabbix-5.4.7.ebuild 33758 BLAKE2B b1a66bde6ef709643cfd1f9d3545c1c8cdddc74d10e1977ca0ff45b87beeee72e182a3185105e3c630be0353f3f6c121246b97154760a964a7895f5c2e92516a SHA512 bff80821affda6f2fee97e1c007dddb3b0090a60c5d5c32f6a782b4ceb0bcbf6ee97579cef965b6aa6284257ce4ca10d466be74b94610d5f955ab3fe2ec9a044
+DIST zabbix-5.4.8.tar.gz 24431613 BLAKE2B 82279ba2a4515603d50083a391ea2c9d230dcc7459d62841cf003eaa092012cb2e5b5ba7c3a5eeabd4df27a8d5b6e97a90824fb119ee078864c6bf06cfec5cad SHA512 1812142cc949a2886cd1edd4d369934022aa5e89ae31b67641b7263dfbc5d3ee6f99a20a51e5b44e4af5719160f728766c5546e74c8bf9b0cf303867d20fba11
+EBUILD zabbix-4.0.35.ebuild 9609 BLAKE2B 3e1a24b044b8b539fc4fcab0359daba90f67c4e4b1b06e22e689d9f9da1d686c193bc578b513c7222863a947b77ad875beaf0435a2beccaac232b61585a49432 SHA512 9199e01bd6758d456726128705e16525ffbd7e24d27d599a5029f79943cbf58027a146e7dc2df920bfab8cfc622dc99e3b7675d5610ddebe6841008a286e67d8
+EBUILD zabbix-4.0.36.ebuild 9614 BLAKE2B 4adfd5b43cce8506461ff9cfcb50bf03fd099af46bed9505ff8acd266b9eef12e511eec2a7f3933002900f5466475f65872f254886e4126160790fb6979acb93 SHA512 5289e0adce0db9c3440e3f1ed2504f0cc82525905bb2482d43295ef98e6294dcc1c2e10ed800ff38e6b37a33cab6b7d917cb9c014b9222d783511087a07ba374
+EBUILD zabbix-5.0.17.ebuild 31374 BLAKE2B d6817579f1aedc51f76ac6d5136f5dfd5da1fb4e7381535d30a4f43e1ddf1359fbfeaeff4f2e34780617a4559a7beaba15d78db84e5d79652437823023fbfa01 SHA512 df80b919f16b1e573ec196e904b9bc05bcf2cf40b89ec9972dd3630d3321a8c7ad01db88f7fd84ce0d772a3b5318317a77eb99c270200067c1f21a54e843f1f5
+EBUILD zabbix-5.0.18.ebuild 31379 BLAKE2B 8cb7952e6bab5af2920d23fc6733643a67ea1aa37cd505259668d124b238e60655c46c7752794cab41010808957a2cf2ec5a3caebd401aeca5ffd2bb533bf7c8 SHA512 dbd620962a5a33b3c65e280140d08872c1b14349e4320efe89b4b721d18d8a9fde5ac945a0c280d4c51a645327609a5aa3eb1d2dca150b7b64a92ec750ac85c8
+EBUILD zabbix-5.4.6.ebuild 33764 BLAKE2B 16ce3fb691447df4d4e70db0e9b060688257ed2a9ac2ebbcc94be0f85b1d073a3c406232f181de3bab4ea3819cfe34d7fe033bb70fecb354bf8c15a2511e54c7 SHA512 87b6fc8c73dc0911bc362088e0722a1211e94f15415f197f4f2f3047eeb80eab16e4e41bbc8121691a71760a04bc77480516eb20fd096b0d5cdbbf89b3f805b3
+EBUILD zabbix-5.4.7-r1.ebuild 33769 BLAKE2B ebddc89c0d2553958e262112ed33029615364f6b207fdd3e1d24fa6a4fa575a41ade33394112cd197ca9b666c6cbf1d1e567188e2b4aa87ced27938bc00c2fb1 SHA512 0ca9a25e2de3a4037b7fdb9f9f6eacea21f2dc7b0a48a3ab8dc79a70300107257d5481d2336f947abbcdc3c590d1446c9ff67bd2ce6f243d2593fd1094f138a6
+EBUILD zabbix-5.4.8.ebuild 33769 BLAKE2B ebddc89c0d2553958e262112ed33029615364f6b207fdd3e1d24fa6a4fa575a41ade33394112cd197ca9b666c6cbf1d1e567188e2b4aa87ced27938bc00c2fb1 SHA512 0ca9a25e2de3a4037b7fdb9f9f6eacea21f2dc7b0a48a3ab8dc79a70300107257d5481d2336f947abbcdc3c590d1446c9ff67bd2ce6f243d2593fd1094f138a6
 MISC metadata.xml 1520 BLAKE2B 4f9851bc026e8d1aaaec68b21be3709972dad92e8b9d6bfa6de5cbac63dc324d74784284fab88227983d77526b21f7b17350f69cff3ef57db3608320b5bc7e7d SHA512 4f60c01cddfa125905c5623e56fed3194fbbc927ba2a5880618bd423f21ce52f910a5dfffdd4204734b0ce8fcb304b1deb77884a0150cbb9c94b386c4db48023
diff --git a/net-analyzer/zabbix/files/zabbix-server-r1.init b/net-analyzer/zabbix/files/zabbix-server-r1.init
new file mode 100644
index 000000000000..1652ba782fa8
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-server-r1.init
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/zabbix_server"
+command_args="--foreground --config /etc/zabbix/zabbix_server.conf"
+command_background="true"
+command_user="zabbix:zabbix"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+    need net
+    use mysql postgresql
+}
+
+start_pre() {
+	checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix
+	checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf
+}
+
+reload() {
+	/usr/sbin/zabbix_server \
+		-c /etc/zabbix/zabbix_server.conf \
+		-R config_cache_reload
+}
diff --git a/net-analyzer/zabbix/zabbix-4.0.35.ebuild b/net-analyzer/zabbix/zabbix-4.0.35.ebuild
index b4467228139f..9b6c9fe12b7b 100644
--- a/net-analyzer/zabbix/zabbix-4.0.35.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.35.ebuild
@@ -15,12 +15,12 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static xmpp"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	ssl? ( ^^ ( gnutls mbedtls openssl ) )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	static? ( !oracle !snmp )"
 
 COMMON_DEPEND="
diff --git a/net-analyzer/zabbix/zabbix-4.0.34.ebuild b/net-analyzer/zabbix/zabbix-4.0.36.ebuild
index 18d520ad114d..6313b45e4a61 100644
--- a/net-analyzer/zabbix/zabbix-4.0.34.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.36.ebuild
@@ -15,12 +15,12 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static xmpp"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	ssl? ( ^^ ( gnutls mbedtls openssl ) )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	static? ( !oracle !snmp )"
 
 COMMON_DEPEND="
@@ -188,7 +188,7 @@ src_install() {
 		fperms 0640 /etc/zabbix/zabbix_server.conf
 		fowners root:zabbix /etc/zabbix/zabbix_server.conf
 
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
 
 		dosbin src/zabbix_server/zabbix_server
 
diff --git a/net-analyzer/zabbix/zabbix-5.0.17.ebuild b/net-analyzer/zabbix/zabbix-5.0.17.ebuild
index 919624122741..b4e2c53f9574 100644
--- a/net-analyzer/zabbix/zabbix-5.0.17.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.17.ebuild
@@ -234,11 +234,11 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	ssl? ( ^^ ( gnutls openssl ) )
 	static? ( !oracle !snmp )"
 
diff --git a/net-analyzer/zabbix/zabbix-5.0.16.ebuild b/net-analyzer/zabbix/zabbix-5.0.18.ebuild
index c7e432bf4da3..0e9da3be9ad9 100644
--- a/net-analyzer/zabbix/zabbix-5.0.16.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.18.ebuild
@@ -234,11 +234,11 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	ssl? ( ^^ ( gnutls openssl ) )
 	static? ( !oracle !snmp )"
 
@@ -407,7 +407,7 @@ src_install() {
 		fperms 0640 /etc/zabbix/zabbix_server.conf
 		fowners root:zabbix /etc/zabbix/zabbix_server.conf
 
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
 
 		dosbin src/zabbix_server/zabbix_server
 
diff --git a/net-analyzer/zabbix/zabbix-5.4.6.ebuild b/net-analyzer/zabbix/zabbix-5.4.6.ebuild
index f1795467d2f7..72d2b869ff39 100644
--- a/net-analyzer/zabbix/zabbix-5.4.6.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.6.ebuild
@@ -259,11 +259,11 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	ssl? ( ^^ ( gnutls openssl ) )
 	static? ( !oracle !snmp )"
 
diff --git a/net-analyzer/zabbix/zabbix-5.4.7.ebuild b/net-analyzer/zabbix/zabbix-5.4.7-r1.ebuild
index f1795467d2f7..6a0d5e421042 100644
--- a/net-analyzer/zabbix/zabbix-5.4.7.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.7-r1.ebuild
@@ -263,7 +263,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	ssl? ( ^^ ( gnutls openssl ) )
 	static? ( !oracle !snmp )"
 
@@ -432,7 +432,7 @@ src_install() {
 		fperms 0640 /etc/zabbix/zabbix_server.conf
 		fowners root:zabbix /etc/zabbix/zabbix_server.conf
 
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
 
 		dosbin src/zabbix_server/zabbix_server
 
diff --git a/net-analyzer/zabbix/zabbix-5.4.5.ebuild b/net-analyzer/zabbix/zabbix-5.4.8.ebuild
index 7c6026192099..6a0d5e421042 100644
--- a/net-analyzer/zabbix/zabbix-5.4.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.8.ebuild
@@ -259,11 +259,11 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	ssl? ( ^^ ( gnutls openssl ) )
 	static? ( !oracle !snmp )"
 
@@ -432,7 +432,7 @@ src_install() {
 		fperms 0640 /etc/zabbix/zabbix_server.conf
 		fowners root:zabbix /etc/zabbix/zabbix_server.conf
 
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
 
 		dosbin src/zabbix_server/zabbix_server
author	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
commit	2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree	c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /net-analyzer
parent	e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)