gentoo resync : 21.06.2020

39 files changed, 1407 insertions, 347 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 351bedf9fdab..1c860f4048fb 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 736197fa7f6d..d1e90bb65f48 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -3,9 +3,6 @@ AUX arpwatch.confd-r1 559 BLAKE2B 291acbd1ebf7ab4f9f6ca19dfe1b445fc610c1b0961c89
 AUX arpwatch.initd 991 BLAKE2B db231172f24c10bcff5c78d081c7de0918c10878e47fccbc9c4ea73d6b70404308864de5822ae97c0c1c94d6b17cc8c183807c33db7140e1ecae88b9df79ea3c SHA512 de62ab2026bb04f557731b741023b6fc2333656f4709226459e8bb17fee2959ad9e24077eae730443efa3736b6f0268c474ca65905c371d228c2f2869ec4986e
 AUX arpwatch.initd-r1 752 BLAKE2B ba0adcdc9c02ff0b60c46f9bd98c100171b365ca4d50f9345b0d9b983aeb299e51849eb04b0df0627252ab65db1adf706f181aee61f471a1af87a3c1b3653e80 SHA512 735e284132aaa2125d7b248c81a27be2208963d84b7b434f251ee3f7a350e81c9e3cff58bc812bebd26450b711322c188876e96d6638a4ba3dbde4e8fc040c04
 DIST arpwatch-2.1a15.tar.gz 202729 BLAKE2B b583dea83c57a55b8705f0265c1324de270571468dc9f2e1d5351fd53340f7636f1d00e3de24caa9747384697721e6227e5e6de4b3827e5ac7adef4ce524fffd SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90
-DIST arpwatch-patchset-0.7.tar.xz 132868 BLAKE2B 502d1493930ad905cd42bc76ec9b92a37811dce9829d69e8703d23039c5ab32a61da3cc1a399464b3edc71a2e020756ce2b9c5a069d10f809c21870add9a7f73 SHA512 2cbfa37acd29c30232da9ad0a742ddc9cd35c228fb786c6798555962841006ba0f47e31097722a3303e25f2e7c665b6e93707e49c02a8a9171b484b56a133e00
 DIST arpwatch-patchset-0.8.tar.xz 131692 BLAKE2B 8db242f7c74c8fee0700e12e8ff028fcaa336e5feb61514b44a892a132779c11d1ca3ce2fabee3cbcbbdcb0dae0ed470daa786a91619c18e24066f11da126bc4 SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0
 EBUILD arpwatch-2.1.15-r11.ebuild 2212 BLAKE2B 256c4c6ec2122cd1a6eda7272afa4cecbb46625ccda72117cf949faeb589ef74d089923a036bd3fd0ef057bc549a692dc150132aad92bff14b3d1cd1d54fef94 SHA512 b51f3752058eab0ac532d11157c5f9d5f65f0dda01f6d396b13b39d668f424cad3290baaddbfaec2c2edd718010aa95806f7e32f04dceb44a68f7a26382366be
-EBUILD arpwatch-2.1.15-r8.ebuild 1375 BLAKE2B ea7a95aa5dfb0d1f46820bba13da044476e1395a7a22f0b13dd70fbee1824a763d24797ade3d7c74093cbb4c81aad9420a16978716f6210ca35d6a8c364ea89e SHA512 d7228a4473f28162ca9c50b74538ad461193a44db4f583dfa3fe20475a3837f6ef90e096e073396d3932580c8333cfb2675f7d48bf309642847c6d18e8ea81cc
-EBUILD arpwatch-2.1.15-r9.ebuild 1357 BLAKE2B 5c18e76a61fb2ad63e7f999bc326fc370cfbc0816a597f2f603b5b4e09214b93326a0340334e55e3edecb03a4934eec6093a47ca305c75c8b6ac4e76eddd1458 SHA512 19e8abb183a16693af2d595798f19cfbcc44ce855c8ae4db5a55b298421f98a95d39be94208a16b66c3106735afeac491588be75ca601171eb98a46016a39d8e
 MISC metadata.xml 741 BLAKE2B 63f289064fdfc3164a8c2651f783e851c42c062996e4e916e69ece25c5a0892030a07aaaead7b2fc14e6708128bc48e4321d30fedca97d09efad66a2340e3897 SHA512 0db051d36fb16c5a50239a243ca46f686e71b13387330bf98df46c9af3389d16e9842b89c15d2e6fb3fba867e5a0b36a2fd745480588ba621e117ee86aadbd00
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
deleted file mode 100644
index cc30e77d1ac7..000000000000
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user versionator
-
-PATCH_VER="0.7"
-
-MY_P="${PN}-$(replace_version_separator 2 'a')"
-DESCRIPTION="An ethernet monitor program that keeps track of ethernet/ip address pairings"
-HOMEPAGE="https://ee.lbl.gov/"
-SRC_URI="
-	ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz
-	https://dev.gentoo.org/~jer/arpwatch-patchset-${PATCH_VER}.tar.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="selinux"
-
-DEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:*
-"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-arpwatch )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_preinst() {
-	enewuser arpwatch
-}
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}"/arpwatch-patchset/ EPATCH_SUFFIX="patch" epatch
-	cp "${WORKDIR}"/arpwatch-patchset/*.8 . || die
-}
-
-src_install() {
-	dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh
-	doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8
-
-	insinto /usr/share/arpwatch
-	doins ethercodes.dat
-
-	insinto /usr/share/arpwatch/awk
-	doins duplicates.awk euppertolower.awk p.awk e.awk d.awk
-
-	keepdir /var/lib/arpwatch
-	dodoc README CHANGES
-
-	newinitd "${FILESDIR}"/arpwatch.initd arpwatch
-	newconfd "${FILESDIR}"/arpwatch.confd arpwatch
-}
-
-pkg_postinst() {
-	fowners arpwatch:0 "${ROOT}"/var/lib/arpwatch
-}
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild
deleted file mode 100644
index bd5f1d4704ce..000000000000
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user versionator
-
-PATCH_VER="0.8"
-MY_P="${PN}-$(replace_version_separator 2 'a')"
-
-DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings"
-HOMEPAGE="https://ee.lbl.gov/"
-SRC_URI="
-	ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz
-	https://dev.gentoo.org/~jer/arpwatch-patchset-${PATCH_VER}.tar.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="selinux"
-
-DEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:*
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-arpwatch )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_preinst() {
-	enewuser arpwatch
-}
-
-src_prepare() {
-	eapply "${WORKDIR}"/arpwatch-patchset/*.patch
-	eapply_user
-
-	cp "${WORKDIR}"/arpwatch-patchset/*.8 . || die
-}
-
-src_install() {
-	dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh
-	doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8
-
-	insinto /usr/share/arpwatch
-	doins ethercodes.dat
-
-	insinto /usr/share/arpwatch/awk
-	doins duplicates.awk euppertolower.awk p.awk e.awk d.awk
-
-	keepdir /var/lib/arpwatch
-	dodoc README CHANGES
-
-	newinitd "${FILESDIR}"/arpwatch.initd arpwatch
-	newconfd "${FILESDIR}"/arpwatch.confd arpwatch
-}
-
-pkg_postinst() {
-	fowners arpwatch:0 "${ROOT}"/var/lib/arpwatch
-}
diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
index 90787e647aec..16384011939d 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -3,5 +3,5 @@ DIST etherape-0.9.18.tar.gz 1436265 BLAKE2B b9f3fd625369fdf6790bef75cc97effd3e1a
 DIST etherape-0.9.19.tar.gz 1452435 BLAKE2B d80d0d0eceeff67890d6a992551a136bfdcd3de005468d7d09eccc94ddf472209738c29d06a321116c90da1a31be0349f80dbee73d3297eae3e02588afea4e94 SHA512 3819c36a6ea5b1ec6fc675563ab0264d180824343344bf4f2da834db39547b721c1565b6edb882d55ce4e0ca93e4b34e3a544996a988584aaf7fe8b8d5ca265e
 EBUILD etherape-0.9.14.ebuild 611 BLAKE2B 028a91b19cc57e075b974bc1f80c39ce42ba0bac4f89e5afb1e48742e4d44816f5b5ab5e7236cf7a59aebc87a677b11391ebb6294b504dbf45333aa6fb52a142 SHA512 2aff3a594f3e24192554249bb6ebcc5002f47a76cd1c74b4913f33cc08bd824c78e89038d8d7a52a241a382479f8057102689be565544c1e96a0c880ef332ed5
 EBUILD etherape-0.9.18.ebuild 564 BLAKE2B 093ec296766b484fa508462b6f65d8b56af5884f0c98dda915e60bc69ee5be7936236a4456a5b1dafec25a33ff981383742c197df8f12d0bd1d3db2943268dc7 SHA512 94e51eca55f371dff53d6dd0a4ecc88495edda31374fee272a3eb8af173e1837d114b26c1bac2597877c84af4bbb187bd5e57ec73caeaa4c64ff0ce820482289
-EBUILD etherape-0.9.19.ebuild 561 BLAKE2B 464948e82fffaffb3a9ee4ae79882b6acf5e4da1ab2a83407d5a5a0dfb9d7f5fc9dfde683336170d7631e5cea10e5c5e3900569f72d1d47fd0e072ae7652daf1 SHA512 dcaaf254d87242554185f5088931c892bd75e71b2bda8be28a2bf33b744e44bf99fdcb746940897c2735004b8bbf2a3d714b505469266e75e25a7f7a82a16b9d
+EBUILD etherape-0.9.19.ebuild 560 BLAKE2B 1cc5017d6256f72cd956ef572864a68624b50b9e4f1559106105da15b6b5ce6a383af586c1d0c8faf57703d45251b6792daf09d27ee5c1222f5f0da4da6cff86 SHA512 11ff53568856d419e723cab98d4fedc8f916d9c3e49c514f65aed6864905b217a3bf0ba6323f5582859281a4e0a455a2c251e9e9b10a40d142ed5bd70ce71fc1
 MISC metadata.xml 820 BLAKE2B 613982514b7fe5365b2eb8344cd1e7214d71636fec65aba0f4f2d226047e33ede0a0fb0f096f87d20077d0f1907375eaefbbc04bfc81904dd044bbc567cc887a SHA512 8e7b8953034f14069d5d2aad3c0a1b180ec182c9ae8be46bf2b837629e40f0122b4402c0adfeccb1967844c38b241a122a2735df0d63ad475c2355eb4b454e9b
diff --git a/net-analyzer/etherape/etherape-0.9.19.ebuild b/net-analyzer/etherape/etherape-0.9.19.ebuild
index 421ef8688526..6fe795d91ea5 100644
--- a/net-analyzer/etherape/etherape-0.9.19.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.19.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 sparc ~x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 20d2133a0bcc..0c547440e840 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,6 +1,8 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.11.3.tar.gz 7475785 BLAKE2B baabe8c90170a7b2ddb3ae7e95ef3cd042e64f68dbfdb50f5a981bc63ae5aa1e8ec4082729456d1b3fc02c0c74a98e15383cc56e56c53a2ab6181db94125365c SHA512 616e938fabaa6565fb9ac4824649c09801dd53b3517c0a9b5b62307293bc838377c18818cc13dd40e240902f02455c421d433b6ee54671403598c5b7aeb78ea1
+DIST icinga2-2.11.4.tar.gz 7476667 BLAKE2B 99b004f12504dae57ae2eda37983ae17da359c6e6998d41bb408c11328d0e69b7dd87ee5bf888c64862d52fe198145e56b1ac24f53d06dfebd1241d16e61a016 SHA512 51b0170d334d4ebe2c9614e47f65a1ab59483b4d5de862ae3d90152bf547bfc0051d9fca2f6b86d301ec897980fdc0b503232eb6dd82ae603d8e809bd56b23c1
 EBUILD icinga2-2.11.3.ebuild 4566 BLAKE2B 1640a4ad8c70b4b9be789f43c097abfff3719c305a03879f0eb2302ce6d22aae6279957261ec2486b159199219244691548793b4d082434a493cefe2540fb45d SHA512 bd5fb8407a0a2f497e93638e4cf10e4ceed3c17db80031e7bc18f77e94e7f4bcbe1c856834466bdb3c636891c0b2c2ddc5bf6319615d02ee7c1c61083e52f131
+EBUILD icinga2-2.11.4.ebuild 4568 BLAKE2B 76e47067c9d2bfb5a89588fe008effbe861c9868621f1a04a543852d534aad2f6fc82d62636413283eaa835517d8bf9bebfff3dff63ae79b01eca1c79b04570c SHA512 038e655cbac4a124d02e4d58271877f17af90ccc743b3ff65cbac098e7f1c0c82101fa3530c25d09a4dc1f4ad63349c9cd1c85ff4133a701120095378708172b
 EBUILD icinga2-9999.ebuild 4599 BLAKE2B 31cd0366e1d779e8b218c119e611e65b6822d329e10b7a5e490d00603bc9e7263ad1a4126aefa3e01051e3aff915a337b3041a28f0ac7c5c4cc1bb3a7321f01d SHA512 f84ff05c3a31cd2872cc8c60773dea7a1d69fc591a867a0674eff3af8c1cf92a7b7150259f0511a42e0a496d6696c6e1dc66384f215cbdc6537e8aadb920d3eb
 MISC metadata.xml 767 BLAKE2B 5a1f42327c794c6a9c7bc2c12a9d58fc0eb01e414f18a3ef80ac25263166a615ac1e3865544d3cc17bd950e5688b1f092b5061cbb5d4a51bca8c94bc83ddf9e5 SHA512 e92f81fbe17e5a54e509f26fa6b1fd0461c5229eecd3d0c5e078ab35fa6f2b5898e60e0d132b096bd2292d54ec9c4694564e96282fb4157985dfddec80c58675
diff --git a/net-analyzer/icinga2/icinga2-2.11.4.ebuild b/net-analyzer/icinga2/icinga2-2.11.4.ebuild
new file mode 100644
index 000000000000..42ebd83d611d
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.11.4.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; then
+	inherit cmake-utils depend.apache eutils systemd toolchain-funcs wxwidgets
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+else
+	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs wxwidgets
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+	EGIT_BRANCH="master"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.66.0:=[context]
+	console? ( dev-libs/libedit )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl"
+
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+
+RDEPEND="
+	${CDEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	acct-user/icinga
+	acct-group/icinga
+	acct-group/icingacmd
+	acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+src_configure() {
+	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-DUSE_SYSTEMD=$(usex systemd ON OFF)
+		-DLOGROTATE_HAS_SU=ON
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	# LTO
+	if use lto; then
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use mariadb ; then  # same as mysql
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index dba3d5b9086b..dbebd1cf5ad3 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-7.5.1-es7.x86_64.rpm 16793324 BLAKE2B 4fdb1d02cd407049d10c8cd9ab7949d44dc8b61e377a4b6a1b34f12e425834706eb2536f6d05c9b84415321652676e048eb002fc81463b12cccff865f22560b2 SHA512 6b3cbacdaa32da404f285a53d990dfc5f520e05c4a00690d7b46cfbf8b7f89a0089f2d36288ef695a0dae033b70e9dd3cf85c682833910e9314a78414aa2bd07
-EBUILD nessus-agent-bin-7.5.1.ebuild 1970 BLAKE2B ed1f9f97734a82f17c7eab6c39588d28e1b4bc97508f4259b6ab619ca5d67e4b7b75f0cb6171d51a13c8d223b92c45ba9f92175dc785c9fcf6a8de14e965c00a SHA512 6adb47eea90f782f904f5a8de08f1b404de60cb5836619b266e4a6101bad77f825c5d2347462329b5d9f9946a50ef6dae5da2b6f0acaf1ee46abff732b106683
+DIST NessusAgent-7.7.0-es7.x86_64.rpm 17139840 BLAKE2B 7bd7baddbbb7c3b25b631e0de84fa89a514b373fd5242d3806d9bca3420d071dab5bc82446c0aafd36c18fb665d5acb480409c061663d764754dfc32d9c4cc82 SHA512 66a0ae15d4c96a600713b871a808aae365ebd698c1b1b275a3ed5ad0744c45da94335068f0964e549b374ddc4f4545bf25b51dcdf665a3c37397740a948fc588
+EBUILD nessus-agent-bin-7.7.0.ebuild 1970 BLAKE2B ed1f9f97734a82f17c7eab6c39588d28e1b4bc97508f4259b6ab619ca5d67e4b7b75f0cb6171d51a13c8d223b92c45ba9f92175dc785c9fcf6a8de14e965c00a SHA512 6adb47eea90f782f904f5a8de08f1b404de60cb5836619b266e4a6101bad77f825c5d2347462329b5d9f9946a50ef6dae5da2b6f0acaf1ee46abff732b106683
 MISC metadata.xml 353 BLAKE2B e3ba298accb9a0618eb7340652a32cc166702f8873b49de734f6c117e2aeadbd9c31a76f231574ee04159454633191d4d3480925c05c993be174bf4efd3cc994 SHA512 81bc629de5c0367706b7b3259b3bb68edff6260dd47de345153af292a81fb6df23771b0f4974617f1fdef7b446dc17ab3c485d44d3dcb376e93c69173503a348
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.5.1.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.7.0.ebuild
index 893d4776496a..893d4776496a 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.5.1.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.7.0.ebuild
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index a669928cc68b..bb2d5f115870 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,4 +1,4 @@
 AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
-DIST Nessus-8.9.1-es7.x86_64.rpm 83715796 BLAKE2B b0362956fd8935162b2e47753fdeedd76452be55904ac90040ed0a4021194aa987321c9eec331490c61de3df25a23b4e668f62393b957f16cfdc50a033075c3f SHA512 7b746866cee3247a4c8f5df14aa2af3b28a5b4d485c87927f2226d73a962ef41b4ae0402529af00040890b93462171dd2a6c3ed842952a472bd112dcab79e4d6
-EBUILD nessus-bin-8.9.1.ebuild 1654 BLAKE2B c6a96ee9a5c51dfc0a1b1fc30743436a983746dfb350ffdb74945c9647a4fa269f386bdcfa360b027198b93aa1022e6974ae23e3b0c39c1db2fb4cbc217170bd SHA512 5ac2ee1ff272d8c7561e86fedaafecdd20fcb5387f99eba614dbc47bf5bc5e4b58ce930f12e899ed7562f189c2fb74abd664c8180d6acdd506a7cc4462bfa3a4
+DIST Nessus-8.10.1-es7.x86_64.rpm 87820668 BLAKE2B f74ddbc919634556d4c570a1057a9aa8afbc1bf542207d6cf87db5314c9fe6911072af649ed652489c70d35c2a6816447cda7a0a788f020113f4aa5b921c2ee2 SHA512 bcccd20b92f05a7d711c5b9ecb175475eba086a95eceb80ffbf830c60351db01b3f029aec8abd1527f9c1d3ff3bb3d7f3cd13de48e6f08aa1a8d6a2a71e3ac30
+EBUILD nessus-bin-8.10.1.ebuild 1654 BLAKE2B c6a96ee9a5c51dfc0a1b1fc30743436a983746dfb350ffdb74945c9647a4fa269f386bdcfa360b027198b93aa1022e6974ae23e3b0c39c1db2fb4cbc217170bd SHA512 5ac2ee1ff272d8c7561e86fedaafecdd20fcb5387f99eba614dbc47bf5bc5e4b58ce930f12e899ed7562f189c2fb74abd664c8180d6acdd506a7cc4462bfa3a4
 MISC metadata.xml 345 BLAKE2B 05fdd17a4decd9a096175a59991a6df8260591c09193fef114895d7d29e0f08210aacd4517678410813d06a27b1032889c529e2966427c5a9ad454f9534d25f5 SHA512 3535519b1c621f6df120e6aa39f9a11ec132b68499a029915650218c16e9ca1a07cb30409ace95b2aa0204194a61c7b4743051e1f4ffc94cb5ba3372cac72e8c
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.9.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.10.1.ebuild
index eedc870324ec..eedc870324ec 100644
--- a/net-analyzer/nessus-bin/nessus-bin-8.9.1.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-8.10.1.ebuild
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index e8aff2e9ee4e..cb470155d548 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -7,7 +7,6 @@ AUX nmap-7.25-CXXFLAGS.patch 302 BLAKE2B 3a6689beb9750dbb2d35a779089c4f8dd772add
 AUX nmap-7.25-libpcre.patch 291 BLAKE2B f63a80d6e25309d4706f7f428cd70f5926df99f7dc7b98f6991c75f13f2cdc0ca14e2527bd55cc88e33837012d4b1b24433a9f63b614cffedbf3da40ab73d9b6 SHA512 75963ed6eb156475a8e928f6fd6ad18cdc61ed658a3e0a82a7719bbc4998b186981fa93c2b39b8bc92e10cc0ad19f5097224a9a68bc4b35e1b771d4a27532b1d
 AUX nmap-7.25-no-FORTIFY_SOURCE.patch 2258 BLAKE2B 28e3dbd2d2ccac4d01fc640377fd8ca016f196bb59eaaa42ebe7ef31f473f9bf9db893c7b4330b1a2aa723b5268640b5edba4519b94ee094d63605600bffd9e6 SHA512 29b19e8cedc5e9edf66e728d89b71c4c0ada29fdbb9c167bec84b5aad2c9d52fe111a902c32b247106ace0154734f2a3b4eeae119887dc7203ad2271c8c240a3
 AUX nmap-7.31-libnl.patch 498 BLAKE2B 15ba0015ce0c5f266adf1f6b53ad99db82521a3ef8b226f040acc4f0f7759af762fafbce2a1820675e55e04d6b4dfbe04f67711d3fdd1e9dabd750b200ef9d3a SHA512 e7047faaac2bec6c8e0aaae04cbc6e97a8da7999fbb1a8ff015a78ffafe3ce645b71746fd6da826e3ad9baa8d8a917d3791836e67a346dc9c1ca6678cd04e7c8
-AUX nmap-7.70-time.patch 586 BLAKE2B 5354fffebb073c2e96ec744ac746b140ef1b528539faea0ba9423283b2bb535e4310423cbae9671b13ef3af4381182cb61a6662bf314f597cc2fbcaf16b9d11e SHA512 5b948f7393fae98bc0d94e3aef585308476728fe1530fd59bc67aa16ab8f8d790f06b9efa30c9c0a924e690c088453f213520b086ec233a80aa7de8205d79276
 AUX nmap-7.80-ac-config-subdirs.patch 849 BLAKE2B d46ad183900ca2f541a1577a2add5c13cebf97007867e737bd8f2c4d45e0716ddd0a8ea0e193eca17fd26d8f5acc1c2b4cd7166d8ddc1942e75e0adbaca17f01 SHA512 e1c1aee3fc5e0030409b258c7bb8838844c2008cde48457105ae43e6d8dd705672bfba269911807105e0735ff0b25fc86304be9dc4c3dc33b3f722a9c492ecd4
 AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475e9351105c7348fe9fd48156e452d8f9697b83a7860ffb188a7f8089c3696c8eef49322a7b029496a334972ae1a180 SHA512 1e062a571eaefbea55f8c4164d8c2b7da177f7c5dd7e846bea5515f81847248bfcaffdb58433fee5f2e08cba387c1ddda21bacbd86efc32a6cdea486cac57cd1
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
diff --git a/net-analyzer/nmap/files/nmap-7.70-time.patch b/net-analyzer/nmap/files/nmap-7.70-time.patch
deleted file mode 100644
index 4b97bdf49049..000000000000
--- a/net-analyzer/nmap/files/nmap-7.70-time.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/nmap_error.cc
-+++ b/nmap_error.cc
-@@ -135,6 +135,7 @@
- #include "xml.h"
- 
- #include <errno.h>
-+#include <time.h>
- 
- extern NmapOps o;
- 
---- a/nmap.cc
-+++ b/nmap.cc
-@@ -161,6 +161,7 @@
- #endif
- 
- #include <fcntl.h>
-+#include <time.h>
- 
- #ifdef HAVE_PWD_H
- #include <pwd.h>
---- a/osscan2.cc
-+++ b/osscan2.cc
-@@ -147,6 +147,7 @@
- 
- #include <list>
- #include <math.h>
-+#include <time.h>
- 
- extern NmapOps o;
- #ifdef WIN32
---- a/output.cc
-+++ b/output.cc
-@@ -153,6 +153,7 @@
- #include "libnetutil/netutil.h"
- 
- #include <math.h>
-+#include <time.h>
- 
- #include <set>
- #include <vector>
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 6e97d76b7bec..419be5e4c486 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,16 +1,19 @@
 AUX pmacct-1.7.3-nDPI-3.0.patch 1157 BLAKE2B e7beb25fa1b239193d4c4deb7521b1b03051335901e61ee68b198e8ef73cefe193884111f605cbd38f444cb5380c28529a815b4b055fceac8e467da59ff9f2db SHA512 323012c63ed16ce3fe7a3684b84cc6fdcf9412fa9ce2cead2600459ee500ae60a0e5603805ef9c66b7d6e3f4b7d1b779b51b45494ce91e4798035956621eb8fe
 AUX pmacct-1.7.4--Werror.patch 327 BLAKE2B 1b77ca15ef64a48ca6b477be9f37fa7b88d79e7fedb47895648b6637e9af9e38c959b8838d28d1370dd11b4c722d2b18adabcdd72c8e074dbc10467b770ea6de SHA512 06e1cce962022e51c960881c6f169c91605c5ed597960085f38b5c9fffa4056813014c08070ba7f016cb0f6c449038df9666e5f0d7ab7879563d2dfdc53d2b0a
+AUX pmacct-1.7.4-nDPI-3.2.patch 1712 BLAKE2B 103650626f7e4cb8f7f76738c3b151f38c517d27ec0c5b4c1b2ab14f6a22fb20150b01c0bd171e99c70749d8cd62aa6f04cce229d3056e0382bedd6bd9e28b24 SHA512 3ed43f04bc7aa709390748c503f390f98a6b057825fc6d608730803ffd70e6a081c455085067507567b7f43f49c8e6ebc00d4762bc2aeee66a9784ebfdb80c80
 AUX pmacctd-conf.d 153 BLAKE2B 10329deaac64fb5e03bf673c806ad691fb00579d16c77b05aa73662b5e187a31c25da38afb3be853434900ad65103bef3b9d1d9c3b24e0f241a98e4c9b6696b8 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31
-AUX pmacctd-init.d 839 BLAKE2B 06d09dd80b526c9e12579e0ee2f76de96d91fef6f533727c5f6862a4a09be323fca4614be2f800f76195661cea5d52a3e6a316640ff4b853de963192c08f80d5 SHA512 c340e62eebfc15ee72591178451d46052e03ef1656a0b81a4b53c02b69df1e5a365742ddf98d9f7f0a8de1345b6a111b8e5ee9009f33fed2a3204344a15690a3
+AUX pmacctd-init.d 837 BLAKE2B b69be34106833a4c9674b0e300fbd91193a3856a87b4cc268d210e8031dab8a1df8250363b756b63c8c01f052ce89bef993c971906c74e1cdcf172dfce3f5dd0 SHA512 fb86c909708281401cc2e0cc275ec1fd2370697e196b5d16feee9bab42b313b80b9d2b08e12a4fe08237ae401d3b3bd50c9f38293be170dd315cd0b8b2fa19ff
 DIST pmacct-1.6.2.tar.gz 1311678 BLAKE2B 123629ca2e5e58bb4e684001b1c6d2d510e18450eed1c6e45bbe79ec7bb37072ba9b844fe0d8826a7923d0b09cf6923ea87d4e22fb2f251e7ebb9744d1c59b93 SHA512 8495f97752ae586fd842eed49ce91db3e4753133f7d380d067e7df153abeea469e5126800074e9071cb7227a3f1df64d4642dfece624fbbfa39b4537fde38b46
 DIST pmacct-1.7.1.tar.gz 1392360 BLAKE2B 75a4dda461c2fe643c24a901c19efacf325d1922bcda503a1ff41fe0b6c4178732d476b479875e9e0ba34872dbd86b8d8b2087471148f10e202f57c4a212f2fd SHA512 6a5d75522b9197b324907598ee4ba22bbda96b45e10f62df2ae507e23faac927af5468f587deab08d1e0f3f6422c609d106dcf30fa7bf16eb215bb35ea6aa08c
 DIST pmacct-1.7.2.tar.gz 1416302 BLAKE2B 5d6f9c5849c07c7bdd3b6251b2611935ff558ca393d2cc0d21e5e681b0069b3a5bb4a985a9dc59b62b8b4ed697ecbd4cbb71f0aba42ce8d1527187b98d2e90d3 SHA512 ffdc63e96fc6af6f5d531243bc0aec0925663d8e91e83ada275f8e9a969dcf85cebd06b17ae2c796722bb209602d5b2bc487757ec736a740a8f33698d93a8675
 DIST pmacct-1.7.3.tar.gz 1467237 BLAKE2B a2fb627df9f61f91c69a9333a968485695b45c8ebe812e11ba250185a5e93f262954290d7ee41789fb13f7f5c5ef336294be83c8d91adcd0fc3c348485e515af SHA512 09d0e6721760035112cb0c7936fe177f7858b19fa1df2c7da84822dc816413e7c6bace35fe45ad32930961183d61f9e4f3a4879747be45f47ab658a3e0f055b2
 DIST pmacct-1.7.4.tar.gz 1581213 BLAKE2B 3835abc91947af083932e01b828c2324f90595c973fdde9d9f4034dc7d03e12fad6bbe6e91e1462ec36963ccb41a5a740159f531d7e1929f4cd8d994b89a58a1 SHA512 780b6cc25562fb7b5a1f55b48ce9719b36c1ee0d9ee2b6db8d7f238cd5d9f204938313b13e3ff3f62c7b9b179279f18314eba38ad787ffc346a4b217da239ca1
+DIST pmacct-1.7.4_p1.tar.gz 3200089 BLAKE2B 638983a92df0a46441ddddaefa78dc0f61fee94264870979f46674e851e3bf111ae71550f7e6b677d425fa4c688d4ed7735d82aae85a2e77155c1bfa050d8e76 SHA512 03553128975ced54ce08a1a543c794377c2b7a3c800de600a7b5e8aa483b1c3123dee536a361a47053233d60070cacaf269f1a16ad17b563fa9fc0ec7af6a467
 EBUILD pmacct-1.6.2.ebuild 1790 BLAKE2B be2fe64588677200a54a4866e2946cb5516fb65d4f1ac0bef07287796321d3832c4acba1284f8bc285bbacf6513493a297880bccca350e6d7286ef6569e1d6e6 SHA512 6db9673c145cec1da55e4cd18428f64fb334066eb0a5794adc6127a0ba27144301237aa6e30e1c4a93ce892ad4306369da46e9572b41430df7a776080b7edcc0
 EBUILD pmacct-1.7.1-r1.ebuild 2131 BLAKE2B 93f73d535296d1c3634968a262a1d4aea8b7e27150310ed051a5e7a0bd42c95f09452b7bd0116521763b8acf890a71742ce0772c0468eadfb5dd17717ff5750c SHA512 e2cb9688373c62963391d989f99b909ae246d5b890333d7352871abe9f8feda20bcc046e29777bf0002fee5e6952f1ec49b6ea0decd927b240c919d8c4b2f5cf
 EBUILD pmacct-1.7.2-r1.ebuild 2125 BLAKE2B 8a2d62e19cf7e5c6f2de12956cbdda845825648b18c19c4d37190e1cbdd4cc0dd926e8c2330b5bc5acbaee2c989cbbb8f928d31fbe1566fa049549972a9f5828 SHA512 55d6e8b369a0f734e81175829472b2312cf7e24a23acfb3609a76adcbe3f72e2df4ff6460b87fc4c381ea78cd95f446ce26f956b35e4a46d9ebce8ec1ac597e1
 EBUILD pmacct-1.7.3-r2.ebuild 2220 BLAKE2B 15f3fab589baa6544681cfff7f5d0a7c8582eacc4ad880764b9dc8702bc56fc19c7e128304f555e1695173c8a98b25550a4c8d439cc2e254bb86071cc0e468e8 SHA512 54ffea328edcc50c4cc4212ca044db234defa0287db3fad4e07f9e3ac103af96bf6d3c2c2322b321e6bae59cc92ec87f8d81a3144ca43aad8c2e699565c7672c
 EBUILD pmacct-1.7.4.ebuild 2236 BLAKE2B 3cde1024527435d97409cc455abc619398ff506f1a63f92fb6a467f92d3a408775ed9ffa67a86e5d17628cf7e763218cb2f075a0fd574b70b7ff83f48e618d8e SHA512 596821332b1ea6990945dfec619a29807a49434e9821e12472c6dd8d00638be374318956eb976478c7862b546a96e98c0f8e3ee16fcf89109f43449d6eb3427f
-EBUILD pmacct-999999.ebuild 2159 BLAKE2B 923a394086afd477ecd91e4d972ba2dcee6281d09bf97311078a1b6e63a3070a8e3363f7777489bad0e09329e1d4f26ecd2da9046e012c991ddb755b57bb5978 SHA512 57c69bd316361ec7a57388ee5718bcda93e2a758d9a364941a86622ac4dddd86c157b7d0cbecc723901c253e285ac9e7721f0594cc18fa6aac7bbc9bba43e334
+EBUILD pmacct-1.7.4_p1.ebuild 2335 BLAKE2B 5b7c57caed2f2e96817f247a719e90f05bb3f30b715c053b07ddce3738f8e54ad35eb17edd94c385cc1dcb804dcce16c72282d70f572237f8e55cb06e70d827f SHA512 04c0c6fed8c5d81affd3eb3b65c3959934880cc38c5d5cbc67e269d399cea7a41da889d8e984630f2399138680a8bd4e885e716647097cfb06a8030f4364d2ac
+EBUILD pmacct-999999.ebuild 2159 BLAKE2B 8896ff11b80d2ceb5256ca205557fd6471f007356218b8ea8f358617d61a61c61c1f5a8d42c23bff7c03e8ca2909420aaf1ab14abddc4cb07f1eb4b6cbffec04 SHA512 f6604dea81dead988131d69ce4118b1d305beb9fade5bd49da06e6c46e27b45a264e5c5bc41f98e7cb56fcb3bd5f0aac2e178ec8c89b2ccbce136e7c6cfa804d
 MISC metadata.xml 1424 BLAKE2B 75ce1e74993587289adbef0841807d758f0a587bc5b0429cb03a86be690d49479a2cf37211006ae905473528f3f4714ec2827e5bc556a4bcaf368215f97db7b8 SHA512 ddfd0eaac09d66640660baffe80ca83911000632416602eb258b2c01e630ada343ebeff7191c53fe71e4d5e658c94eac9a95bf4527a9ba40ee674ffa9442d856
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch b/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch
new file mode 100644
index 000000000000..bcbdbc834cad
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch
@@ -0,0 +1,47 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -900,7 +900,7 @@
+   [ case "$enableval" in
+   yes)
+     AC_MSG_RESULT(yes)
+-    PKG_CHECK_MODULES([NDPI], [libndpi >= 2.4], [
++    PKG_CHECK_MODULES([NDPI], [libndpi >= 3.2], [
+       SUPPORTS="${SUPPORTS} ndpi"
+       USING_NDPI="yes"
+ 
+--- a/src/ndpi/ndpi_util.c
++++ b/src/ndpi/ndpi_util.c
+@@ -29,7 +29,8 @@
+     
+   NDPI_PROTOCOL_BITMASK all;
+     
+-  struct ndpi_detection_module_struct *module = ndpi_init_detection_module();
++  ndpi_init_prefs pm_ndpi_init_prefs = ndpi_no_prefs;
++  struct ndpi_detection_module_struct *module = ndpi_init_detection_module(pm_ndpi_init_prefs);
+   struct pm_ndpi_workflow *workflow = ndpi_calloc(1, sizeof(struct pm_ndpi_workflow));
+ 
+   log_notification_init(&log_notifications.ndpi_cache_full);
+@@ -77,6 +78,8 @@
+   NDPI_BITMASK_SET_ALL(all);
+   ndpi_set_protocol_detection_bitmask2(workflow->ndpi_struct, &all);
+ 
++  ndpi_finalize_initalization(workflow->ndpi_struct);
++
+   return workflow;
+ }
+ 
+--- a/src/ndpi/ndpi.c
++++ b/src/ndpi/ndpi.c
+@@ -373,11 +373,7 @@
+ 
+   if (flow->detection_completed || flow->tcp_finished) {
+     if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
+-#ifdef WITH_NDPI26
+-      flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess);
+-#else
+-      flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow);
+-#endif
++      flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess);
+ 
+     if (workflow->prefs.protocol_guess) {
+       if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) {
diff --git a/net-analyzer/pmacct/files/pmacctd-init.d b/net-analyzer/pmacct/files/pmacctd-init.d
index 1dccfcdd80f5..bfc59c07abb8 100644
--- a/net-analyzer/pmacct/files/pmacctd-init.d
+++ b/net-analyzer/pmacct/files/pmacctd-init.d
@@ -27,7 +27,7 @@ start() {
 	start-stop-daemon --start \
 		--pidfile "${PMACCTDPID}" \
 		--exec /usr/sbin/"${SVCNAME}" \
-		-- -D -f "${PMACCTDCONF}" \ -F "${PMACCTDPID}" ${OPTS}
+		-- -D -f "${PMACCTDCONF}" -F "${PMACCTDPID}" ${OPTS}
 	eend $?
 }
 
diff --git a/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild b/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild
new file mode 100644
index 000000000000..29e47d7219dd
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
+	ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
+"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+	kafka? ( jansson )
+	rabbitmq? ( jansson )
+"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	jansson? ( dev-libs/jansson )
+	kafka? ( dev-libs/librdkafka )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( dev-db/mysql-connector-c:0= )
+	ndpi? ( >=net-libs/nDPI-3.2:= )
+	nflog? ( net-libs/libnetfilter_log )
+	postgres? ( dev-db/postgresql:* )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	sqlite? ( =dev-db/sqlite-3* )
+	zmq? ( >=net-libs/zeromq-4.2.0:= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+#	"${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch
+	"${FILESDIR}"/${PN}-1.7.4--Werror.patch
+	"${FILESDIR}"/${PN}-1.7.4-nDPI-3.2.patch
+)
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+S=${WORKDIR}/${P/_}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC AR RANLIB
+	append-cflags -fcommon
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable bgp-bins) \
+		$(use_enable bmp-bins) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable jansson) \
+		$(use_enable kafka) \
+		$(use_enable l2) \
+		$(use_enable plabel) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable ndpi) \
+		$(use_enable nflog) \
+		$(use_enable postgres pgsql) \
+		$(use_enable rabbitmq) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable st-bins) \
+		$(use_enable traffic-bins) \
+		$(use_enable zmq) \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql telemetry; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/pmacct/pmacct-999999.ebuild b/net-analyzer/pmacct/pmacct-999999.ebuild
index a4410a2887e1..63073745a3d7 100644
--- a/net-analyzer/pmacct/pmacct-999999.ebuild
+++ b/net-analyzer/pmacct/pmacct-999999.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 		<dev-libs/mongo-c-driver-0.98
 	)
 	mysql? ( dev-db/mysql-connector-c:0= )
-	ndpi? ( >=net-libs/nDPI-3.0:= )
+	ndpi? ( >=net-libs/nDPI-3.2:= )
 	nflog? ( net-libs/libnetfilter_log )
 	postgres? ( dev-db/postgresql:* )
 	rabbitmq? ( net-libs/rabbitmq-c )
diff --git a/net-analyzer/ripe-atlas-tools/Manifest b/net-analyzer/ripe-atlas-tools/Manifest
deleted file mode 100644
index 12246d828ab5..000000000000
--- a/net-analyzer/ripe-atlas-tools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ripe.atlas.tools-1.2.3.tar.gz 86364 BLAKE2B de2aa0a57e135d463d1edb7e3277d21052353009d1dbcc2ead03d659c9736e61f36e95d102b5c3792448a1ea304e340f97856647f3c565fec9fcbbf0c414596a SHA512 f9e3b94ac9561faf0f6738099a0511b5aedb3b0d3230997a8033b8a1a804b885169891de8f408933ad90e3d4543375741657d9989fef09548d9cc8f0d9920e66
-EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1240 BLAKE2B c5ae756360e330d39486bbf2e5e37dcce8c099295333429a2a722b4dffedf5a3aadf4fb66fefcff7c55705efba825f384a59e40bebdc63f38e4e5597773d9346 SHA512 d434c51157636a7c82c407595828f0d8c09271362818949b2a06a7a2e704071509abc1cb94dcb8c991554e1b0fabd76dd33c225ebbdea7068597a82b59f454b5
-MISC metadata.xml 245 BLAKE2B b9eb390672e4258c0f413eba0dbed731d0f8b2b65275669505e6c5ccdb034944856c212e564f307bc5567203f4897164654f047a2355b9d6f493e0633dce8192 SHA512 d4e3e22b2dde06b42ba712b048c38c8809da125ad6eacb06823f2013d5c9c9b82a4a0b5ffc104f0b786ef048700980c72bed9cabb90a1003db929d2ead0db9d5
diff --git a/net-analyzer/ripe-atlas-tools/metadata.xml b/net-analyzer/ripe-atlas-tools/metadata.xml
deleted file mode 100644
index d68fdc3559c5..000000000000
--- a/net-analyzer/ripe-atlas-tools/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">ripe.atlas.tools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
deleted file mode 100644
index 5f7dc14d22b5..000000000000
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-DESCRIPTION="The official command-line client for RIPE Atlas"
-HOMEPAGE="https://atlas.ripe.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.tools/ripe.atlas.tools-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS=( CHANGES.rst README.rst )
-
-RDEPEND="
-	>=net-libs/ripe-atlas-sagan-1.1.10[${PYTHON_USEDEP}]
-	>=www-client/ripe-atlas-cousteau-1.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/tzlocal[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \
-		${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent
-}
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index b73117711c32..c876c47db808 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -6,9 +6,6 @@ AUX sarg-2.4.0-config.patch 2417 BLAKE2B 7c5f0ddea35dd77acf38431f17427c5be7d4880
 AUX sarg-2.4.0-configure.patch 1497 BLAKE2B 2cd26287e2a5b3cbd641ead5953fb499c542ac3d1c149149261bafbc51c8bbed454dbdecfe2009d54e3ed9c7532de136396e71b8353e55cf9c98638f1157438e SHA512 c6031d8c0034dea88fc83b3171cd0d221e6a421c7806b0af3cb3a80e2c73dc92e273793f7420e4f30490911bbcc13368c0fa1cd328b972ff3eb63ae7b652cf0c
 AUX sarg-2.4.0-fabs.patch 245 BLAKE2B be45ebf17fe6d7588fa7bd8d94da305347f7f017b61875ffc3249ac1a2788ddbee7e09fc855328e0da961866375b43f5a25c2421462b95fcb8265653c3fd2803 SHA512 9fd403ea0ddc411b99645f27e4b0209d9609355735601aa225621fce74270ebaae0e5569ae111bfba88fbd97cb41099f6eaf14047d09f2ceaac25dd85b6b134b
 AUX sarg-2.4.0-format.patch 400 BLAKE2B 020927621edfb7512f962fb12d0536b6a9a471c784b11f4105a27b533ec609cd9be3d97a43e45a2b2f45342a633ee300f6e39274ffb3aa48a556c44c95a49260 SHA512 fa6f3c0eaf0950c03d5cd8561e0e51cb06b008a90ae4df322933b56e92b73873f4903e3caf6adc7bbe886e2b7d3a53355637c5fa334b7d55b271384876d93c86
-DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B f1ba5e5d3531b611cca1e18444b24772d5f6fb31622d3702ce34bf7e5208b7ff04000ed80c984ff103f785dd9b7015f56403b8389100bbd02cdbf936c8343be9 SHA512 a5bf5c0f696a9d58d9dd1d631d2b458e7a48f597e7a084b032b2feb6185440b08babe7ffaaefc04676f0dbc11301084d1896b6246a7e79a10acdbd7aa7882ff6
 DIST sarg-2.4.0.tar.gz 1371812 BLAKE2B 4a07e97f5bdf36dc9ea867517f511dff4e2b501c01231c523778b283000bcf8e6eeb26e219c3d710551ad31f939a47453341b6a8a5575df1d8f3957461326675 SHA512 cb314c15379b01c1ad874e473fcc41664ed5a0dd492b8537d5f375e2c00d9e083679a01da5e3506775b7d66f2d43ba698864ffbd36f5e5e512ef58882148739b
-EBUILD sarg-2.3.11-r1.ebuild 849 BLAKE2B dadaef09ee5131c4aec4bec7a5d27084a9a5da0bcb0bc18f7648ece30d5ff7b8da5345bbc3833c423c3530c2596cdebb837396aacccd2f11471e26a53d78b448 SHA512 395e8bbb6c7b752637393f6ad1b90b964cc7502f3750674888a1ae94da13de0efa890c52f5dd59af0e23f54a4976180859cab86aa3b9ce0dc62bdbe74c0b3973
-EBUILD sarg-2.3.11-r2.ebuild 900 BLAKE2B ae2ee2cec4f73a97a4f2191a2a5659ab2cb314bd6e17b886085c246cc8aec0ac699f22aece2c3516380d107191b8267a211d496372a7ef5005776d32369134f4 SHA512 1905afac5cb561d9f28f11e86a4f594ab01a2667bbb84ac2504a916f43710a4c3547a8213094da9d70727ee6d14d2dea61ec6e2ea78f600a1486cf82ba9a7dfe
 EBUILD sarg-2.4.0.ebuild 1251 BLAKE2B 92efa3523de1832a356fe880e6e46062cc9500c9e53ed180920974e03a9382d5a471c729b0ef988c2104021540dda681d6bc4dad45fa13d39ff7493013ed2898 SHA512 74c77cabc48e9335f866881027948a743c34f172ac0e90b3820a1e5cf7f1c217d1a9722fe701074089239a9c342396b40bdeac3511b6ff6e617b8fe02a5c39f8
 MISC metadata.xml 997 BLAKE2B b0103361ea70e01da884621e5243317afdae68481b50c18296122617b0bc29669d50d6c6dda00c85d77e48186111bdf9252419a1b0627993b91dc652b263ca32 SHA512 0b24013475c4e92553539de23c2e88dff9e0bf9c42b3c5d6cb46e54dc113ceb8bc5889ac1d1c397f73bfde600ec6a394b2ba0da2520351f9050ec873b2c8d49c
diff --git a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
deleted file mode 100644
index 88f7c507e91e..000000000000
--- a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Squid Analysis Report Generator"
-HOMEPAGE="http://sarg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-IUSE="+gd ldap pcre"
-
-DEPEND="
-	gd? ( media-libs/gd[png,truetype] )
-	ldap? ( net-nds/openldap )
-	pcre? ( dev-libs/libpcre )
-"
-RDEPEND="
-	${DEPEND}
-"
-DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.10-config.patch
-	"${FILESDIR}"/${PN}-2.3.11-configure.patch
-	"${FILESDIR}"/${PN}-2.3.11-format.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with gd) \
-		$(use_with ldap) \
-		$(use_with pcre) \
-		--sysconfdir="${EPREFIX}/etc/sarg/"
-}
diff --git a/net-analyzer/sarg/sarg-2.3.11-r2.ebuild b/net-analyzer/sarg/sarg-2.3.11-r2.ebuild
deleted file mode 100644
index c8afb3c48d45..000000000000
--- a/net-analyzer/sarg/sarg-2.3.11-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Squid Analysis Report Generator"
-HOMEPAGE="https://sourceforge.net/projects/sarg/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="+gd ldap pcre"
-
-DEPEND="
-	gd? ( media-libs/gd[png,truetype] )
-	ldap? ( net-nds/openldap )
-	pcre? ( dev-libs/libpcre )
-"
-RDEPEND="
-	${DEPEND}
-"
-DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.10-config.patch
-	"${FILESDIR}"/${PN}-2.3.11-configure.patch
-	"${FILESDIR}"/${PN}-2.3.11-format.patch
-	"${FILESDIR}"/${PN}-2.3.11-Werror.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with gd) \
-		$(use_with ldap) \
-		$(use_with pcre) \
-		--sysconfdir="${EPREFIX}/etc/sarg/"
-}
diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest
index d3b051746923..9e5ee33a8040 100644
--- a/net-analyzer/sslsplit/Manifest
+++ b/net-analyzer/sslsplit/Manifest
@@ -1,7 +1,7 @@
 AUX sslsplit-0.5.4-install.patch 1131 BLAKE2B 1f81f8fbc8861e4ccfc0b2068d19e1a5dbb1485cf72d7aa0799e7addf7c73e4836b427afd510de8b6c98037e473e5699c33920fb7931c99ccc989fd0cb956bb3 SHA512 0219d175cf9f8a6a89f9a807bb5981a83c1e62c6738f5fafd93970045fa56dd0595761f3915cc223f60541b39a8bff9222233f176a5a608cdcf7a6774b69f56c
 DIST sslsplit-0.5.4.tar.gz 1750390 BLAKE2B 4ab9014c91938397c469bdc49dd307c47375047f018a5caaf8b32eb84596d2fbe623702349dc85776071363b2167c6ee8918604c6bf2843d357ffe64df36bb1b SHA512 5220cbf26a2d5201c4b36207ec52b290f95002c6d5a4d828868d163cff528095add8b333ecb844b86b4e83f62934aa840f80d3838d00997acd50b6e30cee7aed
 DIST sslsplit-0.5.5.tar.gz 1846850 BLAKE2B b223491c480070dd9718804f0ceb8fec9fe519cf0d189fd9bf9cc4dce5ae00d93227dca42349b42d2b82c62d0d92c451442670f6eae2f8d2beedef437907299b SHA512 f236f1ccce8bdb4a09659551defd73b73fbf660ceedace6ffbbb687c1de4488f74a23274b53a67e7001dfcdbd0ede7270ba8261feab633a25ae9f57cce468f39
-EBUILD sslsplit-0.5.4.ebuild 1089 BLAKE2B fb7bcd6d5e5e9f239af47c5c1392f6688b70de51695b49caf0c3b306b7675669094a6fdeced4c387e0d795379f3a40e73f1b129b37bacc8b2bfdb937691062cd SHA512 d331ce60da4932693801c708f08f81a08a372fa15d0970f8e59ed79f72f9c40692be2664c7b47772934f2134ffc28f6bff3bd38bf1f4a9607ef87062f47d0ba6
-EBUILD sslsplit-0.5.5.ebuild 1056 BLAKE2B ef52fc2163d7b77e9bb103bbe53323d9fe6a7d364dc7d7544a0de10f973d633e09f9a99b6e4abb71a000db2be77b7cc2a2a16a2c10f566803dabd4204a97d91c SHA512 0ff6a3c4a37f1b6fdab882df66e5d3e252a870cf381c91dbcf2a83a7513d9605d95a1f4725eb0ac004b75d4a2406417c58bf7be0cf2ca131d25b81b59a6a8097
-EBUILD sslsplit-9999.ebuild 1056 BLAKE2B ef52fc2163d7b77e9bb103bbe53323d9fe6a7d364dc7d7544a0de10f973d633e09f9a99b6e4abb71a000db2be77b7cc2a2a16a2c10f566803dabd4204a97d91c SHA512 0ff6a3c4a37f1b6fdab882df66e5d3e252a870cf381c91dbcf2a83a7513d9605d95a1f4725eb0ac004b75d4a2406417c58bf7be0cf2ca131d25b81b59a6a8097
+EBUILD sslsplit-0.5.4.ebuild 1124 BLAKE2B 9ebb355d542cb612248af4a2c4c6d4bda11be3f4c7c19a4aa0907f49568433dff1ece47be11544923078ffb1725be5036468a6b76b207c9d156097ff96011377 SHA512 ed21a23c0c7913e1a3e4507d0c5968cd26b850269dbce03f71213a40c0e02709750934b285cd656d1fd09d933a7206fb0fb9f4b942ad55da9e483dac6566b40c
+EBUILD sslsplit-0.5.5.ebuild 1091 BLAKE2B b66486eba7a2bd132a52cbd6a51aa70d4f633773020dad613275174f26024e0be00ba6faf8fe6c17e95c49d807d4b12a6d623b08cd7100ccd293a7eaf862bb60 SHA512 1f821738974d771a6a9cdb532bd9c927627fc0d3f561b230a28c43ce52139bbd04414a82a383f2ac88d0196e0d3d7f9982a1775f9470599b977de39d79bdd820
+EBUILD sslsplit-9999.ebuild 1091 BLAKE2B b66486eba7a2bd132a52cbd6a51aa70d4f633773020dad613275174f26024e0be00ba6faf8fe6c17e95c49d807d4b12a6d623b08cd7100ccd293a7eaf862bb60 SHA512 1f821738974d771a6a9cdb532bd9c927627fc0d3f561b230a28c43ce52139bbd04414a82a383f2ac88d0196e0d3d7f9982a1775f9470599b977de39d79bdd820
 MISC metadata.xml 873 BLAKE2B 2025dba83d4a6c2c48f8297da057360bc42269093af9292a8baa3096a5ec5cb3644da47effd8977ee9829e318bea5c11680c5eccab0407d5f14ed29a12e615b3 SHA512 d6d408cf00e3201acd6de22a0f10a2322398a889c84480da8eebd005da099f9306ac8d88d13c4186fa369915c39b4ad04d7aff558ad263896591374c9a4c78a1
diff --git a/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
index 7960cc011edf..f75310908600 100644
--- a/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,10 +26,11 @@ RDEPEND="
 	dev-libs/libevent[ssl,threads]
 	dev-libs/openssl:0=
 	net-libs/libnet:1.1
+	net-libs/libpcap
 	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
-BDEPEND=""
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-install.patch"
diff --git a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
index 2aa8a7e58600..355f76bc4381 100644
--- a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,10 +26,11 @@ RDEPEND="
 	dev-libs/libevent[ssl,threads]
 	dev-libs/openssl:0=
 	net-libs/libnet:1.1
+	net-libs/libpcap
 	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
-BDEPEND=""
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/net-analyzer/sslsplit/sslsplit-9999.ebuild b/net-analyzer/sslsplit/sslsplit-9999.ebuild
index 2aa8a7e58600..355f76bc4381 100644
--- a/net-analyzer/sslsplit/sslsplit-9999.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,10 +26,11 @@ RDEPEND="
 	dev-libs/libevent[ssl,threads]
 	dev-libs/openssl:0=
 	net-libs/libnet:1.1
+	net-libs/libpcap
 	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
-BDEPEND=""
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 7b042b914237..d70844a27ed8 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,7 +1,7 @@
 AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf8491998760e4a62ac8908300e28c43500812d37d2512f9d63fcd175b93c1b384e03e9570e741dd95dea09ead017a014a4b62b3449833fe9b248 SHA512 3d035736c0656f6ace85b45af595866e06c8464641023e9d1606c288e598cde18eb96b1be8300514f6f31bc83756ae76b436402666036456571201ca38fe5026
 DIST tcpreplay-4.3.2.tar.xz 747268 BLAKE2B 27cad902785975f9c7fbfb8abef24ae95fbc8812e0a4fabd3b1ecf74bb9f0a99cdb0c37db72c433296d3cebba89d0bbc90e944195e585bf2d1c2d93ef234c4f6 SHA512 641dd636d9c5c30637d0103f8b21da3ce234f9e3ed7ab4d2b20d004fc4a14301672dcd678b2d5e0eb90d55a97bcb0c4c67f31c790a5aa3c509a92d1142c5b7b9
-DIST tcpreplay-4.3.3_beta1.tar.xz 748424 BLAKE2B 9bccca73c0be4d6a72a61f2ebd4c6f61c160d829772605183e25177d4356e01d83be0602eaa84d154df2c316db1c6d09899e49311137be734a4c0b373be6e77f SHA512 d8c80d107ca0fdddc5d2ef88924cdee8b5897e0f4bb468b982f4bbacb01547a40c4fa324f7ee7dd93e1288c87e11e709a99c08e31d397b8ca3f28cc78e6d61a4
-EBUILD tcpreplay-4.3.2.ebuild 1870 BLAKE2B b3259f3304d9a352c41843ad22808a10e0060437fe2476398a5ed5d0b2d6ebfe53375e73829ab831dbaa8fcb83dcce5008a2d994888e4db65c95cf3ab9db6cad SHA512 4aa9cc30b785932ed73c19e001f36c73f6191af1cb739637dbe6cd5b541811f3818ce4c64e14e8910a1d505708f6467ca1e2874a0cd54b7eb174d6f31ac62d4f
-EBUILD tcpreplay-4.3.3_beta1.ebuild 1872 BLAKE2B 5fcfd4a57e6023865d261d022e6ac79f72cb0b2b773cd95b99202099767e8a6ed1288a5a38efffaed373da8f258d21f9b17ca88424dbf35064b4f28228804156 SHA512 3e385b4425ad1e832b810ebc77bbb15eaa4d09f57661275c0b724b5c9477bf2bb1cb1117592751344c7ffc7ec5666b6a49f2fd7a2eb9efad9901acd61524576c
+DIST tcpreplay-4.3.3.tar.xz 748220 BLAKE2B 2de09f75e6bb6035fc25f34f41d9ce2ccbb961d7464a9a6dae16ec417d629e4819593fd781d95075293ffa3a3db7c4a50ae8667c4e7d07c0b425361027c8df06 SHA512 110d7768a176d2126766829466a209cdd983afcf0c988f7e128baa5057b3ac1dc918fcaeb168a2e6654429100a146afcbdafcda8c3d67adf6b17892a48689a02
+EBUILD tcpreplay-4.3.2.ebuild 1847 BLAKE2B d438b6303817d166b800843f3d5f137d69cac8229e37b71d9ff863d9e800c6191284c1bef9d4ad35187864897ad08d8c0a7d96022b55dea909c8164bb918d23a SHA512 e45fa5f14b253b14aba41edf70ea3108ea0be0d6fc17b6a601a7131f247071bfa7001518c78e95cb73203aef0758140e30e11d81e7821f94961cf1e7dfe287c9
+EBUILD tcpreplay-4.3.3.ebuild 1849 BLAKE2B 944b39e6b8cbfc08ba57f670fe5ab1b8b19517eb1f10f9f186d7c399a5938e4e7bae9e0af248e4e9508ba112d3dfb68bd930f5d70e5b4369d23c287f4eb240da SHA512 7c847b68d153654afd26a1979c57270585f24617695d0e8e5ea760f31110712b96dd2c5e4a24aaddba3bbec314622858014287ee2e411d8d253569cbf2407ca1
 EBUILD tcpreplay-999999.ebuild 1809 BLAKE2B 196a27e64b132ffa5440aa7b540c4939d62dda5191ddc169a85b198f87d84cfcb15f26404e1c335ead442efa8a0cd70f795bceb3fa25736d525accaa42b448dd SHA512 2690427a1bcec51a564bf8dd6bac157a5bfa2dd27fe9c884c37b89b23963fe791a720c703cc4421d9955e8697f2209152e041302aeb767b40dfb052e7b0cfffd
 MISC metadata.xml 1116 BLAKE2B 23c8b7009a77b68831affc57432a87a31fde213d7e7ee88f68ced4a4e21a56c55f97497e610fc486a42c699759ef1edf1904fa9b0fe976df4fc9930535f97037 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
index 003400e4ef70..a5ce8388372c 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic
 DESCRIPTION="utilities for editing and replaying previously captured network traffic"
 HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
 LICENSE="BSD GPL-3"
-SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
+SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 SLOT="0"
 KEYWORDS="amd64 ~arm ~sparc x86"
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.3_beta1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild
index 015df52f86f9..d27b84b1c383 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.3.3_beta1.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic
 DESCRIPTION="utilities for editing and replaying previously captured network traffic"
 HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
 LICENSE="BSD GPL-3"
-SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
+SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~sparc ~x86"
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index da92c3f145de..95e9ba98a1fc 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -10,6 +10,6 @@ DIST wireshark-3.2.3.tar.xz 31572052 BLAKE2B 799c1e139dca90905526f0b04c9c4fbb48b
 DIST wireshark-3.2.4.tar.xz 31580440 BLAKE2B c40c19fde09726192119efe358892157d17e28ab87afa9a5b91203e11d3079b718d8e200522294886613d63d19283198de1256561eaf83436742db3898019e89 SHA512 67d20a248c0f4e63a58fd3a4191ede75542e9cfd09b0baa5c0016f72a435527d8f95d34f2d35ef1957c1a9c66844d530162379bfcf9e51b64d0d220b381cb097
 EBUILD wireshark-3.2.1.ebuild 6787 BLAKE2B a6c802d721d9b5922c916654a97f00bb48b8099fdf1693b793966b4c0f6b53736db09f0c9366e7dc6ecfcd3c081e00d37ce8fbef68a1ae177dfb978ac17abb03 SHA512 bfdaae60f4fe32b358b232678330453d0b9e773308e65080aa9dee543852e4c148cc848202839743e109863c9f132980cd0968f5d14e524c54ac9e8754120d11
 EBUILD wireshark-3.2.3.ebuild 6867 BLAKE2B 9a09a6c43b745de8f645ac354a2428b152dd8b9209c2ba46210e80a0906fe5d4e929208cf1fd9975ead7aa94153ef5f946ec53f99dc47679e233d612b1ec7dc2 SHA512 0e3475aa1e2e1483d8c9ce42e0c832a87a1dcee64e6adf0f6d590824cd98cdf08d6169cb52cf0f03867a94c5d9c2c5bae739c794cb7ae733775932b813d5e93c
-EBUILD wireshark-3.2.4.ebuild 6956 BLAKE2B 622eaa1152f36da65dd57b60570883cfdd7a798b1c1f015d864e4cdcae0d39a29a98daa6390ad77e73fa0e8fbc685127ae09e3c7efd90efb33fbec3f97fc46e8 SHA512 2b95739b7962e1df20e7fabd4d240e52f8240f4b6250a4cecc43d03e594411153ad801cfe8f4db5acdd720e0812ff5dd7a13f57738a03a6ae37aea915aec7aeb
+EBUILD wireshark-3.2.4.ebuild 6971 BLAKE2B fc8cadd97883a21dfba1798e6f06a3b459ff657e722888d8e51667550302aeda7fef26ed3e47e326c579cbf80853d3bc745c0d57307ca0b09e3414b1cd10ed07 SHA512 f77ea2d771a65ed2bcd130a7f8b3aa2039b9d3b980297b9491065fde490b38d5f9c29e98b6205aaa1a7ec76fbac5d90ca1e92edfdf901ede06f9b1721a6c3749
 EBUILD wireshark-99999999.ebuild 6652 BLAKE2B 4e5c2ac6267be8cc6f06b5ce4a328dad51bfdd29089c532d15269f900f6c2e44b865ba12bbef73e83afa18237ab7e72b9e61fdc70fab13e41f61bb4c318a4734 SHA512 42909bd29e683ee9fb724324a47e538486e413135f4b004bf9b12144a09235de393c82b1f9b2e48e59ae61ba9102fd86f52386203ca693f593def3facad99119
 MISC metadata.xml 4887 BLAKE2B fe155238f794922efa1707256697726e556138179e431ca65376fa66c9904ef1cdbbe6018b583f61af3969be618e90b999969da92ce1b782f30f412b0c8305ca SHA512 40e145145120e0301aae8438d8b8782d2414946ac80f5e3d051261eb9372b823a74e4f779d5c4413fe9eb833c2f48e149ca64259f7498bb97275eadc0238a7b3
diff --git a/net-analyzer/wireshark/wireshark-3.2.4.ebuild b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
index 2a81f3c683d0..50b70fda998c 100644
--- a/net-analyzer/wireshark/wireshark-3.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 IUSE="
 	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
@@ -87,6 +87,7 @@ RDEPEND="
 REQUIRED_USE="
 	plugin-ifdemo? ( plugins )
 "
+RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 9424af365cc3..e91754ee688e 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -14,10 +14,16 @@ AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1
 DIST zabbix-4.0.20.tar.gz 17215217 BLAKE2B 144b334e78b121d0ba01b285590a6d354ed54be8dcebc12216b51f9829dba98c76d122bb329efbf67931237636fe178ecf5dfd141954fe37d1063c24c3c6dcda SHA512 5f761ba8bd3eac67de9f8d3614ebf437a6a4cdad8f0bf961c8b4cbe39f13bafe64bdb58b6ba56f1a27304ebdaa32109447bd3328fd3e2fcc1aacde056fb1d5dd
+DIST zabbix-4.0.21.tar.gz 17300931 BLAKE2B c4063b4f8f58191837e48c1cf27be1cc0c2e020813724b236490e8f73c73404d55c34247cb145bd4fbad3537398a4a061e2de350c8f81f1c2ea5d1ff2cc9edeb SHA512 d5eac5474dcad005466200868fa4fab86abdd41eb9cf49bf6e7f52ae1e9fab82757d5a96f373154edd275bfa22461a8f7f2bbf70b419b2918e8dcf872818aa76
 DIST zabbix-4.4.8.tar.gz 19457802 BLAKE2B 4cc566b744d500c5f3a95eeaebe5418ff58cf3852318f474991706b0f81d1a9b0a1b3793e3e28b99fc45f4a6bfb9281c4d42acb5bb8fc49c37802d3c245dd853 SHA512 bd850d4ec8f30b9bcd531d84606c900692be5b91424cb06f66cde24ed4634a93d25476010e4387b51933406c2552a611e2e7ec4691b57ca6c38fc874c4b1aef1
+DIST zabbix-4.4.9.tar.gz 19562839 BLAKE2B 04737c2b49eb1091359336339f2d2ad43c7d2df2aa6995f56fa91864beea95081f1b7981eff9aba2b9e75fc8208bdabeb57cc947c37a334ccd7dd6d91b908e3b SHA512 41ad54a57c7b4bfe467bb0dca16dabc609427b723aa0cbc988575f828fe8edcfbebda0a201a944f37e028afd9002da48bb6e32806dd215df9716e797926dea01
 DIST zabbix-5.0.0.tar.gz 18519888 BLAKE2B 028fc41d4ce250c558130a631aaf385b0a944885a820f63aa3052738f767092ce71dfd65e52750dd61276b6171caa739eee5a5dea0002828a12035cc51a6f2d7 SHA512 056aee99d19def2f673813e29bb7869fa7906abe6956fddbeac359195167abe06add21ef08baf68a5ad6e256323a797e604cdd7828f34be2762daf7b31923984
+DIST zabbix-5.0.1.tar.gz 18623104 BLAKE2B 3f2afcbf22f306e007ee1550de2bbd4c31b481b892bf490b21de22de96f66a568e0eaefe187400d1850f66bd10e622bd90e821974e61c3d750d86b8a6f2e5601 SHA512 66d16d6c8e0bac235b23bab9d6f5f5c29d96b508fd4834c16f82b7ca33591e36e44cd982e918c1c4736331d3f8c93535616c64be5596724842b1af5621508490
 EBUILD zabbix-3.0.31.ebuild 9212 BLAKE2B d7336dade436fb0d8257b60c57b0ffb7c5ece865fc422c860c5f1bed28219b85ef3efb22ca5f3825e27903509b6f97cee28ffa7edd687c0f34f7c869bd5f2027 SHA512 2ff1c545e08e419e3dd813749339c1edca5fd035e50cc4ad7965500c1fe8add46b5ddd864932c4bc11952117e7c3df619f8aa42f815a04e3114e8f46c45cfd3c
 EBUILD zabbix-4.0.20.ebuild 9219 BLAKE2B 260a527502f825cd65c1192542dac57c14ff68f14acbd6b6c8f3c320aa2dfd62dde1cd7d71d764bdf3bce229a7e1d2618800633dc70e1911af7536f479c38e89 SHA512 eb752f9ed9c9fa64a118df3cc824a08af8a832e7d2202d4ea966c80448ed2d3c30aeee17d7d1c34b2f4bcd19a3a9f717144ba798066559a24e7ac935996ebfb3
+EBUILD zabbix-4.0.21.ebuild 9233 BLAKE2B 88c1ed41839445811f8ed60013f1d6db671f3ae1b7622fe38460ebf4e1f71594f0d567b28ea268b9859a81ba7df2a0dfaef960c0687a2ed6164699b6430493de SHA512 99f22868531dbd8f9574b5bc7ca96f0c7cfbffad22ffee95d7dba7f90cc89ec9166cfa0a8cdcec2070a49722b6c39a283f82b986dc8886532d6b06d94905bab1
 EBUILD zabbix-4.4.8.ebuild 9088 BLAKE2B a5681497e0f1bc1c3b10a5a2f6c0233787d379d82df41cd3c2852f22acde9954ae40b22dffc209616e5ea04ce3825fc2610b7f5ae7a86bb21b1a3855006e71f5 SHA512 17b71b82bf1660b873c4528e316cae3f713209ce1e2b54e6a9272b8d2ed78d2b387f6efe021ad3acb4bd70425d8bea1c8eb94013e72d88a6952a47d776f8d84c
-EBUILD zabbix-5.0.0.ebuild 9102 BLAKE2B 03f011a80a0b3ee224c24ab3d4cfeef0e0307a70202cb7af82b8b043fc6729fe9e1750d018422e50106f2f60b15c09e7ab1becacc271d39e8e6178de67d2fc11 SHA512 f50a8b85390edbf70fac2edd58dba016e69360a36e3485bf5633f59f4dabf6994924b134d42ab7386329e0658e3bc3979ad90b3759c905ac322870b5b97e3839
+EBUILD zabbix-4.4.9.ebuild 9102 BLAKE2B dfaa4ba55529471d3499a275ecaf0a177d15a1c2cd565fa9f955a1e2cfb48576419783f582739ec60305c317bdc22cdb6804d46543d01950f2e1920a4496d1b3 SHA512 89224dadb5f782b63f63caefbc1530fae877aa9900e162fe8d214473ac2663ea33253672ec4bc95d6f944f696e515ed1a801536012c6abab0e844a7107eca5c0
+EBUILD zabbix-5.0.0.ebuild 9101 BLAKE2B 4d2882b54f64c23acc250da2de5787cec25cf9bf9ee4b4eb1332cc43e6408d0d888a49d9bcbb560d095d54e3b7f34210c1f4bc03547f0df3d3c61ad0c81e2e24 SHA512 9244c71faef8a4945f0b0fd03235426966f7abecf3fa8d28034df340375fdf684bf5fd695c06ba94d4411ba0a4db17dcc64d757d135f9b4853a993cf53a0154c
+EBUILD zabbix-5.0.1.ebuild 9102 BLAKE2B 03f011a80a0b3ee224c24ab3d4cfeef0e0307a70202cb7af82b8b043fc6729fe9e1750d018422e50106f2f60b15c09e7ab1becacc271d39e8e6178de67d2fc11 SHA512 f50a8b85390edbf70fac2edd58dba016e69360a36e3485bf5633f59f4dabf6994924b134d42ab7386329e0658e3bc3979ad90b3759c905ac322870b5b97e3839
 MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173
diff --git a/net-analyzer/zabbix/zabbix-4.0.21.ebuild b/net-analyzer/zabbix/zabbix-4.0.21.ebuild
new file mode 100644
index 000000000000..844a2e68741e
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.21.ebuild
@@ -0,0 +1,350 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+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/4.0/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	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 )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	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 )
+	ssl? ( dev-libs/openssl:=[-bindist] )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	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
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.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
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with ssl openssl) \
+		$(use_with xmpp jabber)
+}
+
+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.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		systemd_newtmpfilesd "${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
+		systemd_newtmpfilesd "${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
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.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 frontends/php/* "${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-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.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.6.1.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 (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		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
+
+	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
+}
diff --git a/net-analyzer/zabbix/zabbix-4.4.9.ebuild b/net-analyzer/zabbix/zabbix-4.4.9.ebuild
new file mode 100644
index 000000000000..3d4726270762
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.4.9.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+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/4.4/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	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 )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	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 )
+	ssl? ( dev-libs/openssl:=[-bindist] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	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
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.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
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with ssl openssl)
+}
+
+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.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		systemd_newtmpfilesd "${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
+		systemd_newtmpfilesd "${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
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.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 frontends/php/* "${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-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.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.6.1.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
+		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
+
+	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
+}
diff --git a/net-analyzer/zabbix/zabbix-5.0.0.ebuild b/net-analyzer/zabbix/zabbix-5.0.0.ebuild
index e393d4a24eba..0918dc7c5b0f 100644
--- a/net-analyzer/zabbix/zabbix-5.0.0.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-analyzer/zabbix/zabbix-5.0.1.ebuild b/net-analyzer/zabbix/zabbix-5.0.1.ebuild
new file mode 100644
index 000000000000..e393d4a24eba
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.1.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+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"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	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 )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	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 )
+	ssl? ( dev-libs/openssl:=[-bindist] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	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
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.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
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with ssl openssl)
+}
+
+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.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		systemd_newtmpfilesd "${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
+		systemd_newtmpfilesd "${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
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.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-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.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.6.1.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
+		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
+
+	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
+}