gentoo resync : 06.04.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-04-06 22:33:41 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-04-06 22:33:41 +0100
commit: e68d405c5d712af4387159df07e226217bdda049 (patch)
tree: 009ab0f3d427f0813e62930d71802cb054c07e30 /net-analyzer
parent: 401101f9c8077911929d3f2b60a37098460a5d89 (diff)
52 files changed, 2375 insertions, 343 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 40692566dc2b..8a0a7ff45e91 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/carl/Manifest b/net-analyzer/carl/Manifest
index b962ba2e607c..61888bd0204d 100644
--- a/net-analyzer/carl/Manifest
+++ b/net-analyzer/carl/Manifest
@@ -1,3 +1,3 @@
 DIST carl-0.9.tar.gz 11096 BLAKE2B 46298873f8fff62a965a7ec7a657522dd90d1a298814f537bb5b32582ea63d0bcb1d4988cd31e6918f16514c65dd3c6517e9079c3c78f6cb0a4bc6d8ece1614a SHA512 9876e30d171bf00c4e53c6e90c98181ac25aeda004bdb8a03060c45a99c55fa087062076ff3964a222d2981ed682ae7b8f4cbade13c69154198200d35e1a577e
 EBUILD carl-0.9-r5.ebuild 506 BLAKE2B 944d5dec096f0bd2bd5e1d34286a675dd021ee566bfb947e56a38b78d01a19494bbaf14974697a322eecbd6727ccbc5d6db4b7046f3652283ad1e3d6e9b427fc SHA512 1950f4688fc00e44bcd405b24882054b84f51384847689d5543b42020d09f1adb51831647bcad9a4819092f664b02a9479a43b1743ca7a4eba73f5c3c9102a23
-MISC metadata.xml 357 BLAKE2B 4cf4f1e8b0ae3d4c1109f3b590cfe9cdcb295c3011bb488668dbceb4345ef6e1b879a02a7b18c3029d57436198ae5767d33b34e33167b99d52db0dc120293a5a SHA512 979c2c5ca33d8396910598bba35312f57c03ddb9d85cbcb278001c6bb36bee428a2a71b8bd7b47c0cd72ec227eed2cb447c4f82208ed9219b726dd62280bf6e4
+MISC metadata.xml 279 BLAKE2B f6f6aa89e1006ff0d57c3894fde1d9837a8b19286a8299ee3878431d45b789280e3d818dcf4ec22a013f6ef23c6da793158eefa92d058fdb0547f6a62de9a4b3 SHA512 49337b6016288844d78dbbc7c34d92e3665e3ff737782187b656784d5c1af0b5fdc0778f319dc5b1d888deb27e6d1377370f4c4bc6aa457fefabf514ea6a22e0
diff --git a/net-analyzer/carl/metadata.xml b/net-analyzer/carl/metadata.xml
index 6dd6a0ee7f31..e48a5ab0e03c 100644
--- a/net-analyzer/carl/metadata.xml
+++ b/net-analyzer/carl/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>klausman@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
   <email>netmon@gentoo.org</email>
   <name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 3daaf6ff6c1d..efe4b1d27313 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 432 BLAKE2B db8951dba2369c5a7e2906547597de202a35354131950e6cdf216ea1f18bd50c29388ec05742e19c7ca87ac9ae5090ce1b5261955610b426bd5482035b000918 SHA512 eb1d2efc60fc79820fbfe29c81dad27c9685f6ff936216950edff767a3743e9affd5165bf69da5c6ef8b493678bfe641577bf087485a2225e8102739eecc767d
+AUX munin-asyncd.init.2 429 BLAKE2B 8f4f943091a39e056212b28aa6e66425672bcb1cbc053f0b711fd9c16c8a24754a69f7fc35dd17aad85714650e7bca7580f9b457d5f5b4db0482b680976c7ba1 SHA512 d967467a0bf528d356c48209ec09bb09f3f2609d98ed28e71a4176396c8c135766cab8dcdcc1c653de2082120ef280d1fd9aaf6cc42fadd1a9dadb5ae392693b
 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
diff --git a/net-analyzer/munin/files/munin-asyncd.init.2 b/net-analyzer/munin/files/munin-asyncd.init.2
index 15a17a7bef6c..c9fc267f12ea 100644
--- a/net-analyzer/munin/files/munin-asyncd.init.2
+++ b/net-analyzer/munin/files/munin-asyncd.init.2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command=/usr/libexec/munin/munin-asyncd
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 9774eafeaea7..404fb9d023ed 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -2,6 +2,5 @@ AUX 99_nagios4-r1.conf 309 BLAKE2B c539330d9f100045fc02d13061dd3b8e958370c8885ef
 AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae2c70348dcd72b754453b5a84dd335daa222b4b75e5c19b3d5c18b64496739bdb61b8f2f67f5655b80a0ffb65f SHA512 2ef5268e9ba228d12e3dabb5a23ce73e49b7149a047acd4a2daac3cd3415b5233aaaf3b972c85780e71bd5fe3eefb6755a6222b40a509104fb318e219366867f
 DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace SHA512 6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
-EBUILD nagios-core-4.4.6-r2.ebuild 9358 BLAKE2B 8956ec6c87d45fa68b67301abfda57978853234b5d4e4226bb2faca03a57f93394fdc3a35aab8f2a81ddfab03a3a961c719948820f8bf099a43b1f51ab0a140d SHA512 94e6e5e49e193a4e249cc47de1edbdf1bb65ad4c4bf47703f545c0f35b7c876a3a27d18657fb1e9eb731d4ea0d07cc220673a4dc05c683948dba818128decaeb
-EBUILD nagios-core-4.4.6-r3.ebuild 9247 BLAKE2B 40d7dad2eee11a9c30cb346ef1212fe745b07ca433e74604356d3950c6656983786fc45ee738780b9c7e5768116a74c3404b60cbd5e7751284bc2f36fc0d08c8 SHA512 cc821f4c300994fdbf759d9c10e4afa14e71075de45886117533cff8fe1c493d77e69eb0027fd1e0e6369e2e9d12c2a08e1c03aad365710df469815f3716d8dd
+EBUILD nagios-core-4.4.6-r3.ebuild 9243 BLAKE2B cdbc7b6b1f4ee156db7000d4413f33722d888c7cdb2bca0f072d189219cc677d9da6a255590b126505f9ac27329ff2361d55e5eebc47c2e553bf2200a370e36c SHA512 81b8c9af2f2b0dd9dcb362163c2bc224de97fe0327ee97b4376ddab373a1c657fe3be88bb948e0d9f6398aab6a9f79bca40e757adbc0130d473530c0f5570bed
 MISC metadata.xml 1467 BLAKE2B d5ddd6280aafd3ad3a36a408071037fa757810382761f617eb2763a20e65185b30eef94fb4cdad7d4b5e9b81b6245efacf57d4ec0003406d66ef2053f09f3708 SHA512 25d3d4d19c18b416a0902d2ff39c0ca71b2e7bcc2bac61119b9636c6462391e65b2767d8b0e794abb318b19fe1c2bcbf2c80ee8d1ea6faec3f6eb9cddf60a9cd
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
deleted file mode 100644
index da7044dcdd6a..000000000000
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-MY_P="${PN/-core}-${PV}"
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/"
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi (USE=apache2_modules_cgi)
-#   * mod_cgid (USE=apache2_modules_cgid)
-#   * mod_fcgid (www-apache/mod_fcgid)
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-
-# The dependencies checked by the configure script. All of these are
-# also runtime dependencies; that's why ./configure checks for them.
-CONFIGURE_DEPEND="acct-group/nagios
-	acct-user/nagios
-	virtual/mailx
-	perl? ( dev-lang/perl:= )"
-
-# In addition to the things that the ./configure script checks for,
-# we also need to be able to unzip stuff on the build host.
-#
-# We need the apache/lighttpd groups in src_install() for the things
-# installed as the --with-command-group argument, so they go here too.
-# The groups are also needed at runtime, but that is ensured by apache
-# and lighttpd themselves being in RDEPEND.
-BDEPEND="${CONFIGURE_DEPEND}
-	apache2? ( acct-group/apache )
-	lighttpd? ( acct-group/lighttpd )
-	web? ( app-arch/unzip )"
-
-# This is linked into /usr/bin/nagios{,tats}
-DEPEND="dev-libs/libltdl:0"
-
-RDEPEND="${CONFIGURE_DEPEND}
-	${DEPEND}
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd[php] )
-		apache2? (
-			|| (
-				www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
-				www-servers/apache[${MOD_ALIAS},apache2_modules_cgid]
-				( www-servers/apache[${MOD_ALIAS}] www-apache/mod_fcgid ) )
-			|| (
-				dev-lang/php:*[apache2]
-				dev-lang/php:*[cgi]
-				dev-lang/php:*[fpm] )
-		)
-	)
-	vim-syntax? ( app-vim/nagios-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local myconf
-
-	if use perl; then
-		myconf="${myconf} --enable-embedded-perl --with-perlcache"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf="${myconf} --with-command-group=nagios"
-	else
-		if use apache2 ; then
-			myconf="${myconf} --with-command-group=apache"
-			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-		elif use lighttpd ; then
-			myconf="${myconf} --with-command-group=lighttpd"
-		fi
-	fi
-
-	# We pass "unknown" as the init type because we don't want it to
-	# guess. Later on, we'll manually install both OpenRC and systemd
-	# services.
-	econf ${myconf} \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--localstatedir="${EPREFIX}/var/lib/nagios" \
-		--sysconfdir="${EPREFIX}/etc/nagios" \
-		--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \
-		--with-cgibindir="${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin" \
-		--with-webdir="${EPREFIX}/usr/share/nagios/htdocs" \
-		--with-init-type="unknown"
-
-	# The paths in the web server configuration files need to match
-	# those passed to econf above.
-	cp "${FILESDIR}/99_nagios4-r1.conf" \
-		"${FILESDIR}/lighttpd_nagios4-r1.conf" \
-		"${T}/" || die "failed to create copies of web server conf files"
-
-	sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \
-		-e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \
-		-i "${T}/99_nagios4-r1.conf" \
-		-i "${T}/lighttpd_nagios4-r1.conf" \
-		|| die "failed to substitute paths into web server conf files"
-
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" nagios
-
-	if use web; then
-		# Only compile the CGIs/HTML when USE=web is set.
-		emake CC="$(tc-getCC)" DESTDIR="${D}" cgis html
-	fi
-}
-
-src_install() {
-	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
-
-	# There is no way to install the CGIs unstripped from the top-level
-	# makefile, so descend into base/ here. The empty INSTALL_OPTS
-	# ensures that root:root: owns the nagios executables.
-	cd "${S}/base" || die
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-	cd "${S}" || die
-
-	# Otherwise this gets installed as 770 and you get "access denied"
-	# for some reason or other when starting nagios. The permissions
-	# on nagiostats are just for consistency (these should both get
-	# fixed upstream).
-	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
-
-	# INSTALL_OPTS are needed for most of install-basic, but we don't
-	# want them on the LIBEXECDIR, argh.
-	emake DESTDIR="${D}" install-basic
-	fowners root:root /usr/$(get_libdir)/nagios/plugins
-
-	# Don't make the configuration owned by the nagios user, because
-	# then he can edit nagios.cfg and trick nagios into running as root
-	# and doing his bidding.
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
-
-	# No INSTALL_OPTS used in install-commandmode, thankfully.
-	emake DESTDIR="${D}" install-commandmode
-
-	# The build system installs these directories, but portage assumes
-	# that the build system doesn't know what it's doing so we have to
-	# keepdir them, too. I guess you'll have to manually re-check the
-	# upstream build system forever to see if this is still necessary.
-	keepdir /var/lib/nagios{,/archives,/rw,/spool,/spool/checkresults}
-
-	if use web; then
-		# There is no way to install the CGIs unstripped from the
-		# top-level makefile, so descend into cgi/ here. The empty
-		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
-		cd "${S}/cgi" || die
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-		cd "${S}" || die
-
-		# install-html installs the new exfoliation theme
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
-
-		if use classicui; then
-			# This overwrites the already-installed exfoliation theme
-			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
-		fi
-
-		# Install cute Gentoo icons (bug #388323), setting their
-		# owner, group, and mode to match those of the rest of Nagios's
-		# images.
-		insinto /usr/share/nagios/htdocs/images/logos
-		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
-	fi
-
-	# The ./configure script for nagios detects the init system on the
-	# build host, which is wrong for all sorts of reasons. We've gone
-	# to great lengths above to avoid running "install-init" -- even
-	# indirectly -- and so now we must install whatever service files
-	# we need by hand.
-	newinitd startup/openrc-init nagios
-	systemd_newunit startup/default-service nagios.service
-
-	if use web ; then
-		if use apache2 ; then
-			# Install the Nagios configuration file for Apache.
-			insinto "/etc/apache2/modules.d"
-			newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf"
-		elif use lighttpd ; then
-			# Install the Nagios configuration file for Lighttpd.
-			insinto /etc/lighttpd
-			newins "${T}/lighttpd_nagios4-r1.conf" nagios.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
-			ewarn "out of the box. Since you are not using one of them, you"
-			ewarn "will have to configure your webserver yourself."
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	if use web; then
-		if use apache2 || use lighttpd ; then
-			if use apache2; then
-				elog "To enable the Nagios web front-end, please edit"
-				elog "${ROOT}/etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
-				elog "to APACHE2_OPTS. Then Nagios will be available at,"
-				elog
-			elif use lighttpd; then
-				elog "To enable the Nagios web front-end, please add"
-				elog "'include \"nagios.conf\"' to the lighttpd configuration"
-				elog "file at ${ROOT}/etc/lighttpd/lighttpd.conf. Then Nagios"
-				elog "will be available at,"
-				elog
-			fi
-
-			elog "  http://localhost/nagios/"
-		fi
-	fi
-
-	elog
-	elog "If your kernel has /proc protection, nagios"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding nagios into"
-	elog "the group wheel, but this is not recomended."
-	elog
-
-	if [ -n "${REPLACING_VERSIONS}" ]; then
-		ewarn "The local state directory for nagios has changed in v4.4.5,"
-		ewarn "from ${EROOT}/var/nagios to ${EROOT}/var/lib/nagios. If you"
-		ewarn "wish to migrate your state to the new location, first stop"
-		ewarn "nagios and then run"
-		ewarn ""
-		ewarn "  diff --recursive --brief ${EROOT}/var/nagios ${EROOT}/var/lib/nagios"
-		ewarn ""
-		ewarn "to identify any files that should be moved to the new"
-		ewarn "location. They can simply be moved with \"mv\" before"
-		ewarn "restarting nagios."
-	fi
-}
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
index e0583cea138b..9483f0dda9d3 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index 502e13d6b637..6503d07df31c 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-10.1.2-es8.x86_64.rpm 13227296 BLAKE2B b7ebcdbd739f1c32b340ca35626ea9b9f4e767f9a5a0655fbe73f76e65aa9f9259ae02dae16bcb21564a8139fa6f83d400a7cccfb8200dedd79e357b47d8568b SHA512 f1e61482eeafe463a6d0095a9cb3c6b082478862dfd9a0ef195c2ed49081736f01b3c9ead360d99ccf0b69696b310738da6d2ff4c944f5f699d375db405e9a39
-EBUILD nessus-agent-bin-10.1.2.ebuild 2361 BLAKE2B 4e904bc555536c60d4b6fe1ab1cecd86114d4a83036f3f443eefa931c85fc460b1beb8da670653aada62134b45b4ebf09cc9743ade35d006f30a999ca20ab2ed SHA512 f4ec7de4f4843d907b60d7989422a3d29b98b15a9a9050dcf151e20d0b4dd3bfa8eb71bae5d0ffe30e589c404e40176c5cb38ac0a27740fa5c258fba9128a1b0
+DIST NessusAgent-10.1.3-es8.x86_64.rpm 13229772 BLAKE2B 55faa489a4facca8d005ba06d84d55af9bfc8b99956659d49ea1755c1a907bb96f9d35e56aab44b6a48783e4bc27abb83fc47f94b490702036267078d8b61d8f SHA512 c77bcd01691d3bc55d62340e55653e973ae9b8649a8387fe0826a658ff26c16f05d9eba49789f21fdc51cef80f82cc676812ef05671f35f9f863a22661648572
+EBUILD nessus-agent-bin-10.1.3.ebuild 2361 BLAKE2B 4e904bc555536c60d4b6fe1ab1cecd86114d4a83036f3f443eefa931c85fc460b1beb8da670653aada62134b45b4ebf09cc9743ade35d006f30a999ca20ab2ed SHA512 f4ec7de4f4843d907b60d7989422a3d29b98b15a9a9050dcf151e20d0b4dd3bfa8eb71bae5d0ffe30e589c404e40176c5cb38ac0a27740fa5c258fba9128a1b0
 MISC metadata.xml 354 BLAKE2B f3d046b6610423bd40c2cdbe29c8aa35d8111c56f6565d5b84aea31e03a8612b3a173965496833ec2ad2a38412b68d39f09d389e41797a0cda399758c85034a5 SHA512 1f4021d2781ddbccbbf0bf91492b50af18f142200bfc959a36b527941b9e8452a7814e12a1f720fcc62f6d069158cdb5093ae3760bc1b3b09d2cb73e4ab7f715
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.1.2.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.1.3.ebuild
index 3b22d5b2779c..3b22d5b2779c 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.1.2.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.1.3.ebuild
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index a98a20a2a464..1c4ade5dcd74 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-10.1.1-es8.x86_64.rpm 48117260 BLAKE2B 3d170a8c2ba15389590d1e9d5b7d02469fd09683643e7078d7923ff3ec7aabe91a9cda1303c4a5586bbb5412f49175e221f2c9224c25c52dc3e6556b35c57e75 SHA512 930ffbddd8db212cd8d900ecfe2533175569ed077dd0731437a077df36454b632e8d8d63422c217bcac713eb7f07a35a5de685d99137e031b93e5a584f1e2552
-EBUILD nessus-bin-10.1.1.ebuild 1989 BLAKE2B 60687eace368dd476aa29470d5745bfd99193b0504ef19ba51f4a85b8f27f6a1719c6eebfe9277331d04a741855dfcc20750897e0d94bce7bff78a2185af8557 SHA512 bde2d18ed3bc6b0b22bb61f3a7fd9fa3d20241cdcdfd563cfb331b8c2082012539b37a8b477a647c27c8fe8ae98d0cb438228b23af6e3516b055d5d791d35a7b
+DIST Nessus-10.1.2-es8.x86_64.rpm 48715420 BLAKE2B bbd74913f6bf52ed84831225e79c0442898ae594da2fbccd97c23bc7af05b5ac9fa3d0b0f973cf6855c4df05c88984ed428c00050019adbfec2284e0a3878215 SHA512 c6d22bdc156397bfde20ef1da9126a7e25802f3af9c15bc126e00a8bf25fae6efa2eb1eed1a878b1dd668687d7181e035b107a684f93facb29859fc66a27cd12
+EBUILD nessus-bin-10.1.2.ebuild 1989 BLAKE2B 60687eace368dd476aa29470d5745bfd99193b0504ef19ba51f4a85b8f27f6a1719c6eebfe9277331d04a741855dfcc20750897e0d94bce7bff78a2185af8557 SHA512 bde2d18ed3bc6b0b22bb61f3a7fd9fa3d20241cdcdfd563cfb331b8c2082012539b37a8b477a647c27c8fe8ae98d0cb438228b23af6e3516b055d5d791d35a7b
 MISC metadata.xml 346 BLAKE2B 5e72f68ab557c56cc09cedcaaa9760f3619723bd6fc58b8ecc921526b1b42b6b65e971876ec569c1e68a26e55def24767c5d896fd9eb6a706041b485a8885023 SHA512 ab7e122c344a3f5078b2d497ed36a63f6af74fcfa7f2b98d6299ec7c82e7cbaf427da8fa595e6445e49ee041114ac581fb5b1d703f16fc70a54ee98375062e82
diff --git a/net-analyzer/nessus-bin/nessus-bin-10.1.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.1.2.ebuild
index 0692bd7052be..0692bd7052be 100644
--- a/net-analyzer/nessus-bin/nessus-bin-10.1.1.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-10.1.2.ebuild
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index 8ffde33263b7..b7ff704c2ec0 100644
--- a/net-analyzer/nethogs/Manifest
+++ b/net-analyzer/nethogs/Manifest
@@ -1,3 +1,5 @@
 DIST nethogs-0.8.6.tar.gz 116720 BLAKE2B 2d3695c2138f4e88c11a8c515156a430015c2844e09dd599091ff090fd87a3c12a1c5a7d1d9d32d302512a4e027a739a6b864f8d1e549593c6f86ab749989662 SHA512 1116f2e57bbf4d9213080598d04ff41c9ae28bd3e5c45c99068c783beb109eff3ffb02f9c3610f20ef0aa53606b3c500917d5d6983496599904d8c5a35cf2a6f
+DIST nethogs-0.8.7.tar.gz 270631 BLAKE2B 179227d4b1fde5328e4885ce72bb28ac20482fa161afee7562546af5b403be1e851533e3861dfa2f514968aebe91a822e6b792520407853dfb1055c6d29ad121 SHA512 d965f3fa439ea9fbba83578b4272d03f396bf3cff9ae73a94936d47a3422d066d885c7f6f2a47fbe2f445a017bffa3fb3a1215976522ef0ad120fae3b95b31a2
 EBUILD nethogs-0.8.6-r1.ebuild 788 BLAKE2B 2652b7396e85249512babfeefaef816588ad0b50f4eb51091202c17f3f54ed6a0885b545d45517c427c942757d6d4953880b92870145ca3c53c88930a9456df5 SHA512 fa07e0fcd9e8e3252a431611970b52c8831234b2915992e3eb7401d29875cebf820aea290f5768c79317e01af588739c6ba6e7fcf46ea271b2b93d0eb4e04b0b
+EBUILD nethogs-0.8.7.ebuild 782 BLAKE2B 0331d6ac93cdf869f7f1b3f4901887e58113fc52036f7b130cebc2af1c1567da1bde9f7d2514d8e024ecb6a27396abd41a55b277fc88565beb000f71a5feff44 SHA512 5ff266f03c3f94a2476c3910109bd3ec3e7fafd5843186dea60dc33b51b8433836505aebd88ac515fb497ae1e2ac24da9456d44fc2812b321426b838f829b91c
 MISC metadata.xml 899 BLAKE2B d1264983b4384b385a5480490544127e1a0676e69e1731b42355d19f627bf6b73588db11d8fbebc2ba42a7ba5c410c83af09323579d18819042d78d3afec54ad SHA512 c497cf9ef42e78b332330b20255d966d8b101286a611c3aa910768d08b368417a0014fa84eaae983c043165a714de59b768cb59dd36cd8bf686088709fdd6946
diff --git a/net-analyzer/nethogs/nethogs-0.8.7.ebuild b/net-analyzer/nethogs/nethogs-0.8.7.ebuild
new file mode 100644
index 000000000000..67bfac5facf0
--- /dev/null
+++ b/net-analyzer/nethogs/nethogs-0.8.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps toolchain-funcs
+
+DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
+HOMEPAGE="https://github.com/raboof/nethogs"
+SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+
+RDEPEND="net-libs/libpcap
+	sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( DESIGN README.decpcap.txt README.md )
+
+FILECAPS=(
+	cap_net_admin,cap_net_raw usr/sbin/nethogs
+)
+
+src_compile() {
+	tc-export CC CXX
+
+	emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" ${PN}
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX="/usr" install
+	einstalldocs
+}
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index d692ea857899..9a16419ee6c4 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -2,6 +2,10 @@ AUX nfcapd.confd 230 BLAKE2B b4ef656a10aeedf1ee9b11b2ac3d429fcf91e2cc6a84ca220e2
 AUX nfcapd.initd 1261 BLAKE2B 092b65523720ab0f4790650764e758da8504234dc888aadf8e6512b73f0c934eee27b00ccd717bd0944d2d4aa9574b9d2afe0f3aa7e071ab59e168c7e0cc0cf3 SHA512 5e4fff0829b992be9b1a318da4a77bdc87922a6f5257c87eff41590e32995b52b27efc7fa4e56aedf844c509430cb46103d902017cb3fc5f4885b8117e58feab
 AUX nfdump-1.6.19-compiler.patch 528 BLAKE2B b289f32a18a03b2725360b84314b294ebe6843f3ecaf3eb6ddffb9ba4e85641167c705682a8fc90560e0ce5d41dfeed7a739d011569361c31107dec9c98bf213 SHA512 300e79fdf994bd6a75c9595417d4e3e12b7e4030d6b1fa685b1b352404f36cfe2f1d8f31796a62f2a465a93dfeab0ab81caaf63a4de56a7851aea255b4607dc8
 AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4
+AUX nfdump-1.6.23-autotools.patch 6579 BLAKE2B ea194c79ad584007b5c2e19a4b7b5cb94f381220e5c04120c5700b33075da831428d98af0b3fac574d61414c6285da05268660033d2411a87eaf047156af4442 SHA512 c7bcc7645542d1d3273def4a7fa5881e30763b38773ceb3fa5eef3e7f0a60fc0aaa14cf66df7f72dd154a3ccce1ab9dfaf2ef955d149136a1bb8e014ffe7574f
+AUX nfdump-1.6.23-m4-dir-automake.patch 579 BLAKE2B f77f624bfcd108e048ee215d85968fdde380720de90979cca81c45c64e022c872983f0d0d370bec8c16c1111948748d959662eab494a2c660fdb8d63377bd3ab SHA512 90df4adaba5deaf79d93eb05dcf3f364837bf7b60175a325ac08bad056bb356dd23f414132e23c068579a9fa9ad46ec74ccab7178022e8fe3bbead3f8f0be07f
+AUX nfdump-1.6.23-m4-dir.patch 477 BLAKE2B 1ef4634ad61efc372da5bb92657826ed45112121e98dbb8971e51df33d50ce312e841659cf01fe949f5ce9998b75bd1037be9ffe1a95a6dbb2aca73e5be6bfac SHA512 b50cb179373a6b37b4122a0b77e6d321b6e992430f4fbc5178cbf867bf4cc0740e2c7a4b01c075f3d8c4339b0690781f1df74f773993cedbe44ff041c9bb6091
 DIST nfdump-1.6.23.tar.gz 568879 BLAKE2B ca844f87e02fb3761d5b470cac11beada9873b0c7e3e9ca7ccc7899d57f0cfd96329698ac84467a55d683e83ce16c2b114a571845c7cb6069addcdd5d4a43903 SHA512 e3f79af69a170985fcbd1757fab86e90840d040cf7a6214c7f9851ed59695d3844a15269904c3ba989b6b6ed2ddf29fd19a493165d3037e49aa2bb69b831f168
-EBUILD nfdump-1.6.23.ebuild 1672 BLAKE2B 4d0b88c5592b18da7579e01047b4986984627d3668b09271d5a792cedad3bb9334317026d3cbaf70449262d425c8984a1cd5be2de2b15aa2e8c57b80cb93d539 SHA512 754513ceb76ba46f7a7cf48ef6cba87f060af153c671d56d08bbcb17f4988061c3524d28deed0d32fd30a1023dc4d994e61bed5d45468b434e0d9cf349fff856
+EBUILD nfdump-1.6.23-r1.ebuild 1719 BLAKE2B bd83dea93bc0d33639a92015249f15ccebda61c0870481c30fae667516a8dc279a69eea0008e1490d4d81b123b3c7edb8189c5460774f1e44d9d7c49d2d9b2a3 SHA512 ac32eaa741fe3482056fed7481b087806ad3b2fa8cbd94ad945e982871f35bfb8031d61a73b2e54ab08bda7e30d46ea1acc9eaafda9953a9a0bf0270a79b817c
+EBUILD nfdump-1.6.23.ebuild 1713 BLAKE2B b0a76ab56f3a696d1828cd8241de89238d824c13f7cdd3ab22b052732c76f9660d60ef6114e54ab7f2ccb30c0608fc33ae448df1a4fd191b9e7c74347c477804 SHA512 013079b47e1346c7b057572687cda6a1b39e5966da05674e2329cd55e14fa8ea36a894f18b18c7a4485841da54201ebe5e7d0832355e4e01447b524cc56d5f74
 MISC metadata.xml 1278 BLAKE2B ad9d73532114eb0942a2b5262fe8e5f2b787993950fcd7c8bcb926f9e9e8d93ab94476265976b2e0cc41f3ea46fc6699a0bbb591d0c929208ec5e85d1b399617 SHA512 0bdbda9ccce4611ab88b746f4907dbb0c96d1e5f0dac909e2318c8bdf77de87321f65baadbb886f0c2e1b231cc30c50c70e5363cc9084285d1eaf5897c6f38cd
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch
new file mode 100644
index 000000000000..65558bbe7dfa
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch
@@ -0,0 +1,216 @@
+https://github.com/phaag/nfdump/commit/e6261098570f69ad973a7a4ea7aaebb1663712e8
+https://github.com/phaag/nfdump/commit/67da975f20076751bce49caf57c89ed21ed92ad0
+https://github.com/phaag/nfdump/commit/4652c2014012a81438f53cb590687c8c93419140
+
+From: Peter Haag <flow-dev@pyxis.ch>
+Date: Tue, 22 Feb 2022 10:54:19 +0100
+Subject: [PATCH] Fix issue #304 - accept CFLAGS
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,8 +8,11 @@ AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
+ AC_CONFIG_HEADER([config.h])
+ AM_INIT_AUTOMAKE([subdir-objects])
+ 
++if test "x$CFLAGS" = "x"; then
++    CFLAGS="-g -O3"
++fi 
++
+ # Checks for programs.
+-CFLAGS="-g -O3"
+ AC_PROG_CC([clang gcc])
+ AX_CHECK_C11
+ CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
+
+From: Peter Haag <peter@people.ops-trust.net>
+Date: Fri, 25 Feb 2022 09:12:27 +0100
+Subject: [PATCH] Cleanup automake files. Fixes #304.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,12 +1,13 @@
+ #                                               -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+ 
+-AC_PREREQ(2.59)
++AC_PREREQ([2.71])
+ AC_REVISION($Revision: 244 $)dnl 
+-AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
++AC_INIT([nfdump],[1.6.23],[peter@people.ops-trust.net])
+ 
+-AC_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE([subdir-objects])
++AC_CONFIG_MACRO_DIRS([m4])
+ 
+ if test "x$CFLAGS" = "x"; then
+     CFLAGS="-g -O3"
+@@ -15,7 +16,12 @@ fi
+ # Checks for programs.
+ AC_PROG_CC([clang gcc])
+ AX_CHECK_C11
+-CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
++AX_APPEND_FLAG([-Wall], [CFLAGS])
++AX_APPEND_FLAG([-Wstrict-prototypes], [CFLAGS])
++AX_APPEND_FLAG([-Wmissing-prototypes], [CFLAGS])
++AX_APPEND_FLAG([-Wmissing-declarations], [CFLAGS])
++AX_APPEND_FLAG([-Wmissing-noreturn], [CFLAGS])
++AX_APPEND_FLAG([-fno-strict-aliasing], [CFLAGS])
+ 
+ LT_INIT
+ 
+@@ -59,7 +65,7 @@ if test "${enable_fixtimebug}" = "yes" ; then
+ fi
+ 
+ AC_PROG_YACC
+-AC_PROG_LEX
++AC_PROG_LEX(yywrap)
+ which $LEX > /dev/null 2>&1
+ if test $? = 1; then
+ 	AC_MSG_ERROR(No lex or flex found on system)
+@@ -312,7 +318,11 @@ AC_LINK_IFELSE(
+ 
+ # Checks for header files.
+ AC_HEADER_DIRENT
+-AC_HEADER_STDC
++# Autoupdate added the next two lines to ensure that your configure
++# script's behavior did not change.  They are probably safe to remove.
++AC_CHECK_INCLUDES_DEFAULT
++AC_PROG_EGREP
++
+ AC_CHECK_HEADERS(stdio_ext.h)
+ AC_CHECK_HEADERS([nameser8_compat.h])
+ AC_CHECK_HEADERS([features.h arpa/inet.h fcntl.h netinet/in.h fts.h stdint.h stdlib.h stddef.h string.h sys/socket.h syslog.h unistd.h iso/limits_iso.h])
+@@ -404,17 +414,14 @@ AC_CHECK_FUNCS(memcmp memcpy memmove memset)
+ AC_MSG_CHECKING([for union semun])
+ AC_CACHE_VAL(ac_cv_struct_semun,
+ 	[
+-		AC_TRY_COMPILE(
+-		[
++		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ 			#include <sys/types.h>
+ 	 		#include <sys/ipc.h>
+ 			#include <sys/sem.h>;
+-		],
+-		[
++		]], [[
+ 			union semun semdat;
+-		],
+-		ac_cv_struct_semun=yes, ac_cv_struct_semun=no
+-		)
++		]])],[ac_cv_struct_semun=yes],[ac_cv_struct_semun=no
++		])
+ 	]
+ )
+ 
+@@ -424,7 +431,7 @@ if test "$ac_cv_struct_semun" = "yes"; then
+ fi
+ 
+ AC_MSG_CHECKING(for the %z format string in printf())
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+ #include <sys/types.h>
+ 
+@@ -438,28 +445,38 @@ char	string[16];
+ 
+ 	return i == 5 ? 0 : 1;
+ }
+-],
+-[
++]])],[
+ 	AC_MSG_RESULT(yes)
+ 	AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1],
+                                       [Define to 1 if you have a printf() that supports the %z format string.])
+-],
+-[
++],[
+ 	AC_MSG_RESULT(no)
+-],
+-[
++],[
+ 	AC_MSG_RESULT(no)
+-]
+-)
+ 
++])
++
++AC_CONFIG_FILES([Makefile bin/Makefile man/Makefile])
++AC_CONFIG_FILES([doc/Makefile])
+ AC_PATH_PROG([DOXYGEN], [doxygen], [])
+ AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
+ AM_COND_IF([HAVE_DOXYGEN], AC_CONFIG_FILES([doc/Doxyfile]))
+-AC_OUTPUT(doc/Makefile)
+-
+-#AC_CONFIG_FILES([Makefile])
+-AC_OUTPUT(Makefile bin/Makefile man/Makefile)
++AC_OUTPUT
+ 
++echo ""
++echo "----------------------------------"
++echo " Build Settings for ${PACKAGE_TARNAME} v${PACKAGE_VERSION}"
++echo "----------------------------------"
++echo "  host type            = $host_os"
++echo "  install dir          = $prefix"
++echo "  CC                   = $CC"
++echo "  CFLAGS               = $AM_CFLAGS $CFLAGS"
++echo "  CPPFLAGS             = $AM_CPPFLAGS $CPPFLAGS"
++echo "  LDFLAGS              = $AM_LDFLAGS $LDFLAGS"
++echo "  LIBS                 = $LIBS"
++echo "----------------------------------"
++echo ""
++echo " You can run ./make now." 
+ echo ""
+ echo "* Many thanks for using nfdump tools"
+ echo "* Please send bug reports back to me: peter@people.ops-trust.net"
+
+From: Peter Haag <peter@people.ops-trust.net>
+Date: Thu, 3 Mar 2022 09:25:15 +0100
+Subject: [PATCH] Make configure.ac autoconf 2.69 compatible
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,7 +1,7 @@
+ #                                               -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+ 
+-AC_PREREQ([2.71])
++AC_PREREQ([2.69])
+ AC_REVISION($Revision: 244 $)dnl 
+ AC_INIT([nfdump],[1.6.23],[peter@people.ops-trust.net])
+ 
+@@ -47,7 +47,7 @@ if test "${enable_jnat}" = "yes" ; then
+ fi
+ 
+ if test "${enable_nsel}" = "yes" -a "${enable_jnat}" = "yes"; then
+-	AC_MSG_ERROR(You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.)
++	AC_MSG_ERROR([You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.])
+ fi
+ 
+ AC_ARG_ENABLE(nel,
+@@ -287,7 +287,6 @@ AC_SUBST(FT_INCLUDES)
+ AC_SUBST(FT_LDFLAGS)
+ AC_SUBST(LFLAGS)
+ 
+-
+ # Checks for libraries.
+ AC_CHECK_FUNCS(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname,,[AC_CHECK_LIB(socket,gethostbyname)])])
+ AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)])
+@@ -447,8 +446,7 @@ char	string[16];
+ }
+ ]])],[
+ 	AC_MSG_RESULT(yes)
+-	AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1],
+-                                      [Define to 1 if you have a printf() that supports the %z format string.])
++	AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1], [Define to 1 if you have a printf() that supports the %z format string.])
+ ],[
+ 	AC_MSG_RESULT(no)
+ ],[
+--- /dev/null
++++ b/m4/extensions.m4
+@@ -0,0 +1,4 @@
++dnl Define to empty for the benefit of Autoconf 2.69 
++dnl AC_USE_SYSTEM_EXTENSIONS (below) can be used unchanged from Autoconf 2.70+.
++m4_ifndef([AC_CHECK_INCLUDES_DEFAULT],
++  [AC_DEFUN([AC_CHECK_INCLUDES_DEFAULT], [])])
+
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch
new file mode 100644
index 000000000000..755db8b7cf5d
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch
@@ -0,0 +1,23 @@
+https://github.com/phaag/nfdump/pull/336
+
+From e882722e4e006d0440fb5a37fb051d4747e4f225 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 24 Mar 2022 22:50:13 +0000
+Subject: [PATCH] Makefile.am: add ACLOCAL_AMFLAGS
+
+Per autoconf docs [0], if using automake and AC_CONFIG_MACRO_DIR,
+we need to include ACLOCAL_AMFLAGS in Makefile.am.
+
+So, let's set ACLOCAL_AMFLAGS = -I m4.
+
+This sorts out an automake warning.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,4 @@
++ACLOCAL_AMFLAGS = -I m4
+ 
+ SUBDIRS = . bin man doc
+ 
+
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch
new file mode 100644
index 000000000000..ac25ee094653
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch
@@ -0,0 +1,19 @@
+Variant sent upstream (configure.ac hunk irrelevant now): https://github.com/phaag/nfdump/pull/336
+https://bugs.gentoo.org/832420
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,4 @@
++ACLOCAL_AMFLAGS = -I m4
+ 
+ SUBDIRS = . bin man doc
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,6 +7,7 @@ AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
+ 
+ AC_CONFIG_HEADER([config.h])
+ AM_INIT_AUTOMAKE([subdir-objects])
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ # Checks for programs.
+ AX_CHECK_C11
diff --git a/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild
new file mode 100644
index 000000000000..34bb2bd90adb
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="https://github.com/phaag/nfdump"
+SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow"
+
+REQUIRED_USE="?? ( jnat nsel )"
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	ftconv? ( net-analyzer/flow-tools )
+	nfpcapd? ( net-libs/libpcap )
+	nfprofile? ( net-analyzer/rrdtool )
+	nftrack? ( net-analyzer/rrdtool )
+	readpcap? ( net-libs/libpcap )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-m4-dir-automake.patch
+	"${FILESDIR}"/${PN}-1.6.19-libft.patch
+)
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use doc; then
+		doxygen -u doc/Doxyfile.in || die
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	# --without-ftconf is not handled well, bug #322201
+	econf \
+		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+		$(use nfpcapd && echo --enable-nfpcapd) \
+		$(use nfprofile && echo --enable-nfprofile) \
+		$(use nftrack && echo --enable-nftrack) \
+		$(use_enable debug devel) \
+		$(use_enable jnat) \
+		$(use_enable nsel) \
+		$(use_enable readpcap) \
+		$(use_enable sflow)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/nfcapd.initd nfcapd
+	newconfd "${FILESDIR}"/nfcapd.confd nfcapd
+
+	if use doc; then
+		dodoc -r doc/html
+	fi
+}
diff --git a/net-analyzer/nfdump/nfdump-1.6.23.ebuild b/net-analyzer/nfdump/nfdump-1.6.23.ebuild
index 9c9c2bd847b6..dca53c21054e 100644
--- a/net-analyzer/nfdump/nfdump-1.6.23.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,6 +38,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.19-compiler.patch
 	"${FILESDIR}"/${PN}-1.6.19-libft.patch
+	"${FILESDIR}"/${PN}-1.6.23-m4-dir.patch
 )
 
 DOCS=( AUTHORS ChangeLog README.md )
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index d2feedf97fa3..ffddf754f130 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,9 +1,13 @@
 AUX rrdcached.confd 150 BLAKE2B 7e3e87c632bde99e2c460828157d281ace8a2f34f5310dc1ca5610625cde80170a8e2d973b1464ff5ee7447e28f4e26386140b80bd0d866acd8445733e1eb4e9 SHA512 93d95057e99c98c943060cfc607285e76ac4580e9955e65ceac69b09577dd6a78b1faa9e6213345a7f011beabebce21c9447b6bd39f4091762d9974cd1a358e0
+AUX rrdcached.confd-r1 425 BLAKE2B bd5bd8789f07803304d53aed0ed80685b7b42d9b7d9067d9980564a4b485c4ae474ca88298ea72154945941de00ba6ccea71ae5f3b4fe3be14583fe3e7d4da52 SHA512 d22503eebf3a89fc5e14124716058efef2b78409995a9814cb72e8ab9b9172a89bab5bc0c1f796a1d735d41f20c9c0b8009539da9f9bb96554d71984a64adb72
 AUX rrdcached.init 331 BLAKE2B 835f60bd601591667556610f24002dc9cf7cba547d6cff7b5116c742577d97233a704f65dcc55bee26b8717da547a987a1f4b1511433ec559e86932fad9f52b0 SHA512 383cebcc9ad035660def2e465690f52104eac4ac621faeca3f31822f2f2bbd96f23c60fc5bc6382855e971563d7d545cc7abc31fe351c57a8ea716bcd7c95d88
+AUX rrdcached.init-r1 799 BLAKE2B 2b276a75e1d910fc7931758710507490f1d41398555426d160d0985fa326431018cfaa4ad1f0d54524e8b56e531f4867308fd078d499aa717011f6fe133a46c6 SHA512 789fd4d6e50169e34a1d4d04c9d36ce6a913a6ae0a633e07cbec3a7936ca6b47910b0e8002b8a346824ba5fff048f700e72f819f803b9aa1f18634e85127f66f
 AUX rrdtool-1.4.9-disable-rrd_graph-perl.patch 914 BLAKE2B 80b309cf59260a0f137f6550bf867845df25e6be0ac5677517d062aef8240f34db6f721700331d41d73f7aefbbd17f2c13df7ee1f774ff6bf33b6c1790183153 SHA512 6eb8d8a8193ce5bc22a4645e909dc7eb0a911b1f89f6403afc9cffec705929cf64086f415e53b748254a384b83ff8352be82f735ad403795c17a9058bc3e386c
 AUX rrdtool-1.5.5-rrdrados.pod 1419 BLAKE2B ef1a2438846a60b565c94088d7563480a97e9b77d5ef2173aed3b8f9cd8fba43ff9a553946ca4ee3092512b10dfce6de9a6436cac5aaa62a35c655f7c82520dc SHA512 fd3339862c51c8573dd93079ba70c9b538c4d73d031157fe845bcb59e7233cb5e9fa8cc451e760f8ae30014c975ec9ee04f66d42fc928c621a572b92e9348e4f
 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81
 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-EBUILD rrdtool-1.7.2-r100.ebuild 5765 BLAKE2B afcc333f35a3fe82b41f34402e4c0b1e3e009c288c13bf8165ba968adbe071b494c36bee5064fd21375a188de095036395f7486c4d3ef855576cc4061beead2c SHA512 4b62ea64b088e2a7bced9801b06677fae325324eb5818bd814598e6c91206656b2c24ff28790aee7df75ecb59ddbc40802c040ce36d33fc283208e40564df008
-MISC metadata.xml 585 BLAKE2B a8db02c6cab8dc47a9d70c54f8ec6a769f4be639fc0116035215bcfad6e8841cc324dfaec655cbbadceccb92b83e83dbe6f0fac54820a881f6f1efa3c9425bb2 SHA512 6ad8ede67d5ee5365f31c4a8d402078b717d7f79719d49ee639fde7c3ea11e6c4172ac570a6ed6cdd1ccd90a067b2c1c1d4137de86efbbacc828f6020080e946
+DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
+EBUILD rrdtool-1.7.2-r100.ebuild 5767 BLAKE2B 7568e91cfaa2295ab8ac44736185605626cfb3fd000a3a009f45e6fdfe9011d6c49080d33b4a69717f3d2244ffd53edd1bab6bf889b65d5b437aa4072a591fbc SHA512 817cfe3581b506eac6f4a62441a32d0b7a218cb258e004af2283b23318c43d60d2fa1bdef1aad7968ec51973494209389b436b52a6e3090e37ca3990bf3ef6c6
+EBUILD rrdtool-1.8.0.ebuild 5452 BLAKE2B 21e86f3f81b737cfed288cacfcc2be50d59163d315e69d0a36af1367667ee4c133302ed9e4b80e6b9c83b6aa1dd4cf85b3bdaf197ea3d237a80fa97d5b099fd7 SHA512 1d9c4999b2fee6b61e41e71c770b0fb3d234db30c45a7aba6010e7af869c6cef58626973dd6ac32686c654379fc6891e461fbbb6adb23636b9d4866764c8372d
+MISC metadata.xml 767 BLAKE2B 12dd8f6fc7192dd214acb9b7ab3cb2bdfdd601ad768587ca0133ea132a2ffbc4aace5c7943c933b0b8e13d200ff5129882f9b47931421db9db2c017a398870ff SHA512 afca7f1c6ff9209ee1fe4977f5e9a063e37e3ee00a5a3ecd560e71fdf86df7daed526742bcd592d145df4b26ac206672135845fe67f8d2a64d5ae536113aa22f
diff --git a/net-analyzer/rrdtool/files/rrdcached.confd-r1 b/net-analyzer/rrdtool/files/rrdcached.confd-r1
new file mode 100644
index 000000000000..99213acd1e1b
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdcached.confd-r1
@@ -0,0 +1,13 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Default user and group for the rrdcached daemon
+GROUP="rrdcached"
+USER="root"
+
+# Default options for the rrdcached daemon
+RRCACHE_ARGS="-B -F -m 770 -s rrdcached -l unix:/run/rrdcached.sock"
+
+# Default path for database and journal
+RRCACHE_DATABASE="/var/lib/rrdcached/db"
+RRCACHE_JOURNAL="/var/lib/rrdcached/journal"
diff --git a/net-analyzer/rrdtool/files/rrdcached.init-r1 b/net-analyzer/rrdtool/files/rrdcached.init-r1
new file mode 100644
index 000000000000..44ee3c5f19df
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdcached.init-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Data caching daemon for RRDTool"
+rrdcached_database="${RRCACHE_DATABASE:-/var/lib/rrdcached/db}"
+rrdcached_group="${GROUP:-rrdcached}"
+rrdcached_journal="${RRCACHE_JOURNAL:-/var/lib/rrdcached/journal}"
+rrdcached_user="${USER:-rrdcached}"
+pidfile="/run/rrdcached.pid"
+
+command="/usr/bin/rrdcached"
+command_args="${RRCACHE_ARGS} -b ${rrdcached_database} -G ${rrdcached_group} -j ${rrdcached_journal} -p ${pidfile} -U ${rrdcached_user}"
+
+depend() {
+	need localmount
+	use logger
+}
+
+start_pre() {
+	checkpath -d -o "${rrdcached_user}:${rrdcached_group}" -q "${rrdcached_database}"
+	checkpath -d -o "${rrdcached_user}:${rrdcached_group}" -q "${rrdcached_journal}"
+}
diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
index cdb31d558f75..7c83d2658e6f 100644
--- a/net-analyzer/rrdtool/metadata.xml
+++ b/net-analyzer/rrdtool/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
@@ -8,6 +12,7 @@
 	<use>
 		<flag name="graph">Enable support for graphing functions</flag>
 		<flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag>
+		<flag name="rrdcached">Build support for write-caching daemon</flag>
 		<flag name="rrdcgi">Build rrdcgi support</flag>
 	</use>
 	<upstream>
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
index 1c278a038792..0c1a88cad569 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=true
 DISTUTILS_SINGLE_IMPL=true
 GENTOO_DEPEND_ON_PERL=no
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools lua perl-module distutils-r1 flag-o-matic
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild
new file mode 100644
index 000000000000..d50b50dc323b
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+
+DISTUTILS_OPTIONAL="true"
+DISTUTILS_SINGLE_IMPL="true"
+GENTOO_DEPEND_ON_PERL="no"
+MY_P="${P/_/-}"
+
+inherit autotools lua perl-module distutils-r1 flag-o-matic
+
+DESCRIPTION="A data logging and graphing system for time series data"
+HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
+SRC_URI="https://github.com/oetiker/${PN}-1.x/releases/download/v${PV}/${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0/8.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="dbi doc examples graph lua perl python rados rrdcached rrdcgi ruby static-libs tcl tcpd test"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	lua? (
+		${LUA_REQUIRED_USE}
+		test? ( graph )
+	)
+	test? ( rrdcached )
+"
+
+PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )"
+
+RDEPEND="
+	dev-libs/glib:2[static-libs(+)?]
+	dev-libs/libxml2:2[static-libs(+)?]
+	dbi? ( dev-db/libdbi[static-libs(+)?] )
+	graph? (
+		media-libs/libpng:0=[static-libs(+)?]
+		x11-libs/cairo[svg,static-libs(+)?]
+		x11-libs/pango
+	)
+	lua? ( ${LUA_DEPS} )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	rados? ( sys-cluster/ceph )
+	rrdcached? (
+		acct-group/rrdcached
+		acct-user/rrdcached
+	)
+	tcl? ( dev-lang/tcl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	sys-apps/groff
+	virtual/pkgconfig
+	virtual/awk
+	python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') )
+	test? (
+		sys-devel/bc
+		lua? ( ${LUA_DEPS} )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
+	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
+	"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Bug #456810
+	local mysedargs=(
+		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g'
+		-e 's|^sleep 1$||g'
+		-e '/^dnl.*png/s|^dnl||g'
+		-i configure.ac
+	)
+
+	sed "${mysedargs[@]}" || die
+
+	# Python bindings are built and installed manually
+	local mysedargs=(
+		-e '/^all-local:/s| @COMP_PYTHON@||'
+		-i bindings/Makefile.am
+	)
+
+	sed "${mysedargs[@]}" || die
+
+	# Makefile needs to be adjusted for disabling 'graph' feature
+	if ! use graph ; then
+		local mysedargs=(
+			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;'
+			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::'
+			-e 's|graph1||g'
+			-i tests/Makefile.am
+		)
+
+		sed "${mysedargs[@]}" || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	export rd_cv_gcc_flag__Werror=no
+	export rd_cv_ms_async=ok
+	export RRDDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+
+	# Bug #260380
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+	# Enabling '-ffast-math' is known to cause problems.
+	filter-flags -ffast-math
+
+	# We will handle Lua bindings ourselves, upstream is not multi-impl-ready
+	# and their Lua-detection logic depends on having the right version of the Lua
+	# interpreter available at build time.
+	local myeconfargs=(
+		--disable-lua
+		--disable-ruby
+		--disable-ruby-site-install
+		$(usex !dbi '--disable-libdbi' '')
+		$(usex !examples '--disable-examples' '')
+		$(use_enable graph rrd_graph)
+		$(use_enable perl perl-site-install)
+		$(use_enable perl)
+		$(use_enable python)
+		$(usex !rados '--disable-librados' '')
+		$(usex !rrdcached '--disable-rrdcached' '')
+		$(use_enable rrdcgi)
+		$(use_enable static-libs static)
+		$(usex !tcpd '--disable-libwrap' '')
+		$(use_enable tcl)
+		$(use_enable tcl tcl-site)
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir))
+		--with-perl-options="INSTALLDIRS=vendor"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}"/bindings/lua || die
+
+	# We do need the CMOD-dir path here, otherwise libtool complains.
+	# Use the real one (i.e. not within ${ED}) just in case.
+	local myemakeargs=(
+		LUA_CFLAGS=$(lua_get_CFLAGS)
+		LUA_INSTALL_CMOD="$(lua_get_cmod_dir)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	popd
+}
+
+python_compile() {
+	cd bindings/python || die
+	distutils-r1_python_compile
+}
+
+src_compile() {
+	default
+
+	# Only copy sources now so that we do not
+	# trigger librrd compilation multiple times.
+	if use lua; then
+		lua_copy_sources
+		lua_foreach_impl lua_src_compile
+	fi
+
+	use python && distutils-r1_src_compile
+}
+
+lua_src_test() {
+	pushd "${BUILD_DIR}"/bindings/lua || die
+	LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test
+	popd || die
+}
+
+src_test() {
+	export LC_ALL=C
+	default
+
+	if use lua; then
+		lua_foreach_impl lua_src_test
+	fi
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}"/bindings/lua || die
+
+	# This time we must prefix the CMOD-dir path with ${ED},
+	# so that make does not try to violate the sandbox.
+	local myemakeargs=(
+		LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	popd || die
+}
+
+python_install() {
+	cd bindings/python || die
+	distutils-r1_python_install
+}
+
+src_install() {
+	default
+
+	if ! use doc; then
+		rm -rf "${ED}"/usr/share/doc/"${PF}"/{html,txt} || die
+	fi
+
+	if use lua; then
+		lua_foreach_impl lua_src_install
+	fi
+
+	if use perl; then
+		perl_delete_localpod
+		perl_delete_packlist
+	fi
+
+	use python && distutils-r1_src_install
+
+	if use rrdcached; then
+		newconfd "${FILESDIR}"/rrdcached.confd-r1 rrdcached
+		newinitd "${FILESDIR}"/rrdcached.init-r1 rrdcached
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-analyzer/speedtest++/Manifest b/net-analyzer/speedtest++/Manifest
new file mode 100644
index 000000000000..fceffad21ea8
--- /dev/null
+++ b/net-analyzer/speedtest++/Manifest
@@ -0,0 +1,3 @@
+DIST speedtest++-0.0.20210829.tar.gz 13444 BLAKE2B ac6967d7ed0174e2278c91a8e76012621cc67e51c1722a0d359fc7889b4bc813abb1709b5e482eeef7ff0951be3c697777dc5f2258b099521a08db77c5d7fa40 SHA512 3085adab0f4c94c8e5c3168136094a571d901866352387e9afe0ef386127da6971329bc8f6d8c02efa5f32c8620ccd2482d65dce34da4ca4331b88edf34df2b3
+EBUILD speedtest++-0.0.20210829.ebuild 552 BLAKE2B 6c45d4500a3166822906052a052fc06c71ad93bb78fe2d001a2716cedc2155c75b558854cf6fee7340e0169a43ad202d3d2742ac537303ff4667040998a493bb SHA512 12e6739f30045e17ecec339b39e07f7cff6e3fa90ee359030a60bc6e824025ff26b68fd010fde886d01caf0aed4a39cb4582cdbd7ed44d2d7874f2bc8b0f851b
+MISC metadata.xml 334 BLAKE2B b59a636dc6ac31b21154de67b15a2f4859ceb7c23dbf05366bb092b1acc93f430062e6b6d439b1ea087241a400baae6d2ab1139dfc5093314d2c9ca4a602daa4 SHA512 7a254f0d0958da9ce85b17e05db179dc8f24f6b71954f0955ba7e5ce7c4eab18ee4057681442870afc68230d91970706c7abff9414f570c25a5656d42460435e
diff --git a/net-analyzer/speedtest++/metadata.xml b/net-analyzer/speedtest++/metadata.xml
new file mode 100644
index 000000000000..2c5e2cf3619d
--- /dev/null
+++ b/net-analyzer/speedtest++/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">taganaka/SpeedTest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/speedtest++/speedtest++-0.0.20210829.ebuild b/net-analyzer/speedtest++/speedtest++-0.0.20210829.ebuild
new file mode 100644
index 000000000000..4ccc533381c7
--- /dev/null
+++ b/net-analyzer/speedtest++/speedtest++-0.0.20210829.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="High performance speedtest.net CLI"
+HOMEPAGE="https://github.com/taganaka/SpeedTest"
+SNAPSHOT_COMMIT="0f63cfbf7ce8d64ea803bf143b957eae76323405"
+SRC_URI="https://github.com/taganaka/SpeedTest/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	net-misc/curl
+	dev-libs/libxml2:=
+	dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/SpeedTest-${SNAPSHOT_COMMIT}"
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index 65df804be2b2..555772bdaf82 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,3 +1,3 @@
 DIST speedtest-cli-2.1.3.tar.gz 24771 BLAKE2B 70c604848ffa29ae0a28a636a40ffdd278000c865b243038f773d20a4f6f1c668704505c8bae302d84a0957b2a6ad9d4b303e2e9371b351348d7147ff9a5a67d SHA512 e2ecd9b4eea95e3641045c3da217ec5a39846b26c1f773fdd31c6ffe3cb5e35341320fc1992f865af48afd1a704c4d4224f9ec4048abb69131ee2f32385ae94c
-EBUILD speedtest-cli-2.1.3.ebuild 649 BLAKE2B e8bd11a170f454d5d25919d681fdb96efa090f3abe49534892d950aa4be5cb8ff6cb9d40b898e801ed1a6d505b985f45163425caedfdc7efdab96df417de8637 SHA512 c591006f317b6962ab98f35e7bf9cc3f0a671e9a0038f6d427c80792b8c62e1990643532333a1024316ea90f9eeff598b2b2fad22612d3471f410bb61b48770c
-MISC metadata.xml 335 BLAKE2B 72e20b1d421bf5357a37f50808f5865bfee758446639d6af5e03e52096ccc4be35a9e0b926e6ba01cbbf8151f4094bdd1c2c5bb169d51790ebc78d83a5892856 SHA512 47e2d2e4511e3f0b204a784d3a97badd2c73ee86a731927a1ff4defcc5aac8985094d3733ea6f64330001f331fa67c3fa890d30af90b3ae5dbb98424e28808e1
+EBUILD speedtest-cli-2.1.3.ebuild 912 BLAKE2B 4a150db9591934f0690543e0273c3240675d26b415e908ad0f6c4419fe515f4f7bbaecf70b0bff546ecfeff24766cda1c4d14feef8f6ecb7e3d250cf4d8cb0f0 SHA512 a86767d80c4db52bec315a26cda805f6e95e5308af44a543a3ad172aa65c75f9809c828e5c3038996cb5515de5bd3be5bb68d0796d8967a7d712d42067d7ba03
+MISC metadata.xml 224 BLAKE2B 152f8de76628872c8e5df4d00fbd9f013f9f8fe6d7aaf63ff6d91241e12e8e87a8de988d45b77bb746bc00c43550765bc3f3499209e8ac1df3ff893838b1d835 SHA512 4b1fdd4760f13c81324344d93cb05fb7da27aae7564c29d2b06b4bef9a72c15ee1b392f7565836f73877c45823a30f6921641b3e5ae4dc58cf4d1e3fae1037d6
diff --git a/net-analyzer/speedtest-cli/metadata.xml b/net-analyzer/speedtest-cli/metadata.xml
index 3792bdc2e529..3cd6205ee49a 100644
--- a/net-analyzer/speedtest-cli/metadata.xml
+++ b/net-analyzer/speedtest-cli/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zx2c4@gentoo.org</email>
-		<name>Jason A. Donenfeld</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">sivel/speedtest-cli</remote-id>
 	</upstream>
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.3.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3.ebuild
index 4d4c4eb395bc..31f0010ac79e 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.1.3.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,3 +25,9 @@ python_install_all() {
 	doman ${PN}.1
 	distutils-r1_python_install_all
 }
+
+pkg_postinst() {
+	ewarn "net-analyzer/speedtest-cli is often times inaccurate, especially on faster"
+	ewarn "links, due to its use of the older HTTP-based API. In order to have more"
+	ewarn "accurate measurements, please use net-analyzer/speedtest++ instead."
+}
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 140c7b6da4b6..04aa46a0a17e 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,8 +1,10 @@
 DIST sslscan-2.0.11.tar.gz 110704 BLAKE2B 4d4db6fa7b8f6f611e752d0f97ff1219fcbd064280bc4133dd38d1268cb268847801d25403eeb6bc475579a931e944c9a21d90e40fed6bed2a6a6bc535540f7d SHA512 99681cd8b7240cf85dedfaf210cae11ba3dbf2d56c3fa8ef3f3cdcabb6b29916b640e5955a7876ebb9be36dbe326da303e5bda7537b48743ff0a8c1bd35dbf0c
 DIST sslscan-2.0.12.tar.gz 110785 BLAKE2B 4c7ec58b7e454bb661f05da58eff55dad940ae1a8fb28daf8056114402949e6712e59e13e7128dec0eb45e3e21c2b349e0ac5b2fc7a3a334807b6fc4e2aeb595 SHA512 3758b5e697a1b53e4c574deabfe366d0796d6cb2481a644ec6139cd11e9b4cc2878b094ab9bf4e700ecc73cce6a374a1cf9f487967de3a038dacb985aebee948
+DIST sslscan-2.0.13.tar.gz 111142 BLAKE2B 049791183ebf1e00d11868c0dd7b79eddcd27cbb1f915812938f46837c4b300844c26e0a0bee0a4bee4886f24f7b10e5bc77ddedc86893ae228658ab71d11bea SHA512 50455a4f4a999e63107e705a4bc703b94b30d4fa71b5126cdc08788eedeb02f4c7a204a385fa485f0c9d0fa368c7a48f96c492b91631fe8833b68f20d45b0fca
 DIST sslscan-OpenSSL_1_1_1m.tar.gz 10023608 BLAKE2B a6951bfcddea224a4920f18b7352feb427b979965f8f563b9adf3dc3152133fd44d7a3c490c522986066db6b23c2e878f135a7a9160f564d435e66c2cce0c51f SHA512 af85d15c9db06eb9cdfa9e16ef9f859df752d823aa7c7f0c1b334cd71ba924878c686a65e756fd09c7630b650aad1a2bbe02acdfd6c389b52c2560d32d4150fb
 DIST sslscan-OpenSSL_1_1_1n.tar.gz 10031245 BLAKE2B 8af659fc9eead7b91a7553c17570dabb17d15fb37a77e7eecfa2a9dffc9eb0a331dd3f11a193907d16e535594eb8c31707ae91d91db91e99c75d75bdd43a7774 SHA512 bfe45e4cbe082e45d165212caa8e660c8af68559675c42461aba5685a7baa7e16c9c0096557106706114176dc31142c760fe835022f796e4341eb08d1b20408d
 EBUILD sslscan-2.0.11.ebuild 983 BLAKE2B 58a4c15afea3ec7b7ca0a5a9abbcf34b091387c27713021fd63e52b5dac3f252bb942659b4445b773adff21f29f9c8c289b051ad73d9ae0de0395067f5367162 SHA512 92d02a25e68b9c36fac4d4fdb1b720ce595066c2beb4818c7c127c9f03759a1cbf6fd42e5a8a469bc99ace37305a8904374204178d8272e43cda3c40c229988b
 EBUILD sslscan-2.0.12-r1.ebuild 985 BLAKE2B c60444c030824333de7bde2996904795b5ad690209bb4d05cbf55d737b45f814f8745eb2e11f7222b63b600ece7f5fe5bc294115a699bacda85abe61086ffe97 SHA512 91a2b53f77f1b1f09f2c6546e7a8ac56c07c9b7681c45fbf04a095057c46b00e308a0a49dfabd3353c5e6cf583d3b5e3575563587ff8f668dee88a5081018f16
 EBUILD sslscan-2.0.12.ebuild 985 BLAKE2B 90e92ffd6339ca75f63c6c67408379402af68460c56d067df6682e2cb2abbcfce81afd4d1816e81751bbe4023e83f91df2f39771e0c4815e947ed46b1cfb226c SHA512 6e9aadd016eb0f8dfa9133b12cef5c529e431143fc1d4fa7e4246bf20c1d32d262fd8e983e2898f9045513bdfbed9070ff387cdc5a9f28ac0429fd049210e8c5
+EBUILD sslscan-2.0.13.ebuild 985 BLAKE2B c60444c030824333de7bde2996904795b5ad690209bb4d05cbf55d737b45f814f8745eb2e11f7222b63b600ece7f5fe5bc294115a699bacda85abe61086ffe97 SHA512 91a2b53f77f1b1f09f2c6546e7a8ac56c07c9b7681c45fbf04a095057c46b00e308a0a49dfabd3353c5e6cf583d3b5e3575563587ff8f668dee88a5081018f16
 MISC metadata.xml 296 BLAKE2B b16b4e5a187d36ca8495bd63c691f67ae420fcc4cc742cdd8e477534edbe36414cef5eaa60eca31bdb62b9fbd7a6922754ea0d3d2adeb6d0d4181fefcbe3cb81 SHA512 650f60a88d140869a64a7287d094832e0e553f5d0093d248c3b94f9f3565bed26784ba2e6629128b602c3fcb56496fc4a92d1cd5148acf3b00b72aae22f16780
diff --git a/net-analyzer/sslscan/sslscan-2.0.13.ebuild b/net-analyzer/sslscan/sslscan-2.0.13.ebuild
new file mode 100644
index 000000000000..69df855c7e64
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.13.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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_1n"
+
+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/testssl/Manifest b/net-analyzer/testssl/Manifest
index 9eae04f305b2..20f03e9f27ef 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -4,4 +4,4 @@ DIST testssl-3.0.7.tar.gz 9219774 BLAKE2B d3b6abd5bb46e26ccb13afd9c9440e80fd8056
 EBUILD testssl-3.0.5.ebuild 1508 BLAKE2B afa8231522f3c74583cf7797859ef851eee280702d7d5c642188add2114e2ead7d653e1837f0f973ec77861be077f11ead26a05bd0743e7e8a13a4adf3e998f5 SHA512 8f60fce722b2dc13c5c1079f7434c55fa497261bae039bcceba1ba728c0c39910c87a174f2b58a68be1fc6013c9eeb926ddf208dfc432338f1062323e7a81359
 EBUILD testssl-3.0.6.ebuild 1511 BLAKE2B 327260cf8374e38b0296e34b277f430f0bcf9b175e746e83077712b2d0e4329c2863b1d8594f364d3c039180256dec33651c44a2e2da93366d422748e2dc136d SHA512 56aba1c500c354280909770470b9bb1528dace03ef1862e94e28c2a7762fb749044fbf8a2f5f75e43a088dabaf0153322262978e5de20668cea6f5914368f5ef
 EBUILD testssl-3.0.7.ebuild 1511 BLAKE2B 4894c27fbd011061820d4c1b439aa317a61907315e16ff16c05d9b4a3c4e74a61a2ae65c41348a88dcc91e4ddc9be798cce312b563ba75d20843f8909dff6003 SHA512 de871bdc0786285553bfb8d359c6d42a6b5fa5c4e3f2c712a69096b248eb0e1fc69edb8c0527554dd06bb24c9f1ab3d891c347d4a80edeab5d70e8c7f0c195a0
-MISC metadata.xml 428 BLAKE2B 70142594046143c3a60e555b8e6dd361257c2bcafe57f98562735201a2da4eb2fe56531e9dcb3428259e99809c136732848b48a898ad5c30f6fb84486b40bede SHA512 1eeeda8d3017eaf49471766ae67550453b8097868115d1a247cb4a18bd67df88e78115aaeffbae7c9ce2da139be8eb0cc87d8561534dc8f1192a950580e7cd93
+MISC metadata.xml 460 BLAKE2B 110fe91ebd724eaed5e5cd10273c420b16bd410189b58166a7f922ce5495785d26afe44e7da288c1ee1c17e6740d1fad55d3c0c2d0f325f572f63cd4318539ad SHA512 c30db71d85634df9484b943a4651f0e0d04352ba3c80c84a93ebb5fd538a131817771c8e7d1a51a02f96205449ff23cb5a6567c38ee5c38b6c0743023e5afacd
diff --git a/net-analyzer/testssl/metadata.xml b/net-analyzer/testssl/metadata.xml
index e8cf29fae174..ed6a51a4cbed 100644
--- a/net-analyzer/testssl/metadata.xml
+++ b/net-analyzer/testssl/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
+		<name>Michael Palimaka</name>
 	</maintainer>
 	<use>
 		<flag name="bundled-openssl">Install precompiled versions of OpenSSL for greater testing coverage</flag>
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index d44389a5ac7d..6c844de26c1b 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -1,3 +1,3 @@
 DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3
-EBUILD traceroute-2.1.0.ebuild 879 BLAKE2B 6c29c5ce6a9d8db9e54abeb32b7c61d9f56320d7801ebd13aabe7a1c0996a26be9ca4afcd476228287cabf0a03af321bed53ddd2c5a938be1a1507884e55757c SHA512 a3df9d09cffa1f2106b39871321a0ac6ed106b2447dc22fdb6c97491e756432ab375813d80b75f2af00feab6d27274eb3a0e4918552cdc9824c77cc86604f385
+EBUILD traceroute-2.1.0-r1.ebuild 882 BLAKE2B bc5f3a14a69b655dca15e8119f9c02d49f6d0c30eedd43c5056a38bbb055b7ce7d391f0158bdf88466a249aa16f1dfeb7f487912af3f73f5a1abfa139e570110 SHA512 ac9d9f0f72ca6041f5589449f6beb18aa7fdd8379f2abc81f11d4b165fa05c01e4006c1c74b0dab400e72a79d2545551498478cec21f8203f30d50f5ea19b19a
 MISC metadata.xml 361 BLAKE2B b60204801c379608dfce0a04007e5cee10344c9088df0ca272b2a28ed8ccbdf7b262239667282bd534a8b1e4faa01dc19e9336277fc1aef266a0898fc684357e SHA512 56dc2934532a25edd164a98ac97808388e828b824456e800809c7e2ea45c007d622d0c12366d30acfeb40ead802b287449673d6283330007e4513721e3759263
diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0-r1.ebuild
index 5bc894ba920f..11338e0002b2 100644
--- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 IUSE="static"
 
 RDEPEND="!<net-misc/iputils-20121221-r1
-	!net-misc/iputils[traceroute6]"
+	!net-misc/iputils[traceroute6(-)]"
 
 src_compile() {
 	use static && append-ldflags -static
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 530209d04acf..ec768a38fe74 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,8 +5,10 @@ AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361f
 DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B 3e08d01f2d89f5ddd74c4e2215e6852f30c7419234a45b52a25aa9119995ec2c2882cc3993dce7941e6e73230eb4d295bf0785dda5fe8c3df99f9efdb1e42bfd SHA512 cfef2c3e56279baadb7f41a1f46fde9214a467972f69914c14a8153ea2f2adcb55832413bcaf7a3f8d98b4b62d0574f12144de6c06ff382b4fa8b071903993dc
 DIST wireshark-3.6.1.tar.xz 39632140 BLAKE2B 49a7385946001a3b4a9890751cfea678c8aefcf8180e1a3008085a453d34e458d60d071975eeb585b92c6d9a210b732cc9fdb4fd952f1a9d74decad79c145fe0 SHA512 8b036d623010a5c4ece22de869847b3d999dac1c1e874e957c091a65c18351d9a1cc400828a70caf3c9f9900f8971dc585a5fafb7b08d446cd5d1d68938b0e81
 DIST wireshark-3.6.2.tar.xz 39654296 BLAKE2B 585cf925892ec9d5b6413ccc53c49035eba8a7cd9206f1354f0a808daec9b0f20fc72b3427a2b592f196dd6b2ab67fd35e73d152a20c16fb0f0153c6a03d3156 SHA512 cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070
+DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B 3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd SHA512 4415216f791caee23757f3c754dd88ce8fd8eb8d2d64c1bd011b40c7451a1ef56cf41bcf1cdcf41221f196bf17be550f9271f05b82a017a02cac5c241785b7e6
 EBUILD wireshark-3.4.11.ebuild 7457 BLAKE2B 05a0c93f8b8137ecb865ad4cc5f409685c79ce8dab0694e2d89b18bda7b8760e6162f5bdd4843fb8e5a21c69cfd62608b31fcb707636c8f6592c5664f64ccf55 SHA512 51cb14b1866282aa3bc83d697aaa999d1ab2a839fcf778483bd290f0366f9a105b5f2813c00f67779c1df60a443cfb7243176857e3ee5b91549447a941b75509
 EBUILD wireshark-3.6.1.ebuild 7303 BLAKE2B 9458f05cd1c435afff4377ae7cadab850394529a86388d8ca7f3b7ce59668b69089fd87d50b6eb723d82386492160e43f720976473531c5851de5d6bce1cf391 SHA512 6f89417eabc853120ec481d1b6271832699571372417267099d8b8d487c66917c67df906d4617f76dd4ad0900b8eb75485e3b3adaeb759ed557b77ce25d03a69
 EBUILD wireshark-3.6.2.ebuild 7258 BLAKE2B 32c295bd798526fa0c406e1662e8dc941e402c322696c7d9be524e21a4066b2671d94ffb9e1fe1df854869eab2e9c32c25cf2f43c3a512f2c25fa57af7a1fac7 SHA512 59fdf0864bf220784ced5496adc1bd15a6e0a6a992fedd1e3138e38221734b0a97c704b7dd750477990c3a81153878c7275c9486cae5b0fd2a38d06243119431
-EBUILD wireshark-9999.ebuild 7263 BLAKE2B 40e92053e2153567197333756bd75dfaeacb1810011086bedec392054184697f9b60fc8f33814419884b028a07de0117728de29af6b4da1f5fea5c296383f151 SHA512 07fb21d14891731a3c0d8ca5e4782f5c1ca9afbd58bf3bb10298b129c57f6f24cbd261bbfd1631b77bea9316a876c44070ba4c7fe85ee787eb4e31d0902f2fc4
+EBUILD wireshark-3.6.3.ebuild 7093 BLAKE2B daf09c0202ee8341eed953d7b353569796a719fdf2c85a1534976a595fa5a73a762c7591c52520aa39b84c7afd2816372dbd97ca245ae64f9ced25b2cbe0613b SHA512 9c6ad980e9cee76e577ed5b51890f92865b0e095eebf57a6b0234c55bc7c645d2f6b58763b6cc1fda18715604f44757408f4a0249ba85ef31dda12b3dcaf574f
+EBUILD wireshark-9999.ebuild 7073 BLAKE2B 4de204e4e91d076ddf44ec6ed29fb1e1a007a23fd3107cc760cdd7ac53abb00c3f3ba5c23ec703423e36a88cccb764985a3e21e728d6a8589744831dc7100dbe SHA512 42359be522e8c1482b8f257f474e641baf6d753aefcd081d615505b5a58e25b45a456d9c360a9df8dfef9c45a220b11e6c0c72bf228109ee2f113a52e9f39adc
 MISC metadata.xml 5328 BLAKE2B a030872929b89f0ead3794d8bbff20354b3a1b7a35aa7c3ce37baf5170ced9d39bdc665bd23e03e70d94550085a88224ec6cd260679b2d01501b272c595442d0 SHA512 cbadc90c858ef008b763253ef548e3634643b98bf90069b3fa34bd4f947d93ee8d4a2f3c6d9c7fe4c93b4169e34681e00905b28e64f8edcff02f23867d75b265
diff --git a/net-analyzer/wireshark/wireshark-3.6.3.ebuild b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
new file mode 100644
index 000000000000..76a4a4ef4420
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg 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 ~riscv ~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"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	plugin-ifdemo? ( plugins )"
+
+RESTRICT="!test? ( test )"
+
+# bug #753062 for speexdsp
+RDEPEND="acct-group/pcap
+	>=dev-libs/glib-2.38: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:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	test? (
+		dev-python/pytest
+		dev-python/pytest-xdist
+	)"
+RDEPEND="${RDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )"
+
+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+=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
+		$(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
+		# extcaps needs a bunch of external programs
+		-E "(suite_extcaps)"
+		#-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_pkg_postinst
+
+	# 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."
+}
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 7d40549271cb..3c9c26865ea3 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 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
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
@@ -207,8 +207,7 @@ src_install() {
 
 	# install headers
 	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h
+	doins "${BUILD_DIR}"/config.h
 
 	# If trying to remove this, try build e.g. libvirt first!
 	# At last check, Fedora is still doing this too.
@@ -233,12 +232,12 @@ src_install() {
 
 		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
+			newins resources/icons/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
+			newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
 		done
 	fi
 
@@ -248,9 +247,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postinst
 
 	# Add group for users allowed to sniff.
 	chgrp pcap "${EROOT}"/usr/bin/dumpcap
@@ -265,9 +262,3 @@ pkg_postinst() {
 	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/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 30381601aea3..e0ee55113bdf 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,5 +1,8 @@
 AUX zabbix-3.0.30-security-disable-PidFile.patch 1378 BLAKE2B c1efdfd0b223987c9d9bf1a3f7731f0bdfeb42d1641bbf4387d70ece757f5cb2fb88bafb87f6938a5efbec091f73d5fde0450e8aa0edc3143d589df5efbe5d19 SHA512 854b198b980e4b58dc6149e285bfa6361ab2a10b83a6d8f07b46754316d6764669e68da8018b402b59317ed95b50a13d25f68f28c4c33d76f0ef1e8dedc8da99
 AUX zabbix-4.0.18-modulepathfix.patch 330 BLAKE2B 99b3f1082e220ff842e4c4c86e8fcf57666443dd1e124412f167548ab886352077e1f0548e49cf77f28a51d20cc37dc980448eb87c9e7814ac73dcbfe43388e0 SHA512 75330dddde2f47553ac6a6f71d6f2383ab34c0d64ac5dbe45dd31707d8797d1400215d698072df3a0f0eaf862f00509791a6a0eaa43a0f686657d885c03465b5
+AUX zabbix-5.0.22-system.sw.packages.patch 1573 BLAKE2B b0105ba6ddd6d503e4be8829422496c0e38cfbca2e8a72548a7f25e94a3b603a378d15cdceb08a5a3ea652d8a6b70ac7772be04c1fc28e38a8501f985f5bb18b SHA512 813b643d43c48a2a69245aaf8088acf2873d0686754bdc1c85f1034aee21b97a1637497c0ce013a93aff3b2832104b11c883f1188db8cb46f2aa8c8d6a149315
+AUX zabbix-5.4.12-system.sw.packages.patch 1573 BLAKE2B 7aa96aa88a1783b94dc81b0253cf2094490547b49815ef73fa1c6e2d5742590ffbcf1ea064a506ef397300636e012a61416ffb4d0fb2eaecf186375556dce0d7 SHA512 7d56bfc332d1b07e12d59ec4c3279ed387f7cd6f71e8d119e68e9380283d91b739c2a9a585be62a147af08e4d1ac933f0a99dab411b22fb86e88c069a160d2ed
+AUX zabbix-6.0.3-system.sw.packages.patch 1573 BLAKE2B 891fc64ed00e3d3d85ee360a04ff285a0efe1aa0720605ebcfe9fd99dca3b94ca8a5809995a944543f0c3dc56e418db809aae73236d822ae50d5e4cda4857374 SHA512 bf3b0ad920008ef907f1c5218f5000cfc3cbacca1b2ffb161ff7c63cf9209144c6efc648822790d4fe3cc2e309e4fc198a2c6a088eec1b57d036cd636989841f
 AUX zabbix-agent2.init 507 BLAKE2B 6235831aca66cb2b097c0260ba8c0151c4a98fadc836cff14a248a77f5a0d013b5e6cf56605f63c9b41541daad4f842da74d80658f0a20b38be507909605af77 SHA512 91eaac170c9234229f2969b0d899dc7ffc21aa99aa8b3593b91f52afe786f6cc81c1279bf78b4456c8e462cea924630ee87e4ce7d6f2128c42e778907751e98e
 AUX zabbix-agent2.service 277 BLAKE2B 46ec792441c57c6fb7cad391d736672a3d93cbb9c92c5e3d90de3a5c7502a789359bd9752b8740fd73a626e4ed96272231730a87b179a4e0d13f8fb48571f606 SHA512 8f467e9d7a4ce82dc387ef1ef6ac8c39e943d0bbce938e186bdfa7e207959d9159a9d446b30d39d627b7400ceeb9c4d322b06ad063b42d0edc5bbef4043230f7
 AUX zabbix-agent2.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
@@ -266,10 +269,19 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST zabbix-4.0.38.tar.gz 17558387 BLAKE2B 1ddf27d76734128ddd197eb9dffeb59018282464a7322973dc4102992c0ade003d4d0291194f5b5a487d83a702917d6f0036636e56acc424bd7a7d6beb3f787c SHA512 0d38a74336c9e46b3f9985aca3508312dd5b15affeadee3497ebf8d5e59b4fa7b99ff28819b01878cbc5c9c304c1992a6a91d73f35bf1a333ae2ee561e0d7e1f
 DIST zabbix-5.0.20.tar.gz 21434290 BLAKE2B 8203d9f8831c081af05fa306ce3363ea3d1afd72587459a941e2a20de27e97dce21e34b59e21884f87f6238469c2293dad9e6e5436a9ef82c0139a18a4b0c206 SHA512 af625ee69926b1f0860d4e5e5f4348b3630c642027f5f08f876207cf705d46741c21aacbdde1367b8014c705508236281ba8556700de43c1ccf2b7a9b7f68390
+DIST zabbix-5.0.22-go-deps.tar.xz 34395200 BLAKE2B 3065878d5d61617f52ec48381a248ea13a603c13bb1cc18b6fde4e81f47bfd9dc4bafe34303e4bb46f1d7e9809d0b17acf48b782c11162fdcf04f0de89402f2b SHA512 fc30d33066248fe7c9049fec7538e1d1880d9c23d10516032027ea90e90a7531288990a33a48cbab2722a6ca67f49f79507cce7351d2c026317fc58843d4868e
+DIST zabbix-5.0.22.tar.gz 21245241 BLAKE2B d2343fc5dbc4112ef77c75bd00b8344a363a8e2acc6623a009ebd24d7116377a66d2ca94f22dee386fbee1fa9822ce7e08287cb1336fe939bd2b621fe57b5b1f SHA512 d326ed5dd81b44adf80e8cc01d32b3b7ebed0b8ffddc2870e76ffcd010513f2b2bbe4586681e5c5ab5202f88c7861078efad537bb852ee52d5c00b7712cc2aab
 DIST zabbix-5.4.10.tar.gz 24510838 BLAKE2B 37e8561e031b9267dbfeb786da7d88487142262c3f9063e83b2faafeabd88baa1a0f2e7ffa333d2e29c1b11e09ca995f42442aa60b0b994617b276152d46590c SHA512 452513c56db1778d49a32543814ed83836b480047ebc747e588b5cea8f9b199650824b9ea2042695c5551a81f1f3b2e8d98d0f658003f483bf8edf8ed5427c48
+DIST zabbix-5.4.12-go-deps.tar.xz 35810488 BLAKE2B 26a7995bbe6b40a1912f90e1ea572a0de96f9182928d2401054fc1935c9ecac25ee90cb44c7b1b0f71a8c56e4477752b2bffebca7a331fbdc341a7a9ca1eca6c SHA512 bd5882b1bfc4d75c2b42170bbab5cca5e8795f3ff001b62444faf5d1601c5ef54da0198c83253fefd5c2c465f78a9ddb2a4aa13699d198337af935a80756c991
+DIST zabbix-5.4.12.tar.gz 24513065 BLAKE2B fe289b58384c9b956fcbada940220c5288022457b7eb5b0a7ce2f86df777e2d84a45fc4d4f17f43aecac4466dc0e9d9941e0070cd00b3688b26821123d2301da SHA512 5f4862540e15f88efa52002b9ec6d7251a35e94f8e5f6f8b6090f5827a574411c813732a88a08fbcc3c24033011d678b953a7a78260aef702454269537232c7b
 DIST zabbix-6.0.2.tar.gz 33082787 BLAKE2B 53bd7574683e1166aa223ba5e992d951b5a1f1fc14e6555ebe402eb5e9f4845c3e9edc01c78e230d7120289b0e6c9a5ed87865c0541fa5095f23f6b6916defd5 SHA512 618b1705f4e1689af4d234e877ea4136d52de39bfedf6512f396b79278750bfaf994d132a7876420705690045bee78ebc2c7297ac31ac4ddd92f00d8f781267d
-EBUILD zabbix-4.0.38-r2.ebuild 9414 BLAKE2B c4cc2fdc8e82909eff884e40e1a5fe962d83bd61d08ea3f485f07fdd2f64722ad66a3abdc72ba0fe30f5501f0729724aa971b5831610bafeba8b736b7fba9e89 SHA512 a54ccc5c526f71306a296f2693f459e6d92ce9056d20cb0813e4432b8ca031c780ec1a0a5c5f4b125c6e359ca3d55598b725069e15f0af552b9844e08b6b536d
-EBUILD zabbix-5.0.20-r2.ebuild 31324 BLAKE2B 003493f10ec73fbc689a10b8d177f137d8e8717643bdae07e5f086db868240d9ff73d9d1459486ed58d6e9e397e05dcde473f63f5655cc858a3cad0173f7149a SHA512 c72b0e41984572cabea5f0ede4334f96af8096259d7329ecd1da2d36e391dee2e0ac496234afe145979c3112dbbdb91acebf43fb1075114ed354baee18a89d1b
-EBUILD zabbix-5.4.10-r2.ebuild 33714 BLAKE2B 3349b796e58d6945b0ae08a9f095e12817d9ae89e4a5299527d506c2a53857376ad70af8e55f56629417f92116f6b635e6542fc9631484d5f655b3b2b7694fc7 SHA512 1b390fa2038eeda425762290fbe72f9f8e249dfcbed4e6531a2e2139af15b48b070c7d6a17cd2a875d3839fdfa895749750f4e16d0416e646f9359408338fdd2
-EBUILD zabbix-6.0.2-r1.ebuild 35389 BLAKE2B 360fddb08c89a51a651716c18c2e1b563d60370b60acba6b56b551a42eeb3ad884daa69e4f307da8fb13435459c1107af416a29f4f81123bada2e523b9ab4fd0 SHA512 d601b6b1aa2babe6104cc710d7533f453cd391002f22f922bae25f8a8b0e6819b4f6c36e3cc5b65d2da8609601deb61eb08be5a609a68de18ee654282b0daedd
+DIST zabbix-6.0.3-go-deps.tar.xz 35806596 BLAKE2B bf86722b1ee26237e42b4b3b5558415e0eb29dbe675b70585c8bb06c0b1e469ed9887e425778503c1d42ee2bd938b085f544d0696d080e04957dcb5794b7afa4 SHA512 0a5a051561dee2f3e42f18fff9127e3c8a0b5a7cae3a828a880866feac81a21ef71ba83c53f9e5a37fb3eee78475974b2f30ba5398012aeca6adf8d3cea74399
+DIST zabbix-6.0.3.tar.gz 33135282 BLAKE2B d2cb50678710e96737e72ddb4b0b02d4695f872df6cab2edfd50d343ffc0103eec3191bfa02d8421e29c583f6d478598effc22a0f8d3f76b57a9ac3b4e4369fe SHA512 f93a7b4b19d2a1561e42ef67378bfb94a5edaae5b9bba8f2214de3bad1bf9d7efcb32da9f1b3ee820cc6bdc68308286606c4ceb7e1ba0ab42e24045c56f8ce47
+EBUILD zabbix-4.0.38-r2.ebuild 9387 BLAKE2B 2daf464895d6232c3cfa301b4fd55b895eed1e37cbfa9349398b430bedaab657413e2c12f04bcae4e23782cedef347560edecde1503531d18b4203040e7b07f0 SHA512 39e1563e5aec3c88c9cc3b23335b0db7c6201755a7ffa15eaee02b23838081d81c345e1bdfc608efcd2f6fb5d3306a863701f29c44ce0fcff8930579bc0345a5
+EBUILD zabbix-5.0.20-r2.ebuild 31298 BLAKE2B aa61dc8c35d777638299a4247f45199deb3a44fba918cc30bd97d6973fc182eea19cd72249fdc2d082348e44b095bbffdc5d474a25e234e119d027a4c5ae3b3c SHA512 6388cadd76d85c5be57e1749cac047be589aea282883a8d2aa9e6f371c0b18fc3d00bba5d70b393531cebf0881c19f18d40e04a9d6851195a5f07dbc01b5c8fe
+EBUILD zabbix-5.0.22.ebuild 9959 BLAKE2B f7cb1dd9d0637879bfd848c0a3342fa55da1e0ec85d786a08b0e7fccff425ff3248895270371251cfcdf4fc588987932c90f05f00f489914a27119c397e98c83 SHA512 a1bc2110b8e1bfcb9a4aca805df1f0e3d7e934613574991264bbb828a721c0a45484c1a15c0e278b7ab18707bec58b481c572a4967980841422288d5283fac52
+EBUILD zabbix-5.4.10-r2.ebuild 33688 BLAKE2B 38b38eb859df5b81ddeb4976d1571aafda2f23f7186c582e244b715f5e26508231042387130cb8bd4116edd3bf8b7d6ed58807fa03946b38cd7d707fa3fc10fc SHA512 1cce617a3162407a1add3b1f31ad184cfcbd4f15e05ff51fe9698cf1d0695775217385f0f6a7b7f8db6413159199d783e5c72c536c191b7a7cc4eb9cca62f395
+EBUILD zabbix-5.4.12.ebuild 9998 BLAKE2B c703656bb60f2bc6f7d5963e89d8b2ab836c1fb2ada1fb020ff5a60587954ed6a989d597cb8da8ec7787487a1aedf190d486856891eb63c8c22ff704b060897f SHA512 d2eadc0f2d0a5a3bfb46d6f275aaa56988845cbc54e01104f9aecc7cabe8b78b32ba62bf4738431108ea9bbc302b60789b72645dcd1c86858b46e74136f3b767
+EBUILD zabbix-6.0.2-r1.ebuild 35363 BLAKE2B 85f43352e26b63ad09363594930ab88fa74462a49eff7fd389fdeae8cfbba4fda6dfc816f72aa940a00fb93fbdcf182ea83b2d6c09781b52fe106aaecde652b7 SHA512 7ba4ee5500c56115ff8c26af2787c882573ae0ddc34526279d39ac7b971e417766b8a7a8772156c957a746b628f22a904bde47398f72c15485a61eabd70fdb50
+EBUILD zabbix-6.0.3.ebuild 10506 BLAKE2B 2b638e655cefc10aad589b4e629c3cab7e4b32ef7aeb0c702d454fcd3fe45bf3916b4218dee0cf433b5ea9ed657302ea6e64753bdd4121216af74423646f2b2c SHA512 da073199e15662e0a08118feedea310fdf7acaea0abb82c4a1ae4e965b606245636102776fe82a4a9f0816daa445244605c07d45f5768068cf9a1f93108adcf8
 MISC metadata.xml 1713 BLAKE2B d0c1fe7a3627dca5b11601ac5bc360f43476d4a14aefaa7eae021faa636cdd5b5054a4556c8c81933ad6d3638781942e51c01a550463e7b14946004fa8be3366 SHA512 8e5be31d41c1f749cda5b889ec7a1185428d88e21201c02d7066b4416ba3c6d4a9ddc23812e7caeb313dbc2b3ad7c9fd39eae141498ed137b8048fd41d6520d8
diff --git a/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch b/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch
new file mode 100644
index 000000000000..353dac72b876
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch
@@ -0,0 +1,35 @@
+From 884982a87fc14918b062f09aa2bc3f8d2f777a14 Mon Sep 17 00:00:00 2001
+From: Alexey Shvetsov <alexxy@gentoo.org>
+Date: Mon, 21 Mar 2022 11:23:54 +0300
+Subject: [PATCH] Allow to use system.sw.packages on gentoo linux
+
+Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
+---
+ src/go/plugins/system/sw/sw.go       | 1 +
+ src/libs/zbxsysinfo/linux/software.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/go/plugins/system/sw/sw.go b/src/go/plugins/system/sw/sw.go
+index f0e4df0b55c..dda25380f40 100644
+--- a/src/go/plugins/system/sw/sw.go
++++ b/src/go/plugins/system/sw/sw.go
+@@ -164,6 +164,7 @@ func getManagers() []manager {
+ 		{"pkgtools", "[ -d /var/log/packages ] && echo true", "ls /var/log/packages", parseRegex},
+ 		{"rpm", "rpm --version 2> /dev/null", "rpm -qa", parseRegex},
+ 		{"pacman", "pacman --version 2> /dev/null", "pacman -Q", parseRegex},
++		{"portage", "emerge --version 2> /dev/null", "qlist -IRCv", parseRegex},
+ 	}
+ }
+ 
+diff --git a/src/libs/zbxsysinfo/linux/software.c b/src/libs/zbxsysinfo/linux/software.c
+index 2ee885ac14a..c950e65d607 100644
+--- a/src/libs/zbxsysinfo/linux/software.c
++++ b/src/libs/zbxsysinfo/linux/software.c
+@@ -176,6 +176,7 @@ static ZBX_PACKAGE_MANAGER	package_managers[] =
+ 	{"pkgtools",	"[ -d /var/log/packages ] && echo true",	"ls /var/log/packages",		NULL},
+ 	{"rpm",		"rpm --version 2> /dev/null",			"rpm -qa",			NULL},
+ 	{"pacman",	"pacman --version 2> /dev/null",		"pacman -Q",			NULL},
++	{"portage",     "emerge --version 2> /dev/null",                "qlist -IRCv",                  NULL},
+ 	{NULL}
+ };
+ 
diff --git a/net-analyzer/zabbix/files/zabbix-5.4.12-system.sw.packages.patch b/net-analyzer/zabbix/files/zabbix-5.4.12-system.sw.packages.patch
new file mode 100644
index 000000000000..54a5299ee791
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-5.4.12-system.sw.packages.patch
@@ -0,0 +1,35 @@
+From ee5ed14f0f858eb0f776f5b8c4c1a1e740787bfa Mon Sep 17 00:00:00 2001
+From: Alexey Shvetsov <alexxy@gentoo.org>
+Date: Mon, 21 Mar 2022 11:23:54 +0300
+Subject: [PATCH] Allow to use system.sw.packages on gentoo linux
+
+Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
+---
+ src/go/plugins/system/sw/sw.go       | 1 +
+ src/libs/zbxsysinfo/linux/software.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/go/plugins/system/sw/sw.go b/src/go/plugins/system/sw/sw.go
+index 6ff354fd711..db9a4b763f7 100644
+--- a/src/go/plugins/system/sw/sw.go
++++ b/src/go/plugins/system/sw/sw.go
+@@ -163,6 +163,7 @@ func getManagers() []manager {
+ 		{"pkgtools", "[ -d /var/log/packages ] && echo true", "ls /var/log/packages", parseRegex},
+ 		{"rpm", "rpm --version 2> /dev/null", "rpm -qa", parseRegex},
+ 		{"pacman", "pacman --version 2> /dev/null", "pacman -Q", parseRegex},
++		{"portage", "emerge --version 2> /dev/null", "qlist -IRCv", parseRegex},
+ 	}
+ }
+ 
+diff --git a/src/libs/zbxsysinfo/linux/software.c b/src/libs/zbxsysinfo/linux/software.c
+index 24f8e93eed8..8dcf01a3e47 100644
+--- a/src/libs/zbxsysinfo/linux/software.c
++++ b/src/libs/zbxsysinfo/linux/software.c
+@@ -176,6 +176,7 @@ static ZBX_PACKAGE_MANAGER	package_managers[] =
+ 	{"pkgtools",	"[ -d /var/log/packages ] && echo true",	"ls /var/log/packages",		NULL},
+ 	{"rpm",		"rpm --version 2> /dev/null",			"rpm -qa",			NULL},
+ 	{"pacman",	"pacman --version 2> /dev/null",		"pacman -Q",			NULL},
++	{"portage",     "emerge --version 2> /dev/null",                "qlist -IRCv",                  NULL},
+ 	{NULL}
+ };
+ 
diff --git a/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch b/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch
new file mode 100644
index 000000000000..2649e118151e
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch
@@ -0,0 +1,35 @@
+From 1869f67549ea9491377269ef11a99ed5fc38e3cc Mon Sep 17 00:00:00 2001
+From: Alexey Shvetsov <alexxy@gentoo.org>
+Date: Mon, 21 Mar 2022 11:23:54 +0300
+Subject: [PATCH] Allow to use system.sw.packages on gentoo linux
+
+Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
+---
+ src/go/plugins/system/sw/sw.go       | 1 +
+ src/libs/zbxsysinfo/linux/software.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/go/plugins/system/sw/sw.go b/src/go/plugins/system/sw/sw.go
+index 0abaf05fb3b..1d8a94b5924 100644
+--- a/src/go/plugins/system/sw/sw.go
++++ b/src/go/plugins/system/sw/sw.go
+@@ -165,6 +165,7 @@ func getManagers() []manager {
+ 		{"pkgtools", "[ -d /var/log/packages ] && echo true", "ls /var/log/packages", parseRegex},
+ 		{"rpm", "rpm --version 2> /dev/null", "rpm -qa", parseRegex},
+ 		{"pacman", "pacman --version 2> /dev/null", "pacman -Q", parseRegex},
++		{"portage", "emerge --version 2> /dev/null", "qlist -IRCv", parseRegex},
+ 	}
+ }
+ 
+diff --git a/src/libs/zbxsysinfo/linux/software.c b/src/libs/zbxsysinfo/linux/software.c
+index 749deaa9258..3a6ee97ec4c 100644
+--- a/src/libs/zbxsysinfo/linux/software.c
++++ b/src/libs/zbxsysinfo/linux/software.c
+@@ -177,6 +177,7 @@ static ZBX_PACKAGE_MANAGER	package_managers[] =
+ 	{"pkgtools",	"[ -d /var/log/packages ] && echo true",	"ls /var/log/packages",		NULL},
+ 	{"rpm",		"rpm --version 2> /dev/null",			"rpm -qa",			NULL},
+ 	{"pacman",	"pacman --version 2> /dev/null",		"pacman -Q",			NULL},
++	{"portage",     "emerge --version 2> /dev/null",                "qlist -IRCv",                  NULL},
+ 	{NULL}
+ };
+ 
diff --git a/net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild b/net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild
index ca071b57775d..235e44ac1c32 100644
--- a/net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild
@@ -16,15 +16,16 @@ LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
 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"
+IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static xmpp"
 REQUIRED_USE="|| ( agent frontend proxy server )
-	ssl? ( ^^ ( gnutls mbedtls openssl ) )
+	?? ( gnutls mbedtls openssl )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
 	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	static? ( !oracle !snmp )"
 
 COMMON_DEPEND="
 	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
 	java? ( >=virtual/jdk-1.8:* )
 	ldap? (
 		=dev-libs/cyrus-sasl-2*
@@ -32,9 +33,11 @@ COMMON_DEPEND="
 		net-nds/openldap:=
 	)
 	libxml2? ( dev-libs/libxml2 )
+	mbedtls? ( net-libs/mbedtls:0= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
 	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
@@ -45,11 +48,6 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp:= )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0= )
-		mbedtls? ( net-libs/mbedtls:0= )
-		openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	)
 	xmpp? ( dev-libs/iksemel )
 "
 
diff --git a/net-analyzer/zabbix/zabbix-5.0.20-r2.ebuild b/net-analyzer/zabbix/zabbix-5.0.20-r2.ebuild
index 3889c0523dca..246d9c914b38 100644
--- a/net-analyzer/zabbix/zabbix-5.0.20-r2.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.20-r2.ebuild
@@ -236,15 +236,16 @@ LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
 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"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
 	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	ssl? ( ^^ ( gnutls openssl ) )
 	static? ( !oracle !snmp )"
 
 COMMON_DEPEND="
 	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
 	java? ( >=virtual/jdk-1.8:* )
 	ldap? (
 		=dev-libs/cyrus-sasl-2*
@@ -255,6 +256,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c:= )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
 	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
@@ -265,10 +267,6 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp:= )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0= )
-		openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	)
 "
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/net-analyzer/zabbix/zabbix-5.0.22.ebuild b/net-analyzer/zabbix/zabbix-5.0.22.ebuild
new file mode 100644
index 000000000000..f9b28fd08a09
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.22.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-5.0.22-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable agent2) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with gnutls) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-5.4.10-r2.ebuild b/net-analyzer/zabbix/zabbix-5.4.10-r2.ebuild
index f3cbcfae8bc4..6ff943aa06b6 100644
--- a/net-analyzer/zabbix/zabbix-5.4.10-r2.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.10-r2.ebuild
@@ -261,15 +261,16 @@ LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
 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"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
 	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	ssl? ( ^^ ( gnutls openssl ) )
 	static? ( !oracle !snmp )"
 
 COMMON_DEPEND="
 	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
 	java? ( >=virtual/jdk-1.8:* )
 	ldap? (
 		=dev-libs/cyrus-sasl-2*
@@ -280,6 +281,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c:= )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
 	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
@@ -290,10 +292,6 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp:= )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0= )
-		openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	)
 "
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/net-analyzer/zabbix/zabbix-5.4.12.ebuild b/net-analyzer/zabbix/zabbix-5.4.12.ebuild
new file mode 100644
index 000000000000..9596c2fd9618
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.4.12.ebuild
@@ -0,0 +1,387 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-5.4.12-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		"$(use_enable agent)" \
+		"$(use_enable agent2)" \
+		"$(use_enable ipv6)" \
+		"$(use_enable java)" \
+		"$(use_enable proxy)" \
+		"$(use_enable server)" \
+		"$(use_enable static)" \
+		"$(use_with curl libcurl)" \
+		"$(use_with gnutls)" \
+		"$(use_with ldap)" \
+		"$(use_with libxml2)" \
+		"$(use_with mysql)" \
+		"$(use_with odbc unixodbc)" \
+		"$(use_with openipmi openipmi)" \
+		"$(use_with openssl)" \
+		"$(use_with oracle)" \
+		"$(use_with postgres postgresql)" \
+		"$(use_with snmp net-snmp)" \
+		"$(use_with sqlite sqlite3)" \
+		"$(use_with ssh ssh2)"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-6.0.2-r1.ebuild b/net-analyzer/zabbix/zabbix-6.0.2-r1.ebuild
index 86873018cb18..cbc8364059c0 100644
--- a/net-analyzer/zabbix/zabbix-6.0.2-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.2-r1.ebuild
@@ -272,15 +272,16 @@ LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="~amd64 ~x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh ssl static"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
 	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	ssl? ( ^^ ( gnutls openssl ) )
 	static? ( !oracle !snmp )"
 
 COMMON_DEPEND="
 	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
 	java? ( >=virtual/jdk-1.8:* )
 	ldap? (
 		=dev-libs/cyrus-sasl-2*
@@ -291,6 +292,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c:= )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
 	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
@@ -301,10 +303,6 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp:= )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0= )
-		openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	)
 "
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/net-analyzer/zabbix/zabbix-6.0.3.ebuild b/net-analyzer/zabbix/zabbix-6.0.3.ebuild
new file mode 100644
index 000000000000..39e9e4e7959c
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.0.3.ebuild
@@ -0,0 +1,404 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		!pcre2? ( dev-libs/libpcre )
+		pcre2? ( dev-libs/libpcre2:= )
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	local econf_args=(
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	if use pcre2; then
+		econf_args+=( --with-libpcre2 )
+	else
+		# If pcre2 is not enabled, then use the old pcre library.
+		econf_args+=( --with-libpcre )
+	fi
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+
+		if ! use pcre2; then
+			ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
+			ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
+			ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
+		fi
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-04-06 22:33:41 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-04-06 22:33:41 +0100
commit	e68d405c5d712af4387159df07e226217bdda049 (patch)
tree	009ab0f3d427f0813e62930d71802cb054c07e30 /net-analyzer
parent	401101f9c8077911929d3f2b60a37098460a5d89 (diff)