gentoo resync : 18.12.2020

31 files changed, 435 insertions, 1349 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6aca37d5db6e..20fca1138f6b 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index ec66c51686db..4924b0ae16f9 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -3,5 +3,5 @@ DIST bwping-2.0.tar.gz 106255 BLAKE2B f3ff631a1d9d5aed9645558c639840055bb041612e
 DIST bwping-2.1.tar.gz 110702 BLAKE2B 3bbd5f7b57e3afa29aaf7015609fe472457713651e1d1532ad1cdcbf5b39d4c556bb6d3e675ddb8fd97ef289942fe11e5334f04ef46f489fde2785cbd80f3a3e SHA512 bf2a17e7b5d073f462b5090591550347e65c2748b3460f0126bc4dc78c930237cece3e67957d4c73161ce58107856187c24d401dda3f13b40b97bc01b2cfa1df
 EBUILD bwping-1.17.ebuild 386 BLAKE2B 20093e8b15046b5fd585880c5c6cdc7d6a64a4e4f72969cfc0ca5ce5a4199a89cbc09094f6c325024fcd6ccb8ef175abbebc30dbcd3f3453129a86730eafacb0 SHA512 e45c6be1427b27a1d3e53a6fafb1e0f786b2544744ad585a479ca6909f06fb25332a6ed7e816bb73cf85941600178084e927b147053e2ee272877eeebd4cb558
 EBUILD bwping-2.0.ebuild 388 BLAKE2B d6eae0f0d7d6445e1f6b5b052bd5f6d884d58d0ae843b3c214521a52dd4ab0ce2829089f545198e74d60a097a72bd0b7f4d4eb214d251efed69334dd187d4ea2 SHA512 36203eaae072be8a73e1df310b47e9e2582de06043f1fa9d4b695abca6cfc429578cf7b1a154358bfc521c92f48bfa92a3a4da7c5848bae4c6835ff3cd1ebce3
-EBUILD bwping-2.1.ebuild 387 BLAKE2B 4b5a572ff68d6a4571f48462e997df90e38c165cd3e1eb7744d5d2bb02b7f17ed29ebdb1ce7626acfccc01804d6204244088fd877be7833824b57ad9d64017e1 SHA512 58e5e25d21c8268b786c7b2ff5b1c0ec3034d30fc892931910b3122ceeb81de2867c7b245e9c36d03744b86dd7bfc3d0ddf3cf5a065d3857cdac9029f2cb3a0d
+EBUILD bwping-2.1.ebuild 386 BLAKE2B 20093e8b15046b5fd585880c5c6cdc7d6a64a4e4f72969cfc0ca5ce5a4199a89cbc09094f6c325024fcd6ccb8ef175abbebc30dbcd3f3453129a86730eafacb0 SHA512 e45c6be1427b27a1d3e53a6fafb1e0f786b2544744ad585a479ca6909f06fb25332a6ed7e816bb73cf85941600178084e927b147053e2ee272877eeebd4cb558
 MISC metadata.xml 651 BLAKE2B 5879ca4d339fc3b541e1b7f68be857a9552c9a06efd8b1985470f5143f1e1e14edb0eccb4815b7498590718a02ddbb155a1e49556cdef76ebd9fae6dc6f306c8 SHA512 bef41fb4c3d894de7f2b39b16171fd22e6ce584d2dd2a65e2ce2c645ffc4ae1d1b38d7667765fa3e6fbfacb92cd3ef7006d141b14a5a476489ed235d2ca095e0
diff --git a/net-analyzer/bwping/bwping-2.1.ebuild b/net-analyzer/bwping/bwping-2.1.ebuild
index d036906fb29e..4743efcd1e43 100644
--- a/net-analyzer/bwping/bwping-2.1.ebuild
+++ b/net-analyzer/bwping/bwping-2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc x86"
+KEYWORDS="amd64 ~sparc x86"
 
 src_test() {
 	[[ ${UID} = 0 ]] && default
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 9e8776a92305..63e08bd39129 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -5,9 +5,11 @@ DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B d247a4c0272227e0dfa2df46f91d84c7630c5
 DIST icinga2-2.12.0.tar.gz 7530104 BLAKE2B 6f4a37d638449596d163add4ee070d24c1eb5f483e32f6c666454353578e6399a04cda949cb51b135516be7b437196e5beeff0e5e24a7bc26b855de87e24a797 SHA512 2a0ead159cfd71ebb662b909d8c4a64bdf13235b14d37b67057034da4fbf8764167b175e20f635989a98faafabb5da4f71321a4f8592172bed5cbb3ee557b276
 DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6 SHA512 8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529
 DIST icinga2-2.12.2.tar.gz 7534173 BLAKE2B 58aa25be81cfd9d674371dcd17043fbdd8fd9f03b2fdbe994101dfe6088ed289e64c213bb5ec1c62863fc2a5d015f2ee928a4bd45343eeead62aea3472faf187 SHA512 db61843f0ea0e05ea8c0ae035e6fdaf1ebc03115b0690a0465ef1847426656acd8ffc108e36056a46cfbc4eb9538c612bbb5adff2db72c9cc51330fcdd62c136
+DIST icinga2-2.12.3.tar.gz 7534454 BLAKE2B 021f940b3885c90cc43b4708c83430685fdb692d5ce95ed0f667a95b7dd2f4817b30fb7b05f1e214ba3aa31cef806af0f83e68447ece94916d806fb95f66526e SHA512 28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799
 EBUILD icinga2-2.11.6.ebuild 4584 BLAKE2B 26ebea2c0c182362d24720bf50b95bc5ec364629c0229d2399c666081570909d66f3cfb4dd357a0b5c61447a5a369bbb833fc51c1fc1a99a6902ed33c4ca6402 SHA512 801050caf9c1ac07a2177f61965aac1829b8ba8bb8961c7a6f300ac1fadee3cee290cf58d499c8e6f52dada72a659baaf8905cf636cd3dd369764a2a4781af09
 EBUILD icinga2-2.12.0.ebuild 4582 BLAKE2B e4f9f977636053c64d8a1bb86bf8f62cb5f42f9a3fea84bb90eb03470533a6b29a24851023b6353558fd8ae3ef7622759887b559b7080aae400505eaeb7e8838 SHA512 94ef9210e2b300cf6aecf8b3caedc9fde4e17b53b90ad554737a94c0207d86a31c139e1280ae55ca17332cbe70326afccb1e7670d2eea279fcc5d42dbbfa9678
 EBUILD icinga2-2.12.1.ebuild 4060 BLAKE2B f775606357a69066c8cbf1cd2e686f623e4e88824e703f6b4dfe4280ca3ea0620436ef156625974ff5e9cc177b206101a968892b68fc4783828a4192b39ea67e SHA512 5f37665f4efce4dc3f7bc26620b8573606ea45a77858a66c0feb881644dba96c9ee1215912c9b0787e58e5e63ab988d0b96ab7de854890dc0467cd02b300c4fb
 EBUILD icinga2-2.12.2.ebuild 4062 BLAKE2B d1f56152154fbb597dcafbe5e567af8e84b7bb264cec07a513c2d0f8f1933714c0da7c34754e33c39198d46a964629c31010f4657c849bc0779da26daf2b5b79 SHA512 d9757572257d0bd9ca576cc454b885b9b7f4f5419b3de85e61e1b7bdf75b40dd4dc9355543249d61d9900a1c5d0023812d7f4fdbbb934b5af35d25cdec0d5004
+EBUILD icinga2-2.12.3.ebuild 4062 BLAKE2B d1f56152154fbb597dcafbe5e567af8e84b7bb264cec07a513c2d0f8f1933714c0da7c34754e33c39198d46a964629c31010f4657c849bc0779da26daf2b5b79 SHA512 d9757572257d0bd9ca576cc454b885b9b7f4f5419b3de85e61e1b7bdf75b40dd4dc9355543249d61d9900a1c5d0023812d7f4fdbbb934b5af35d25cdec0d5004
 EBUILD icinga2-9999.ebuild 3930 BLAKE2B 20bacd633c55857af4e85b4ddf36ad86cae209adf380a183c35157bd69c553d70731ba699a6c706c0f77cfd03563af8fdad9748856cd1b91a9b387c5f175a035 SHA512 1249cb4f89bbee800a7cc8e8a35da90b6978878c14860e2d93651de641268328b2b1ffafb2363fb96c3b45de3b180b278a59cadcf0a4b2210655f3d8770a3285
 MISC metadata.xml 870 BLAKE2B f18bef5b15712d2fddf22edaaf628b4b9bacbb92fd03750b0d956aa7e13baaf389c131b929236158f1df8c718c754bd55ef6031cca282db0b22d2a4d94a353a3 SHA512 30744556867891c0a4e3ab86dbebdd6b1191bfe25f8b9f997fc8c88b3b8d69365a33184c7ae2cfa7fee5c19e8c348c768fcdaede7a0e4ab5c28927bc09151ae0
diff --git a/net-analyzer/icinga2/icinga2-2.12.3.ebuild b/net-analyzer/icinga2/icinga2-2.12.3.ebuild
new file mode 100644
index 000000000000..8ec76ee82fac
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.12.3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+	!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:=
+	acct-user/icinga
+	acct-group/icinga
+	acct-group/icingacmd"
+BDEPEND="
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+	# https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
+	"${FILESDIR}/${PN}-2.12.1-boost-1.74.0.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DICINGA2_RUNDIR=/run
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+		-DUSE_SYSTEMD=$(usex systemd)
+		-DLOGROTATE_HAS_SU=ON
+		-DICINGA2_LTO_BUILD=$(usex lto)
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres)
+			-DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+	if use mysql || use mariadb; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/run" || die "failed to remove /run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}
diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
index 427305139843..f3b787ec08ff 100644
--- a/net-analyzer/iptraf-ng/Manifest
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -1,9 +1,5 @@
 AUX iptraf-ng-1.1.4-tcplog_flowrate_msg.patch 330 BLAKE2B edf2d08df81fb65c1f05bffd28bec622e008baa532353e90c5f275f10333dbbe1b67d9e2b801bbb424ea56628808b0f0a6f06fda6ee682deed42c71c9387a3ab SHA512 4b0c318ad245a82bb44243e23322f3d71ef4af9b4c86c95911e4da1e8145418ac7b9ee76c7d33bdf05c1189ec782443382de773e228c76f179fab87d5e897ec6
-DIST iptraf-ng-1.1.4.tar.gz 583306 BLAKE2B c06fdc25838901fc5528057ade5ebe28b5679a6a545f461cef2a5f4d3cbc1346a7ab3e94f4fe317a1760067e480c3c622df1027591d978b0ac1236ba9203e9da SHA512 8cafb0000cec75eb4071156a9e9350ffe6de99cb6386e8f50d05337113872ee50082a30009d85faa02d83633a8e727039791332d600654321b95ca6cfc881774
-DIST iptraf-ng-1.2.0.tar.gz 324969 BLAKE2B 45a67fc64b5ab518339e55adfc158c8cf10eacded15941545d8d7cee19c954aae2619c39a11b1eeaa79f5a381b5dcf2e6a6e0b8fdd7e78e75f41ab10b71e6a0a SHA512 6dc3b5deb7c6fb3776ce696492975db43c13fa2d1d956712e7738ef34ac1bfc5f5d63a5211ba8e9fabf391e8bc5560c08c5d5e219b0cfe067e3499b2c02e6f3d
 DIST iptraf-ng-1.2.1.tar.gz 325177 BLAKE2B 9b8df7fa24711b401464d492993b9c27424ec7ab6230218d1b792a66e5fb60c99b5cdb92ac1b5a6da578c4b10da79333f248f14d10e74057118aadf50263a4ed SHA512 44d36fc92cdbf379f62cb63638663c3ee610225b9c28d60ee55e62e358f398a6b0db281129327b3472e45fb553ee3dd605af09c129f2233f8839ae3dbd799384
-EBUILD iptraf-ng-1.1.4-r1.ebuild 1326 BLAKE2B d5d601fda955334b542f7d16413c02bc53a74ca917b7e0dd225393cd37754e7090983ac97e71813ff3f9530d34ec4ab129f96c0041f34339470e7efa56ee2a54 SHA512 8e0bc6972a46fb21b3fa04e17236d68a07c7d4fb83bf0a850d520b2f00e7e95dc115993c2c5f207aad4749e4b58040376a2c8f003113b0b3cc171b1bbc77555f
-EBUILD iptraf-ng-1.2.0-r1.ebuild 1222 BLAKE2B bb684c951569993138a987ef80cbd561d3054f33eec02dfb3144a2fc57b0f69d2091074e53f2ca2d44823ef6b51b0106ab207050234a4267bb5f035a79376c69 SHA512 69c3a436210c8d9cef2acdc7e7b6c9d361c98a8cdef4218b8f8013bf00387397b67e7c8587ad11fcbabb45ccfa28864b67ba4ae9a6aa2485e69cc73230216be5
 EBUILD iptraf-ng-1.2.1.ebuild 1223 BLAKE2B 65337b95d7cea650e2c5bf9ed258bf46af427e3fc6f8585df657d6a98aa702bf4c6379e19b2f525b9fcf65689033f5f06ffb706d8136cc3aa356763718082528 SHA512 0bc4eb5554c28bcedcc6feb6ae0a54389a626f70a72394a8215f9ec2f384ff0c34ce456a087a0284cf53a7377e0f84d1cd1b4886ea376741a20be4694e2b889c
 EBUILD iptraf-ng-9999.ebuild 1150 BLAKE2B 5b02da16a8fbff3bb5ef09536a69094088a7e4a1793f83272169cd9c91d8884647d643154cad17b267c1433a7e98735d7267e76e703a2bad0f49e2bba8c6bb24 SHA512 a8b3ff516d68e0dfa95c763f478dfcc66f556d93a814ee97362e54cafbb0465600459939a8d8cba58b7ffe35fd6de65b4455521867c7219ff8d0618bc9bbaf51
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
deleted file mode 100644
index 3a2bcb201de4..000000000000
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.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 toolchain-funcs
-
-DESCRIPTION="A console-based network monitoring utility"
-HOMEPAGE="http://fedorahosted.org/iptraf-ng/"
-SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 doc? ( FDL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="doc"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.7-r7:0=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-	!net-analyzer/iptraf
-"
-
-src_prepare() {
-	sed -i \
-		-e '/^CC =/d' \
-		-e '/^CFLAGS/s:= -g -O2:+= :' \
-		-e '/^LDFLAGS =/d' \
-		-e 's|$(QUIET_[[:alpha:]]*)||g' \
-		Makefile || die
-	sed -i \
-		-e 's|IPTRAF|&-NG|g' \
-		-e 's|IPTraf|&-NG|g' \
-		-e 's|iptraf|&-ng|g' \
-		-e 's|rvnamed|&-ng|g' \
-		-e 's|RVNAMED|&-NG|g' \
-		src/*.8 || die
-
-	epatch "${FILESDIR}"/${P}-tcplog_flowrate_msg.patch
-}
-
-# configure does not do very much we do not already control
-src_configure() { :; }
-
-src_compile() {
-	tc-export CC
-	CFLAGS+=' -DLOCKDIR=\"/run/lock/iptraf-ng\"'
-	default
-}
-
-src_install() {
-	dosbin {iptraf,rvnamed}-ng
-
-	doman src/*.8
-	dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES
-	use doc && dohtml -a gif,html,png -r Documentation/*
-
-	keepdir /var/{lib,log}/iptraf-ng #376157
-}
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.2.0-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.2.0-r1.ebuild
deleted file mode 100644
index bda05a1a02a4..000000000000
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A console-based network monitoring utility"
-HOMEPAGE="https://github.com/iptraf-ng/iptraf-ng"
-SRC_URI="https://github.com/iptraf-ng/iptraf-ng/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 doc? ( FDL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.7-r7:0=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-	!net-analyzer/iptraf
-"
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e '/^CC =/d' \
-		-e '/^CFLAGS/s:= -g -O2:+= :' \
-		-e '/^LDFLAGS =/d' \
-		-e 's|$(QUIET_[[:alpha:]]*)||g' \
-		Makefile || die
-	sed -i \
-		-e 's|IPTRAF|&-NG|g' \
-		-e 's|IPTraf|&-NG|g' \
-		-e 's|iptraf|&-ng|g' \
-		src/*.8 || die
-
-	default
-}
-
-src_configure() {
-	# The configure script does not do very much we do not already control
-	append-cppflags '-DLOCKDIR=\"/run/lock/iptraf-ng\"'
-	tc-export CC
-}
-
-src_install() {
-	dosbin ${PN}
-
-	doman src/*.8
-	dodoc AUTHORS CHANGES* FAQ README*
-
-	if use doc; then
-		docinto html
-		dodoc -r Documentation/*
-	fi
-
-	keepdir /var/{lib,log}/iptraf-ng #376157
-}
diff --git a/net-analyzer/macchanger/Manifest b/net-analyzer/macchanger/Manifest
index 52566ee7abb2..6d99141e7b06 100644
--- a/net-analyzer/macchanger/Manifest
+++ b/net-analyzer/macchanger/Manifest
@@ -1,7 +1,5 @@
 AUX macchanger-1.7.0-fix-caddr_t.patch 352 BLAKE2B 915bfe65108678b61c75fcf46338be1f05c2cbc482005e2bca917609d66a681e5ab36ad30fe6313395d090c96aca2a091ef60b22b0d2c25c0f975d99cae39ccd SHA512 493eaf79e658a23e55e17b95b63b457032eff8c73bf309df7605400ceb2dcd4331a83c2b8383bd04d564478fb50654ebbe9506d65946f960d2964b2b4e32f620
 DIST macchanger-1.7.0.tar.gz 396848 BLAKE2B 7a6e5cbf302568884363ab4023033b53b1adc16896d7f88b1717f72b1b2a4d6d2dbfa2259a5c4aaa38d72201c5624a648077730cbc25f869f5f50a343bb93d0c SHA512 69f2008ace6ff8223ecf25805c08ddf42add9ed16c65f3bb57f74b8b0d080d584381ce79592d2ef581a9ba73f12624dae8db63dbb12e4875dfd29d828a4a5da3
 DIST macchanger_1.7.0-5.4.debian.tar.xz 25084 BLAKE2B 65d39333e07a4c89da7e622aaccc0f2cab45af8d84721c3d39c457dfaf3063df872812d07860cbe78634159b0a2944e75aa54c11f46eadc37b9d4a23fc81b629 SHA512 b50b52532fc987f443088f2a4d0f2327dac972e69bc4c0bc0a94de4583df76c7d32c40a143d24b7fa6e066fc36b89c4b160c02b26860c484aab5054a4032f0cc
-EBUILD macchanger-1.7.0-r1.ebuild 827 BLAKE2B 37ea254281948010006d9c4d8a2bc367890ce5f3f01018c8948d6bc11619ea0c1b0bf9dedba72f166c44c4b7130084552c53c4db89666322f008c36341318be5 SHA512 e4ea29afaae5fef4772bc7f35b050047ab4c0b8338dcd99c3e1ae9548a2f484b75796161e07de1d774b723080fd349c06e44d4a64f1293bbc850d2b594c7fdc8
-EBUILD macchanger-1.7.0.ebuild 786 BLAKE2B 5c254408e09b2c9ac7d3be4f7c96f50619dc534b25de339b8bac9281c250bd5d9f5dfa73120e2d9b01c27a54cfe8735314cb5fe7594d3d650f82b6d71ead6497 SHA512 f41d16d66bb5bfa112b988fbda7d70a0ef21f8d638811bfb2eacfdbd392170c1fc3767e702804c2e2d62f54efc2d4509e0cd8404eca7532d6872b443bf8b76fc
 EBUILD macchanger-1.7.0_p5_p4.ebuild 1316 BLAKE2B 8fe7a2a3efcd35b4acfcde041b5a148a0a56038a48edf3dc2205de8fadaeca17f588713c75e2470bb61ee99a5e665917e912a5297e0e5e7d67c563c14ee46841 SHA512 9b071279080331609b19e244d39651d96791c2bf06ac4f27adad4eb62481877c2a17bd44e3885341821cca500625ac7dde00036ba9f3322e9f67bb21189e7ebe
 MISC metadata.xml 473 BLAKE2B 4bc062f103c20f1f68bcd0242fee42a5e5c1b8ce862f336fda153bddc6294ff7e382edd5fb4aaf7091b1701cfb88b5db82da3f1b0cce7d8bcc4ef0141ef0536f SHA512 f328b70876919441f61939ad0198c98acfcae561b3eb27beeb6d09d565191f64075a63e7f99af6d69493c6100256fb2cec0a3b60b62c7d28fd41c885cedad4a4
diff --git a/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild b/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild
deleted file mode 100644
index e854b260252b..000000000000
--- a/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces"
-OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source
-OUI_FILE="OUI.list-${OUI_DATE}"
-HOMEPAGE="https://github.com/alobbs/macchanger"
-SRC_URI="https://github.com/alobbs/macchanger/releases/download/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-caddr_t.patch )
-
-src_configure() {
-	# Shared data is installed below /lib, see Bug #57046
-	econf \
-		--bindir="${EPREFIX}/sbin" \
-		--datadir="${EPREFIX}/lib"
-}
-
-src_install() {
-	default
-
-	dodir /usr/bin
-	dosym /sbin/macchanger /usr/bin/macchanger
-	dosym /lib/macchanger /usr/share/macchanger
-}
diff --git a/net-analyzer/macchanger/macchanger-1.7.0.ebuild b/net-analyzer/macchanger/macchanger-1.7.0.ebuild
deleted file mode 100644
index 009b018eb6e0..000000000000
--- a/net-analyzer/macchanger/macchanger-1.7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces"
-OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source
-OUI_FILE="OUI.list-${OUI_DATE}"
-HOMEPAGE="https://github.com/alobbs/macchanger"
-SRC_URI="https://github.com/alobbs/macchanger/releases/download/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm ppc sparc x86"
-SLOT="0"
-
-src_configure() {
-	# Shared data is installed below /lib, see Bug #57046
-	econf \
-		--bindir=/sbin \
-		--datadir=/lib
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	dodir /usr/bin
-	dosym /sbin/macchanger /usr/bin/macchanger
-	dosym /lib/macchanger /usr/share/macchanger
-}
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 424e90c40bd3..dd27ae23c3dc 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,10 +1,4 @@
-DIST netdata-1.23.2.tar.gz 3839012 BLAKE2B f0c225307b61a0a3b5d581e6d5e4a90d5f26ad0aae49e32dfd3dc36405e48d2e8f7a088c31a2a19059418f88e362eb9840b6c020f5459a0d0388f10b7c729eb0 SHA512 4a4dc647e0326da4f785444e15e2f74af09428374bfe2db57c44dd2765ce77b2babbd8b52e33e04f49b95937a6ca8691ffa18b51d1717ea927025b70fa7e369f
-DIST netdata-1.24.0.tar.gz 3876403 BLAKE2B 36a2413039f89d4a9f4c60a6ebe319b5e818b9a0f57e722cd7e29293452faebf264cf961530a03c9a8ffa27fe9f12caf5c54d1e58741641a1be76e936a0e3222 SHA512 18276605f74520b3d55b8a67bfbee7cb2483d472becbcab7e2b1af19f08b05ffd2a83e6e8eec98733abde8ba1f552eec919e8ae59266cbec7c2c94beb4a2aeb4
-DIST netdata-1.25.0.tar.gz 3891805 BLAKE2B 42e6f1d2a20bce352fa5bbac162ff906a150069d3dd7e4c83f7315a6962f4e33f6a5a65e500b4763ad6f0778d71e93226604c6b0bee2f8fdcdfc9f36f07f7033 SHA512 d92249a2fab28ae26132708bc79af591f8050fef2e82b331d3756c84e21072bfd6f6b1158d8ca912a500ed7fd65e4e3005828b28180befa88d2984dde8bd816b
-DIST netdata-1.26.0.tar.gz 3932155 BLAKE2B 6b119080c6d6a96bbe6add9e38c035950f5380ebdbe882459aedcd95514e87572c5da384893d917b4dc7810c34a7f80e56b59b29a4ecf5f0b65c3124b4a4aa79 SHA512 0a4c538387a28da9999e3a69cbc5c80ba8d5542185ef91cd8440a9701875b7c1c5b62bbc3a471881cd6d494beea5618971e90228d65c8497d88e83ccf5164fef
-EBUILD netdata-1.23.2.ebuild 3463 BLAKE2B b5e436ce4a334b4c28843ca5bbacebe690c80079c0342b942c743f29c7d6ad291a9171ca5b705567f03e9d8207f9e65e8b335a6c33256865c9910e98aee18c41 SHA512 a4a32b5f593c13cfb64f83fa7baa7cffad6f4a4e0f6b7a6c88c48740b3c9434f64d7043f4b3406b20aa38653585e5cf5e6393fb3ebe27e8a6c761251bff0b4a0
-EBUILD netdata-1.24.0.ebuild 3463 BLAKE2B b5e436ce4a334b4c28843ca5bbacebe690c80079c0342b942c743f29c7d6ad291a9171ca5b705567f03e9d8207f9e65e8b335a6c33256865c9910e98aee18c41 SHA512 a4a32b5f593c13cfb64f83fa7baa7cffad6f4a4e0f6b7a6c88c48740b3c9434f64d7043f4b3406b20aa38653585e5cf5e6393fb3ebe27e8a6c761251bff0b4a0
-EBUILD netdata-1.25.0.ebuild 3463 BLAKE2B b5e436ce4a334b4c28843ca5bbacebe690c80079c0342b942c743f29c7d6ad291a9171ca5b705567f03e9d8207f9e65e8b335a6c33256865c9910e98aee18c41 SHA512 a4a32b5f593c13cfb64f83fa7baa7cffad6f4a4e0f6b7a6c88c48740b3c9434f64d7043f4b3406b20aa38653585e5cf5e6393fb3ebe27e8a6c761251bff0b4a0
-EBUILD netdata-1.26.0.ebuild 3494 BLAKE2B 633a1fb1e97d253730f92079216a9c2b8ac32eea3dcecfe3955213ae643649522cc135b45d7b25c52fd8d8ccb1c333432d695ca6c90e776f56e36e00668bca71 SHA512 5f4aff70a22b6db98c6656bf4d8a6d7ca1c0a5d43425030a8599eba995b62a6e9ffa0a381e7c03d46988dea38cc308719aca405db7f92856ae3638b93422086f
-EBUILD netdata-9999.ebuild 3494 BLAKE2B 633a1fb1e97d253730f92079216a9c2b8ac32eea3dcecfe3955213ae643649522cc135b45d7b25c52fd8d8ccb1c333432d695ca6c90e776f56e36e00668bca71 SHA512 5f4aff70a22b6db98c6656bf4d8a6d7ca1c0a5d43425030a8599eba995b62a6e9ffa0a381e7c03d46988dea38cc308719aca405db7f92856ae3638b93422086f
+DIST netdata-1.27.0.tar.gz 6217873 BLAKE2B 6a3b577d3c67efd925c8b496f19ef7f76fe990f381bbd8a9c1decf5e55a56e565c1b4a5f8aa95421f0e12d122a9142f23942a2d28bec434027f326b5239397d1 SHA512 90d6aa30600385e64a90b28569712f0d09e4c0dfa6de46ac17aede81189797e39c823092067b5ee8118289c7b62a224b8e7107d85f8bd6cc90311c4efaa631e8
+EBUILD netdata-1.27.0.ebuild 3422 BLAKE2B 33b578b75b69c9762b816cb5d30a502757470fc780c7f7dbfa7f33660dfd33dfc2504b509f7cbe8cd94354163ec056886eee188b6851cdc2e4f3d2f83819a4b7 SHA512 d2453b66acc2cd802e00e7de98c0730bd468669c8bd17fcfbddbc3b3347656e5754813fc11240cf2633ad38b219ef62dac0c42c21910b47ea659ec0057c910cb
+EBUILD netdata-9999.ebuild 3422 BLAKE2B 33b578b75b69c9762b816cb5d30a502757470fc780c7f7dbfa7f33660dfd33dfc2504b509f7cbe8cd94354163ec056886eee188b6851cdc2e4f3d2f83819a4b7 SHA512 d2453b66acc2cd802e00e7de98c0730bd468669c8bd17fcfbddbc3b3347656e5754813fc11240cf2633ad38b219ef62dac0c42c21910b47ea659ec0057c910cb
 MISC metadata.xml 1229 BLAKE2B 4247be48b9fc7f1e16f9a145d5c5fa6036d7721fd829d3e515903043a29397e29d9ef550ce21bb17bb3c4da012b41ef2961d4772f99b37169bc25b79e840696a SHA512 264dda2113eec7e86976c09bb0074a21c3255344be635131d737bda61ba8f95e103882d44957e92a7a44d73473448ada0041c80e63fa221b72c8d19d2953447e
diff --git a/net-analyzer/netdata/netdata-1.23.2.ebuild b/net-analyzer/netdata/netdata-1.23.2.ebuild
deleted file mode 100644
index 48231022d056..000000000000
--- a/net-analyzer/netdata/netdata-1.23.2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	acct-group/netdata
-	acct-user/netdata
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	dev-libs/libuv
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
-	mongodb? ( dev-libs/mongo-c-driver )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	prometheus? (
-		dev-libs/protobuf:=
-		app-arch/snappy
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? (
-			|| (
-				$(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]')
-				$(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]')
-			)
-		)
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --disable-cloud: https://github.com/netdata/netdata/issues/8961
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--disable-cloud \
-		$(use_enable jsonc) \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis backend-kinesis) \
-		$(use_enable mongodb backend-mongodb) \
-		$(use_enable prometheus backend-prometheus-remote-write) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.24.0.ebuild b/net-analyzer/netdata/netdata-1.24.0.ebuild
deleted file mode 100644
index 48231022d056..000000000000
--- a/net-analyzer/netdata/netdata-1.24.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	acct-group/netdata
-	acct-user/netdata
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	dev-libs/libuv
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
-	mongodb? ( dev-libs/mongo-c-driver )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	prometheus? (
-		dev-libs/protobuf:=
-		app-arch/snappy
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? (
-			|| (
-				$(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]')
-				$(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]')
-			)
-		)
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --disable-cloud: https://github.com/netdata/netdata/issues/8961
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--disable-cloud \
-		$(use_enable jsonc) \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis backend-kinesis) \
-		$(use_enable mongodb backend-mongodb) \
-		$(use_enable prometheus backend-prometheus-remote-write) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.25.0.ebuild b/net-analyzer/netdata/netdata-1.25.0.ebuild
deleted file mode 100644
index 48231022d056..000000000000
--- a/net-analyzer/netdata/netdata-1.25.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	acct-group/netdata
-	acct-user/netdata
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	dev-libs/libuv
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
-	mongodb? ( dev-libs/mongo-c-driver )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	prometheus? (
-		dev-libs/protobuf:=
-		app-arch/snappy
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? (
-			|| (
-				$(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]')
-				$(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]')
-			)
-		)
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --disable-cloud: https://github.com/netdata/netdata/issues/8961
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--disable-cloud \
-		$(use_enable jsonc) \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis backend-kinesis) \
-		$(use_enable mongodb backend-mongodb) \
-		$(use_enable prometheus backend-prometheus-remote-write) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.26.0.ebuild b/net-analyzer/netdata/netdata-1.27.0.ebuild
index f935e5a09fa2..7690ff9704cf 100644
--- a/net-analyzer/netdata/netdata-1.26.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.27.0.ebuild
@@ -35,6 +35,7 @@ RDEPEND="
 		net-analyzer/openbsd-netcat
 		net-analyzer/netcat
 	)
+	net-libs/libwebsockets
 	net-misc/curl
 	net-misc/wget
 	sys-apps/util-linux
@@ -64,12 +65,7 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? (
-			|| (
-				$(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]')
-				$(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]')
-			)
-		)
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') )
 		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
 		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
 	)
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index f935e5a09fa2..7690ff9704cf 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -35,6 +35,7 @@ RDEPEND="
 		net-analyzer/openbsd-netcat
 		net-analyzer/netcat
 	)
+	net-libs/libwebsockets
 	net-misc/curl
 	net-misc/wget
 	sys-apps/util-linux
@@ -64,12 +65,7 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? (
-			|| (
-				$(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]')
-				$(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]')
-			)
-		)
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') )
 		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
 		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
 	)
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 9bc0c96e4c8d..d7a5b7fade94 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -7,5 +7,5 @@ AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b0
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 EBUILD rrdtool-1.7.2-r1.ebuild 4298 BLAKE2B c3544426f7988eee417285de01eb5dc3f7eef7b93cece34a6fd0367e9674dc1e6f5d9e96503d704123fa94c94a2ee65cd79cbf13912d3a5020eb0f3c0129f9dc SHA512 8a46316c9a69180eaab0b78fd01b14a6f3cdffedd0bdce169c859ec618080221862f04543396dee0c7fb2a470ef2a3d8c10baf07de7121de4e201215b39ac594
 EBUILD rrdtool-1.7.2-r100.ebuild 5688 BLAKE2B a67ba4d12f5557b6a4ea937f4f64d121908ac018aa83a537099961d168b38eddd4ce8a62548e1a1a5bb99895164246bd0528a8e693ffd6cbcdf283e85ca4a57f SHA512 7088e634e9df85169cca3449a765ab722e983ab13fa0f7dec62ebcdc53ef21b908a1183a4d33dcb80b028e3dbfed09cf6e5afc153d63375aba4d0abc98ff4ea9
-EBUILD rrdtool-1.7.2.ebuild 4302 BLAKE2B 5f6968576aa9d88ffdb5f1d2e1e8381d1d28949b3790962bfa3770db8c50589575f2a1c2c8395c88b9599e57f589b5f4828a4a8db7a1fcb8e40758c6e85dfc29 SHA512 85b576cd6654f8ab87477d341553bc787fa768ace9db884f14934767f82dabfbd34a54c31bb3cf7ea9a6f9ce07cdd5fc4e6d14918a426e08c94705fabaf35e20
+EBUILD rrdtool-1.7.2.ebuild 4303 BLAKE2B 05597581a939f134663db634976647ab57abaadfc12a63c9a77f824b4910b017936bcc9c6997a1117471d019b503896588975707d115480553706f4945211677 SHA512 5c32c5ac065e682f354443d7969aa818a937d5fd99306a0aec0573285fd99bae5ce2549d970a4d5aec3cfc545165fce274f305c51fe3e183c784e5b06f2ab07b
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
index 1ee76659bd70..d09f07e3fb76 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-analyzer/tracebox/Manifest b/net-analyzer/tracebox/Manifest
index e64a8947fcc8..a5aaf39b4ae4 100644
--- a/net-analyzer/tracebox/Manifest
+++ b/net-analyzer/tracebox/Manifest
@@ -1,4 +1,4 @@
 AUX tracebox-0.4.4-deps.patch 5159 BLAKE2B cea5cfb75b407c7e9a88062abc931ae27b7f5022e586ee7f811129ac2b5c5a54a61b6a0ce71961ebf6102d1b53087e91260cfe4d8f6622d78e98e87408c2d64b SHA512 a87ff6ef0079f99241dd975d1fcb1bb3d1c2a0a623af1932d9a00b45b6d70b403e34f8dbc07551cda55707d5eea5e48a7bb7ac931474efe6186937942a769761
 DIST tracebox-0.4.4.tar.gz 76828 BLAKE2B 0c3fbe9ea3fd5a967c85cf7b175900d899885f6c43ca8ffa32ba98256490b5bc23e8f80618208df6ec05f0484e5ce27599528aa5d84e331ac71eca960b6b1fd0 SHA512 2113d6ed4543b0c3a9b44bc92c4eb8ab2a860b4409a5eba374b9960ddb4ba299a33c0dea49595c94bc725eda36633d8bb698236d662ea9cc1027070b597c52f6
-EBUILD tracebox-0.4.4.ebuild 1172 BLAKE2B 2808a98a047d80e7166aa165c389e1b93d953ea94c4d35a29a34993f0731a1b794faee9fb51f6b9cf2957faea1237dfefb2610dec57c9d9edf5690a4d200351f SHA512 c463e77f6f2b0db874cfb9aeb6323aa41284765494b248667d81752b184d2f51712da3551f56f1482bc18742957579288553d258f64eb199938346275ffd9a2a
+EBUILD tracebox-0.4.4.ebuild 1173 BLAKE2B 9e9791dc276fe0f4cbd3361e9a7de4b38340a8baeeb552bb86b1870b255043da11e6df12f01164217cecdb7067a6f90da83ca284ff4ffb7901193682c4c5e89a SHA512 3664196077455fa168ff3c8e0d5ec215ccd6e7b03c58bc73a333e2811fcac031718ba9766e516c243044e1cd84c4ec12e66ba10af42034fb0f39eb11054aff9e
 MISC metadata.xml 575 BLAKE2B 0de780b436640051b1fbcf49505d8975d39b3a4fa0d45a408718b9ca284e7f7f2609cffcda406c84fdc5b6fe2116d579e5624d8557751e3888c5a45ebdf95d54 SHA512 9cfa13bf788534c7bfd4edf945efa310e24229e9d777eecb1ad371ed99c13f39c63af14bf41e441ef94bd75ba53f318f23d48fd4fccd2d49e8d64b9d8fa2d83a
diff --git a/net-analyzer/tracebox/tracebox-0.4.4.ebuild b/net-analyzer/tracebox/tracebox-0.4.4.ebuild
index b7d29b7c46ab..a463e775906c 100644
--- a/net-analyzer/tracebox/tracebox-0.4.4.ebuild
+++ b/net-analyzer/tracebox/tracebox-0.4.4.ebuild
@@ -15,7 +15,7 @@ IUSE="curl sniffer"
 
 RDEPEND="
 	>=net-libs/libcrafter-0.3_p20171019
-	dev-lang/lua:*
+	dev-lang/lua:0=
 	dev-libs/json-c
 	net-libs/libpcap
 	curl? ( net-misc/curl )
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index dbde11b7181a..bd5c819475be 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,6 +1,8 @@
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-3.4.0.tar.xz 32502760 BLAKE2B 5d8106f36cc3a1425fd472f7ba645b2a07bfb93c96178a98f90676f39cad38089b625d7d6725ecfaf67bfc78aba3476567b9bf390d6f0dd838537eb81bc4aaa7 SHA512 02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649
-EBUILD wireshark-3.4.0.ebuild 6897 BLAKE2B 40060ac8da3fe5d0bb0a324f44c41816018b45f659caa329e1e391b69f055cedb9b02d8cb1f1201c9b5738d3e09688b8fae2a9c51f83432896007880964e8e9d SHA512 b0cb8dfa42527a9a6f69d36b23514d7f374d08c090fdee37f57fbf55ab39518df309160561da64a661a6f2e9ca6f3953f46d42a79b491f3c59c94ce8a25e109e
-EBUILD wireshark-99999999.ebuild 6787 BLAKE2B 37a68da765e48fa4fd7105bb4c57ca7e88549a4044d92e45aa0c9fefff95f0e2efbc018edb9797cbd52074cd4b92d1eaea9963dfe2262eda2b2d712b99d4fde7 SHA512 49cb20297b5321cfb427783fec1d202c5ea236e772a3ebc5154e0919702f29867478d861d4f835005925979e45e7bfe250700a15bdc4489109df076265464624
+DIST wireshark-3.4.1.tar.xz 32470004 BLAKE2B aa2c3e56df4232b087d09a52209eec1e91a10ab125f6fb973171771d86d349ddf76bef3da089f0d6740c67883009fb77c5760c1141c99a056e7a36fe8ae5c088 SHA512 a968158a5a22d04a9bf3b060246f7579210a8106e06184411fd00dad69e030c10aecfa579c09dcca11fb659e0a1de4773951578cb3697dd2dc8e5153d3892728
+EBUILD wireshark-3.4.0.ebuild 6898 BLAKE2B 3bdaa80868d870e2a5fc8f71cb53431e865a3f9f28bb893651e11b04d1ccab30dd4bb29dba30129000dc3b401ab5ab2d4a22a6e7c4d7c603a309206f42b310b0 SHA512 bc0c37dfc811d0f425079aad51a86cf793d7c8eca6e083a674e2df9f321c87c45d386dc5ba8153dbe999a2ee89140939dffa5fe660b858534f1cb48159e3f531
+EBUILD wireshark-3.4.1.ebuild 6901 BLAKE2B 9d380e47c2cfe7d3f14a842e802baf99b200ca01999ce46d090bd32ee941a205838120885aa157d40ca0d89ddfbfa1733aabb285e03ae8e3a87118374981d7e8 SHA512 d930a68747eaa2b4c4350ce2274b7377e56f71b8c010e4fdd73944f3e44e8f0ed3643804de0e547cb4cd150954e82ab51ebe55357e75b198a2901b6e3a65b869
+EBUILD wireshark-99999999.ebuild 6788 BLAKE2B 7d04031c8fb62d7dcb7ea915205bd7d00dc1d3cad0066a2a0443fe26d6af2400ef85552211c110eaec7c411e00bc4fa7634dc2a6456eaecb7959363c83ab2a1c SHA512 b59f2d1e5e4bd82a280d2ed7ce546ee9d43ed09251f71ff01efb5be38ca524bd8fbbf061a4ba4f823e829a92f6891e2180e01dbfee8bba659ab08764d9a737ff
 MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba
diff --git a/net-analyzer/wireshark/wireshark-3.4.0.ebuild b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
index 21e823418e48..ddabdfd5f7b5 100644
--- a/net-analyzer/wireshark/wireshark-3.4.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.0.ebuild
@@ -36,7 +36,7 @@ CDEPEND="
 	ilbc? ( media-libs/libilbc )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
-	lua? ( >=dev-lang/lua-5.1:* )
+	lua? ( >=dev-lang/lua-5.1:0= )
 	lz4? ( app-arch/lz4 )
 	maxminddb? ( dev-libs/libmaxminddb )
 	minizip? ( sys-libs/zlib[minizip] )
diff --git a/net-analyzer/wireshark/wireshark-3.4.1.ebuild b/net-analyzer/wireshark/wireshark-3.4.1.ebuild
new file mode 100644
index 000000000000..b72304eb72c8
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.1.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+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"
+IUSE="
+	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
+	+mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt
+	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
+	sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	acct-group/pcap
+	>=dev-libs/glib-2.32:2
+	>=net-dns/c-ares-1.5
+	dev-libs/libgcrypt:0
+	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
+	ilbc? ( media-libs/libilbc )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:0= )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	minizip? ( sys-libs/zlib[minizip] )
+	netlink? ( dev-libs/libnl:3 )
+	opus? ( media-libs/opus )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	test? (
+		dev-python/pytest
+		dev-python/pytest-xdist
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	plugin-ifdemo? ( plugins )
+"
+RESTRICT="test"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
+)
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_BROTLI=$(usex brotli)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_ILBC=$(usex ilbc)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LTO=$(usex lto)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_OPUS=$(usex opus)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test-programs
+
+	myctestargs=( --disable-capture --skip-missing-programs=all --verbose )
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking
+	# in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if [[ -d "${D}"/usr/share/appdata ]]; then
+		rm -r "${D}"/usr/share/appdata || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g pcap -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the pcap group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index bb74c3376075..25d08cbda033 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -35,7 +35,7 @@ CDEPEND="
 	ilbc? ( media-libs/libilbc )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
-	lua? ( >=dev-lang/lua-5.1:* )
+	lua? ( >=dev-lang/lua-5.1:0= )
 	lz4? ( app-arch/lz4 )
 	maxminddb? ( dev-libs/libmaxminddb )
 	minizip? ( sys-libs/zlib[minizip] )
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 2520c9f5e6bc..6914d8fbbf81 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -14,21 +14,17 @@ AUX zabbix-server.init 494 BLAKE2B e58063bfdb0bcb6ea70325d31bff4ffebab2686b70639
 AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2ef61de4715c25b0e0c97a627e6735a67c4114484950f0334fffa344d94f9192ada63887a21b617122eaf0d SHA512 d20fa4aa3a545d2f36388d7cac78c70c5610f5e7529348447e6fa6bacc33f42dd6e1c37c50b1c2711900a3f29bbbbb0ebc7c54f04d3de717aadad48e18c46e28
 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.25.tar.gz 17414403 BLAKE2B 5b84c5d61c90b4fbc94ea64994a7b4216fe1e728e3bf71afb5cfa674f3f24bd8d9ab91dbd9d869d5bef8fc83ef168a952ba45db8abeabf51402d92dd4487d8dc SHA512 741373adeab5ad4adccc8909e7adf7c8d2172b49e6c5e23cda057be3b82ea237fabcaa787557ea391861a6c2ad42efb695d36836ce8dfd1532e8a3cf394a7cfb
 DIST zabbix-4.0.26.tar.gz 17412367 BLAKE2B 7b75eeaa1146faed5e7aeeb3944eeb68df9c3e608beddb5b12ccbc8998ee6f0c3913b5f5cfe2b63dbf154a43e8393fc64b8286f805b8d3d08edbd25f21b66ce1 SHA512 7dc54176bd40cd73e2e82844caa317747df611e61b5d2d13a3516d143af9ede29ba5407bfca8aec21c9afcb77f53494ee469a2fc62cef3b91cedfce71803cac3
 DIST zabbix-4.0.27.tar.gz 17426383 BLAKE2B 33381d3705bc7cb9d451b1a536fbb4f92a9e7e321afbe9363a7879cbea3cc5977a4866a5f4d1fb70120804edaffaf869ba8c4321a67898c42c9abe2341ee118b SHA512 54690dd778d09d7309c2e2ea3f0bfc6053ef097888bfccd140484e4677766ded829757eb4dfde7da8ce19335307ddbfbb1c132feabc13cc6727a6d28c1591cfa
-DIST zabbix-5.0.4.tar.gz 19039167 BLAKE2B 82fb27076febe5ba43ff6c829ae22c5b4928d74f14e429c602442c90dfd5d1ce112b66d1782bd313b3300c66c774da4403a2150be7ed6ae56ae4b03a608dd018 SHA512 8ac6b56a221fe73982c30dc7dd2f2b036fa10a2fc38ef54e24dc0dd5d56a096f9c0779965afcaa5d26ee893a9f5fc8189ebc67d4244b325acb851cd8b5b6af73
 DIST zabbix-5.0.5.tar.gz 19153153 BLAKE2B 6f78e690b5a8325739148802a8933d6b1e45a7c08c6f384643d4f85dc8a502be73ff2873cf3ec40cc96c2d892c8866c9f07847b055bef80fda9b00f7333727c5 SHA512 5397672fa170e12120526793b48d01764013467cc259eca61991bc52251c25888dd318ccffa6ed30ac3643104e715ceb70baaeec6eeaddb115ed294c22f5e619
 DIST zabbix-5.0.6.tar.gz 19359566 BLAKE2B 375fcbed08be46c1f17c7979763dcdfb8a51a25c2523037a1992dbb7ceb798a665f5d01e97e2e6ef023d5170e3e71df933e0fc41d27fd905ba190497d6bcd28d SHA512 c136536eab3c0e3527e8db8528656776de8849554e0a85a1644000e51c66b09044b176985de1c6d1dcc1d4ec03fc2456111c4df8d896ca276eeed2744cdd48be
 DIST zabbix-5.2.1.tar.gz 19579218 BLAKE2B 32f8955af5e15dd72f660a2fe1153c8c3d582d9470a87def756516db53a512605fcb67263317ef5980d597d1124324dc15c404e31aa96201105fbd5821549bb8 SHA512 deb69250a91abe24c7988011bfaa369cc13639636b37668ec12e310d92813288adc8e3a2ea7a2a51b0f54d7e6f594277778bb37a481b8f9c3dbb02e528a0cfa0
 DIST zabbix-5.2.2.tar.gz 19745101 BLAKE2B 651184d4645ff4cfac1317326bd846b4707d8556a30c64dd0b5ac923fb2bb4439b120a4c2bf43c1f73b57a919d5f3bfba28e3d9efde6a3f48587c5b7d0b1d7db SHA512 7bb79111ff809a90a5911d7f94f86eddec3a3fa4f91fdfbf013178442de81d22dc13359679570b8d62fe41b664c764c42cbe98936fd195521951aab507933d9b
 EBUILD zabbix-3.0.31-r2.ebuild 9272 BLAKE2B 952241486756f5705a6d90677bcd792f5fe6a71808510af248ac297e53d5918129cc7d54365368d874139a52b50a06d6d38bee4b79705da1b6ae074d5e375107 SHA512 7faa241ec721d93a91ad1a51bafbd4b3c37bc8a0d85d2ed4855f3e59d1cd19719888a9306bfab5cc2848a85e1f849949879c5511c24e795a81445c15c49ea162
-EBUILD zabbix-4.0.25-r1.ebuild 9246 BLAKE2B b86b928260077f788d8ea1a5c083873fd2335242e74c88f9eede8838e6d580cce27500ee4838689811b5e8fb17c3aaf834d607294411b00614ab964ec5e8a685 SHA512 1956f1119adf155f9eaa3a47869bbbd487e1aea6b5d711e44604f286cf497c183949ad521fb7d794b3d1a5b53c6f51ce1b102719c5ef507f7702eef48c80c812
-EBUILD zabbix-4.0.26-r1.ebuild 9247 BLAKE2B cfd0080e536041cb26b8a148e7e5e1af5cfde637eb4fdbdebff1345d198b4e1ee5b6e3b1907c26eefec008f14ef22f8983431bdba3346d8a8255c879aac46d53 SHA512 0d57d119cb94fb448c735f9a8cecccfc3cd20ef5cd1631fc646b21eddfb5c3d20104c3a4b6b47d57d0693b51c032effd982f863f6ee89dfa5745de833aaac079
+EBUILD zabbix-4.0.26-r1.ebuild 9246 BLAKE2B b86b928260077f788d8ea1a5c083873fd2335242e74c88f9eede8838e6d580cce27500ee4838689811b5e8fb17c3aaf834d607294411b00614ab964ec5e8a685 SHA512 1956f1119adf155f9eaa3a47869bbbd487e1aea6b5d711e44604f286cf497c183949ad521fb7d794b3d1a5b53c6f51ce1b102719c5ef507f7702eef48c80c812
 EBUILD zabbix-4.0.27-r1.ebuild 9248 BLAKE2B ec957d89d392344529536c0d0c80d4f22db4db467f82374d9add67d70c5d9643401775d0452d4fa84bf72c98f96b33fd2d462f8cf6951e6312644c301959d628 SHA512 b8afdd2e70ec8944aa601aaac86d1a38d172395eb21e19bc714dcecbd86b1b57af387769b5fe29baf2cdddee2db33867a803b07599d774c6909142cc148c442d
-EBUILD zabbix-5.0.4-r1.ebuild 9115 BLAKE2B 112d020bc615f0596ad5645677cf2277e87542b69c54aac714eddff16ef2fdc031d8f1bb0dc77de09e3ab4654321ac6da9f278be322d999a5e3861814aa8e912 SHA512 6f9e91dd505359fe9dd3ad0d064e6726c02137fd1c37c11b7b4d445ba04c7e1c59ba25ff2c602a68c5aed9f132befb09cd0c7c74a9994f64675a93cf44966fa3
-EBUILD zabbix-5.0.5-r1.ebuild 9116 BLAKE2B 836123e564143d2dd7b126e07c482a66b34240f1e9ae667991dd6791a99058e1aa5aedc781c35f2675fb4bfbfe8e6da923a7ffe3f4187644acfe404e2d457799 SHA512 83abc4baaa8ecc3dc25124ad2051b5120cf2a9be42d0597997477d29b2cdd01da269498e34114678ae9300bb5ba5c8b8a7ffd1d9f274cfc224f09daa212c5012
+EBUILD zabbix-5.0.5-r1.ebuild 9115 BLAKE2B 112d020bc615f0596ad5645677cf2277e87542b69c54aac714eddff16ef2fdc031d8f1bb0dc77de09e3ab4654321ac6da9f278be322d999a5e3861814aa8e912 SHA512 6f9e91dd505359fe9dd3ad0d064e6726c02137fd1c37c11b7b4d445ba04c7e1c59ba25ff2c602a68c5aed9f132befb09cd0c7c74a9994f64675a93cf44966fa3
 EBUILD zabbix-5.0.6-r1.ebuild 9117 BLAKE2B c6790c4db86c73cbb8a2fac2cb74605955a42e62ecb90facbec16bec640047b880e0415752455fd3ef394c638f47c1a0fd2058f02ca8e6284b70b77e7f342fac SHA512 a6d8c38b0cf507e102c4f428afd9a207559e3b3e0aebb0b0c0c710915109172279dc63c57756870837a8ab2841072a84502d8738675f4096a4a8950efda03f4f
-EBUILD zabbix-5.2.1-r1.ebuild 9116 BLAKE2B 836123e564143d2dd7b126e07c482a66b34240f1e9ae667991dd6791a99058e1aa5aedc781c35f2675fb4bfbfe8e6da923a7ffe3f4187644acfe404e2d457799 SHA512 83abc4baaa8ecc3dc25124ad2051b5120cf2a9be42d0597997477d29b2cdd01da269498e34114678ae9300bb5ba5c8b8a7ffd1d9f274cfc224f09daa212c5012
+EBUILD zabbix-5.2.1-r1.ebuild 9115 BLAKE2B 112d020bc615f0596ad5645677cf2277e87542b69c54aac714eddff16ef2fdc031d8f1bb0dc77de09e3ab4654321ac6da9f278be322d999a5e3861814aa8e912 SHA512 6f9e91dd505359fe9dd3ad0d064e6726c02137fd1c37c11b7b4d445ba04c7e1c59ba25ff2c602a68c5aed9f132befb09cd0c7c74a9994f64675a93cf44966fa3
 EBUILD zabbix-5.2.2-r1.ebuild 9117 BLAKE2B c6790c4db86c73cbb8a2fac2cb74605955a42e62ecb90facbec16bec640047b880e0415752455fd3ef394c638f47c1a0fd2058f02ca8e6284b70b77e7f342fac SHA512 a6d8c38b0cf507e102c4f428afd9a207559e3b3e0aebb0b0c0c710915109172279dc63c57756870837a8ab2841072a84502d8738675f4096a4a8950efda03f4f
 MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173
diff --git a/net-analyzer/zabbix/zabbix-4.0.25-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.25-r1.ebuild
deleted file mode 100644
index c3e0e8de2db6..000000000000
--- a/net-analyzer/zabbix/zabbix-4.0.25-r1.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# 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/$(ver_cut 1-2)"
-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.0.26-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild
index d7ad8e740a55..c3e0e8de2db6 100644
--- a/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent 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 ) )
diff --git a/net-analyzer/zabbix/zabbix-5.0.4-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.4-r1.ebuild
deleted file mode 100644
index 04c629c2aced..000000000000
--- a/net-analyzer/zabbix/zabbix-5.0.4-r1.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# 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/$(ver_cut 1-2)"
-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
-}
diff --git a/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild
index 7fdc79246f1d..04c629c2aced 100644
--- a/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.5-r1.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/$(ver_cut 1-2)"
 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.2.1-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild
index 7fdc79246f1d..04c629c2aced 100644
--- a/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.1-r1.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/$(ver_cut 1-2)"
 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 ) )