gentoo resync : 03.07.2021

24 files changed, 247 insertions, 853 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index e21389dd9518..8bfd3b3075c9 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index 7808c5d8373b..b1e3e1f6a022 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -1,5 +1,7 @@
 AUX arping-tests.patch 5643 BLAKE2B 154071667f814ec720a6fce36612d251ab891eb3972bd62e13fbfa233b56cff604a19feb80decaf448c1cd7b73c3c830c2529111372cbb6a81503e1b3a282273 SHA512 9b863431db1ca61ad69827dcf9427ab51bc2072251e358cbc90577e55907dcdb913e8bdef640bf3d77f46e7d6d44c8f69d5eab68d3e8c07af8fbc67df8e15e09
 DIST arping-2.21.tar.gz 50067 BLAKE2B 67b76cc48e9717117dbf43702df7f422634ed40196ec44d273a773610618922ddf7de47ffdf32cb7296db1dbce0a696c57b7992e6ad11f6fddf52a16212154fc SHA512 e976ce1a3ec0e4f57bbded09c6a07934e21df66ce7931422c420f5335dafcd88968f03ba6987d192dcdf51cca89180c86337aff50806713c7b04cb13e3e83504
+DIST arping-2.22.tar.gz 50152 BLAKE2B 2215773b922219537339550e8034bb6eca82974469ebd0e399c73bd259ef4ff7a4510d9a5ff108cef3dac492477c54fc2517c2dfd4035158d0269f03c0e2a0b5 SHA512 0b36fff2c14c1ff89453ba63eea04de3343fcb19da7dbc1c8749bc926e441c54915cd628d54171d449e66e92663e31f12e057c30a80cd49c4412650e2cd00ef3
 EBUILD arping-2.21.ebuild 853 BLAKE2B 815e29d2d3ad9641bc0067f69a41eeb9741eacbcc08c5535eb88f4219fdf8860f6c9ae36c5b338b41221a7155d64725dcce0db6f471f3d6274ec66fb967a53ab SHA512 b60dbda113926dbaa2718cb70953546afc440f988db472c588d9e287d9595dc86b50c6c6a85748ec02f6489587c8892677825298de6ab691c9d50ab308402a7a
+EBUILD arping-2.22.ebuild 783 BLAKE2B 5d12083d86e5f8b5e348ee1365f9b748becc952fdbe53d70abb04d0d994a467d2202492380d0bc0e813feb6acbd6c44780ae2e5926787e1f33c4c5f073c9d0bf SHA512 5978d31a3c000752908e156fa13a07cb7634fefceff105cc3cac466a0784665c71177b75321f24c78540f3d1a59f46ad93b8e4295d465470edfacf549de9db65
 EBUILD arping-9999.ebuild 675 BLAKE2B bcc653ec32f180d4642889cdfa4b5e3461a4a6a8821faa9faffebfa2f63bc60a96a3a3f5bccdd91e55b18845b0c83b112dd1c0be7fdc1e12454427e5c0e3563d SHA512 268cdafccae462ee61ffa4ccb1c8664242c766bb7429ea764f470f3434b428ee77b1fe0f40a3a537bcb9daa0cce736d49bb445b3ee8ae91d25c2d48baf4e7abb
 MISC metadata.xml 364 BLAKE2B 8043df9ad04acc43039d3ce6527d8f45e5698b00b81e177fd7bb9333fbd302ff5ad1a6da0e00d2cde5c7ab73093c335ff1cc97255957310ea4bd1857edbdbfed SHA512 41c5624a14ec28f709ae59a37f1fa0c67fd0cb02b731017224fc780a22e5e244d5a43bfce05676b29d06a835d736bdfa01f2679b6364febd87967a707a2593b0
diff --git a/net-analyzer/arping/arping-2.22.ebuild b/net-analyzer/arping/arping-2.22.ebuild
new file mode 100644
index 000000000000..1df1402f5eaa
--- /dev/null
+++ b/net-analyzer/arping/arping-2.22.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fcaps
+
+DESCRIPTION="A utility to see if a specific IP is taken and what MAC owns it"
+HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
+SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-libs/libpcap
+	net-libs/libnet:1.1
+	!net-misc/iputils[arping(+)]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-libs/check
+		dev-python/subunit
+	)
+"
+
+FILECAPS=( cap_net_raw usr/sbin/arping )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-analyzer/fprobe/Manifest b/net-analyzer/fprobe/Manifest
index fea8e4c86b2f..ee5658428cf1 100644
--- a/net-analyzer/fprobe/Manifest
+++ b/net-analyzer/fprobe/Manifest
@@ -6,5 +6,5 @@ AUX init.d-fprobe 1099 BLAKE2B 0c20d0b476298b05fd88841f40acd241897210edbbf35041f
 AUX init.d-fprobe-r1 1061 BLAKE2B 15baf6583dd9e00d228d49ef35bcb1c1029e4410288188070058d58be0798c81afdc1d7227fd25a341534aa68c61244b15673709762c057cdd0ae9f48fbaf494 SHA512 0a1286a71bdd3a2002eb750664eac0d7a56b3772c31edb2fe6dbec9831850431211dcd04fa86ed5b15131bb7fdbb541b30bd796c9de3ed616b00c52765cd757f
 DIST fprobe-1.1.tar.bz2 104358 BLAKE2B 960fd8941ec2a7656b9eb02a0b6ae091b6ab564b4f97aa8147ce1bc3785964008168a1ac43a3fbe2e342987ee68fff711648edb910a059222017fe1282205e8e SHA512 35fa4bedf2c615093b6637630322115e12f005bc43186b86c55c6bdc76ae5308dd31e1d05632e26e07a30fba88d76b9acc98632bee4f372edcf9df5da3e32210
 EBUILD fprobe-1.1-r3.ebuild 801 BLAKE2B db254f316f6e3dc634b5e145322ebcc515c8baeec598fa91419a7522d0efb39e0162ad285a22c3f18583e72427b721e2ffbfebaa352d0becce9c68cd477e3ee0 SHA512 6af18b0521b9c8fcdfc0abf0c3a9163adf65869c3181b16a2574b0c3a9c42442ef911dc8fe7420fbc3d3668e32b5076987f25502153b4ee80c6be331f05f496b
-EBUILD fprobe-1.1-r4.ebuild 806 BLAKE2B 91d52ee69a2ff04760face223aeaf145402bc9d4efda04dcc8a43a67a0760b79dd1100088df46b6695b9e0bd9d942b0968dfc30f466f7f4fb7e92831137c2da7 SHA512 4a7934e2d6485e663888af2e17557675492fe1a05e616459611ef7e1cf0ec62765ebe297ec39b5d7909d667b6851e71ad728522931c3327afaf434e5e28dcbd3
+EBUILD fprobe-1.1-r4.ebuild 805 BLAKE2B f17d14ee899c6f0f72238f2d9ff6b71648ccc2a9d756d4bc8a7bd04cdf069d7c68029d5d8b1b06a4ef63eab4ad2e48349a39055f980a99652301d416d1416e3e SHA512 b8b0554b853b0a9c50cce814912aa8acf2ea7914639a71caa9df0742be66276e839c0dd644b876b8a534e80837f3ee322c6918572a1f6d6bb29e2fd9b3f52d2f
 MISC metadata.xml 426 BLAKE2B 3ed8a67ede1c9d27d291645589c3eed9fb13ec009974dd9a113bdc3f5548deea784ccfef968501f282e9161f319bca59b835e5e822852537df93e8b75406fa5b SHA512 2b9247d129021a3e25d3d4196a48ec2d204d2e91307231d372cc1bde255553785c9e413ba3dcd6a62ad28e54ba46e732212aeff4bcb03e796f2ba87325dd80bc
diff --git a/net-analyzer/fprobe/fprobe-1.1-r4.ebuild b/net-analyzer/fprobe/fprobe-1.1-r4.ebuild
index e9447cb4ac4f..76646bcf6a10 100644
--- a/net-analyzer/fprobe/fprobe-1.1-r4.ebuild
+++ b/net-analyzer/fprobe/fprobe-1.1-r4.ebuild
@@ -9,7 +9,7 @@ LICENSE="GPL-2"
 
 SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 IUSE="debug messages"
 
diff --git a/net-analyzer/fwlogwatch/Manifest b/net-analyzer/fwlogwatch/Manifest
index 6f17cc1d2c33..fcfd16e21a1b 100644
--- a/net-analyzer/fwlogwatch/Manifest
+++ b/net-analyzer/fwlogwatch/Manifest
@@ -1,3 +1,3 @@
 DIST fwlogwatch-1.5.tar.bz2 94451 BLAKE2B c0456931dc425df4ec190f1c8bcba21e0784009dae66869a5f5c0371b68d0bdb1bf57c788468f7c9fd32abf8b676a4029bcde7d348c37e4b7f5771bc48f04297 SHA512 d4890596859929ddc6adfd7f9e735e0c414bad40eff6732120a522a8bd4fb8d1442c7d1026f0f3c6ac5c4d51b76a2bac486d04f0fbceae67395c585098afef85
-EBUILD fwlogwatch-1.5.ebuild 1783 BLAKE2B da8bf0f9990d004843c7cca2b40501c8c0519bae6b44c580a4fab133d66c774a8ee41d682c98df6fe057768260c6d901f91252c68a926f24a346a9df7e23b262 SHA512 aa339650db36a128a281c235d18eb7c87aef2b57f23fc1b46c7ce1d2d3ac7a603447b9baa41bfbafe9709e787407a77eae85d49a216a70548990e008903d36e0
+EBUILD fwlogwatch-1.5-r1.ebuild 1812 BLAKE2B e5d17cdc8f0645618979fec650555ccb124036c110ba39f7450e161bdea1842f9e42cb79f390c4d83b16a4a40cc3071ad10dd318b4de35a7bf8b0d15bd41a93d SHA512 3841b5462b38561f11dd8874b6beca62d355369cf2754c99e3c320b7b793a8f33cdb68c7f15c06ff49248de59560f20094be53fec9379932dcb58fe9bac4ef13
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.5-r1.ebuild
index 990518943e3b..970802a11930 100644
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.5-r1.ebuild
@@ -3,18 +3,19 @@
 
 EAPI=7
 
-inherit flag-o-matic l10n toolchain-funcs
+inherit flag-o-matic strip-linguas toolchain-funcs
 
 DESCRIPTION="A packet filter and firewall log analyzer"
 HOMEPAGE="http://fwlogwatch.inside-security.de/"
 SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2"
 
-KEYWORDS="amd64 ~ppc sparc x86"
 LICENSE="GPL-1"
 SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="geoip nls zlib"
 
 RDEPEND="
+	virtual/libcrypt:=
 	geoip? ( dev-libs/geoip )
 	zlib? ( sys-libs/zlib )
 "
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index e5078056c521..5b01688c7762 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -5,5 +5,5 @@ AUX rrdtool-1.5.5-rrdrados.pod 1419 BLAKE2B ef1a2438846a60b565c94088d7563480a97e
 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81
 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-EBUILD rrdtool-1.7.2-r100.ebuild 5760 BLAKE2B 3a5cd702f9f5407c4b57d434a875a7afa3fe8a63cfe07eb8375f95897934519593dfeab7c7f3fbd541c35a90aabaee687be9b27f14467ce30cb3f8a39b3ba98e SHA512 028d78b9ffe6cd5698cb5f136f8be19b3b5e293ecdc3294ca4c58a5a6810e2a3c590de106811f7c278dc73c667d4073e44a0083103403e673e450fe1eebafe2a
+EBUILD rrdtool-1.7.2-r100.ebuild 5765 BLAKE2B afcc333f35a3fe82b41f34402e4c0b1e3e009c288c13bf8165ba968adbe071b494c36bee5064fd21375a188de095036395f7486c4d3ef855576cc4061beead2c SHA512 4b62ea64b088e2a7bced9801b06677fae325324eb5818bd814598e6c91206656b2c24ff28790aee7df75ecb59ddbc40802c040ce36d33fc283208e40564df008
 MISC metadata.xml 584 BLAKE2B fc6bd75c58c7803f1ab26c41cc2b58dc4e8555dcac7a48428967854a1b8063eb0e745bc7c07672b805ea8adc55df0b7c8acd51576bd7b89ab37b45d9d04b4d11 SHA512 69ba81252477dfd6efc01cfe886d3ca28eec3214348d5bc6bc7f73eb3ff50080977b5c74058a00cf62e504026aa5fa096b0ed1389da121c403bb27bd6d4c2068
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
index 6dbe3765730f..1c278a038792 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=true
 DISTUTILS_SINGLE_IMPL=true
 GENTOO_DEPEND_ON_PERL=no
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools lua perl-module distutils-r1 flag-o-matic
 
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 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-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 5c8ddb074ad5..dfe7d87c556d 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -6,8 +6,8 @@ AUX suricata-5.0.6_configure-no-sphinx-pdflatex-automagic.patch 938 BLAKE2B 3f54
 AUX suricata-6.0.0_default-config.patch 833 BLAKE2B a8a63f838452531feb9f1b69e9756c0385338f4a1b8f6c36b22052cc7f8a41cd07e31b882e2e89402c5eb43e599390cf6922f9dcfc869416d57aa3426516f8f9 SHA512 8edff1be84dbe29a140889040a7d9310ee8dc5ab82cf9ff64298ecfab07a75853caa7ac907cf191a62a1c2de9833311fd090eb2f82c9d3745b5f3fc01adf6efd
 AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee3538bd7f0deb9d76bb8552761b4666a3ac80673fe31ffd95424f2ff71e35db0f5fe6667b32478fab4c4 SHA512 4e4e87735731fd0e18ab26e536e7904833a19ce8785ffdd15b22d494673c73044137908feee74800486960f9efd09d1ddc2c75a490a2e35ef06caf23c7439a0c
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
-DIST suricata-5.0.6.tar.gz 29136659 BLAKE2B 97d95cadd54d44bd82424322c08ad04be2122cdae5763995f7aefe4a75872091dd7d289e89e47a5ad9fbce570964f11331d848db7fe7ec4c2be9a0f8b62fadff SHA512 73580721683f929a90b6b59673842c051fe44ee7b8d8d890106aad09952d5b8a8f3716f168c41b33feb5c32e0106f5926125313cc11b27bc5a9c65e90b21888f
-DIST suricata-6.0.2.tar.gz 30514801 BLAKE2B 20604fa3332a9d99a1a30db55a0ccd689af0e08e686cd6739d6c4390456acc28d34702704f7e25537463b0c23600d123de361a227f9ef2420ee5c2b11df2866a SHA512 230a74a5442cfa066c56528036b64c173702238c5075161119eaad08d320e528d3510c51095297f120030177fed9c84076d00f567f7a3a4cbdb23d382966cf00
-EBUILD suricata-5.0.6.ebuild 6376 BLAKE2B 1a09526148d42ac4dc2ee5bfa2369e559a07bd7294d1d68898ec875c24f18bf47237bd8cad796978b3487e543629fcd66e87db7cb2561f4605639c415ffa491a SHA512 7162a2f55fca1dd955d94267402280813154fae22f0ccbf1733fca1eb25953e224e03f4b3ccc393b70d51f33eb7ad061b1aad8aa0ccc46b335d6826b58610c29
-EBUILD suricata-6.0.2.ebuild 7403 BLAKE2B 1848215678ca352e3e9e76bb1a2f30b3fa3b6f4c8d1496305a501e9555eaddc62353542952dfe834d833ecf3e6c65d9ce4e0459dc663297a60581ddfa2e9fcad SHA512 c36259246eb69503ab60cbb16d3ea539ca51424e71cb2f44db331bbfd28933d44a999c268cd5e3e08450f7140694201d800b924dd3d8a87547865a30c447a7c3
+DIST suricata-5.0.7.tar.gz 29211384 BLAKE2B 939e672d9df61863c7adcc4bf52f5620e3760f0d6178362828474b1a72c4e3a69bf1ab52a3220c0069ae5a545c56307553c2796166af488a72a25dddd68782a8 SHA512 dce3929c796e04778eb9437bd4c7203aa9dae56be0baa4b7d986d3eedff3bfc71aa2886ecdeed9d87ec3d88cd3060ff8ef01540d15eb857698a2c4696da5899c
+DIST suricata-6.0.3.tar.gz 32421197 BLAKE2B c1b339823f2caab73aeb82f96fb703834cd3ca9f0f60662cf340cbc36734aea47106d49869bd70cf3acb419e954ca37bcd22ad1b2d789597bf36f8fe7ceebe11 SHA512 186b871959988ca7cbd0d69e725aed18af915f93363c7ecc0ffa20d8ad8f50a326be08452d085772b1df84ef25258ef0dd6b35d41b0988cb1c653e60aeb103a2
+EBUILD suricata-5.0.7.ebuild 6376 BLAKE2B cee2a276ea306c5738158b034e09516f3eede321a7e7a33ffd6e50fcfca14e0d7724bee6f3dd5c0778399d00d0ae81845e3834de57e6644df073dd63b134a5ed SHA512 515a1109f0bbb606926d51c24b98af7920de52ffc7d1bf3cc4b7c53ccb7e054abb8cbd22d823d478c2dca7a963743209d19a96d7e15ecaa369deaff9593cce4e
+EBUILD suricata-6.0.3.ebuild 6652 BLAKE2B f1538b0887f05227142c0a2b05321bf6e724238ef51d7b6a1538327859c04efbe7001e632e1df1d3bb202ff4a3c72246b5e687eb10e1483d0f420734f3ae9354 SHA512 b6364876158e3a3d64cf438e276d7df46c13f32ec86d984a2c87f39edf878cd616d6f471588f690a590dd3b98fe6e7cf390bb204e7290255e382900d0d147536
 MISC metadata.xml 1015 BLAKE2B 355c550ad2fe7a37d69b92f0bd710824d68a3353be687876449ad5b7d8e2c98b06b833e59ebcf479410aff09dce71e1f7f64be860c348f3d6c3519cd8fe2acf2 SHA512 0837e07a0130baff435e684b47a6b463991aec73b4f570672d0091a70adf163c5e83d19887e1575f12db783d6246050777011d25dc658fe4767cd3fe8fc1d4a5
diff --git a/net-analyzer/suricata/suricata-5.0.6.ebuild b/net-analyzer/suricata/suricata-5.0.7.ebuild
index a48eacb1a1ed..d8e5826ae3a5 100644
--- a/net-analyzer/suricata/suricata-5.0.6.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles
 
@@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
-	>=net-libs/libhtp-0.5.37
+	>=net-libs/libhtp-0.5.38
 	net-libs/libpcap
 	sys-apps/file
 	sys-libs/libcap-ng
diff --git a/net-analyzer/suricata/suricata-6.0.2.ebuild b/net-analyzer/suricata/suricata-6.0.3.ebuild
index 5a9b9a7ab1a8..da57e2c8b344 100644
--- a/net-analyzer/suricata/suricata-6.0.2.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles
 
@@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
-	>=net-libs/libhtp-0.5.37
+	>=net-libs/libhtp-0.5.38
 	net-libs/libpcap
 	sys-apps/file
 	sys-libs/libcap-ng
@@ -51,7 +51,7 @@ RDEPEND="${PYTHON_DEPS}
 	redis?      ( dev-libs/hiredis )"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.69-r5
-	<virtual/rust-1.53.0"  # Bug #797370 part one. Hopefully to be fixed come next release.
+	virtual/rust"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
@@ -60,18 +60,6 @@ PATCHES=(
 )
 
 pkg_pretend() {
-	# Bug #797370 part deux, needed to address the edge case of both rust and rust-bin being present
-	#  - in which case the version limit set on virtual/rust only affects one of them.
-	# Version-checking code shamelessly stolen from www-client/firefox.
-	local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
-	[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
-	if ver_test "${version_rust}" -ge "1.53.0"; then
-		eerror "This version of ${PN} does not support Rust 1.53.0+. Please switch to an older version using"
-		eerror "    eselect rust"
-		eerror "before emerging ${PN}."
-		die "Unsupported version of Rust selected"
-	fi
-
 	if use bpf && use kernel_linux; then
 		if kernel_is -lt 4 15; then
 			ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index f1e41878b459..3206a01e7fdb 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -265,24 +265,20 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
-DIST zabbix-4.0.30.tar.gz 17599032 BLAKE2B 1084ad3e680fff7798c803492d9e719c6c6fd2503db30d4a60a000c9dfac057bb1d5bb947dfac580947ce3d8f051aeb6a8183642808120d2795722c39b8e1a85 SHA512 b26c532e3b1b3402af0433ab29a36efaa1a34e8541797bcb37118ff352d4c29548765ebd10fa8da6b3371b1e3cbdcfb4b1cdb5c6a143b3ce9301db47d425fa36
 DIST zabbix-4.0.31.tar.gz 17600018 BLAKE2B 6b3dd8bdc465fc610756b93cd033e0ade607af718a2914928d5a10cef648ac3c8276c75403fa889b00b4ec1485069240462f8f2c2aaff9767a2914e4b32c6817 SHA512 b4dc02b76f438ca922caee8a04c119c0958d7431622b36a2c26da2ed1a2fdc87e5e7abfcded033a852f6ee018e999f8fceea1a89a67b97d4c160e01a536d2663
-DIST zabbix-5.0.10.tar.gz 20100268 BLAKE2B 6a1c1c687b8f9e3f494a94cfd3f7877006947135c7989e1531c051c9f732c46b5c60940159df2e5d8cc52d32d61164cd0ffcd3fbc23a03b051f2ecd3ba1b9e95 SHA512 5e18845ddb5ad213c7fdbf98b3338f1e9335206b473c7ffa6fd0d37acc487b3e8d547abfe87d3190c8f8b1ea55fe5b8b6c44a431cc6c879b277c6ebb05f744bd
-DIST zabbix-5.0.11.tar.gz 20350104 BLAKE2B 2aac1a5548414671e466548a333c1b0620fc5d7da42eaf5cbbcdc3679414992a07f6175679330397f047b47406681eada4f88936a06afc36e82f18b5403d345a SHA512 3948cdcc2133690a883f95a3fd9562af4c05e400749317d834b15eb2aba6528dedf69891d63b90a02c6979ab64c19073b1344742a2b88c40de09a10cc75beda4
+DIST zabbix-4.0.32.tar.gz 17606713 BLAKE2B 48d0f8fdc3f538701383f0c246152df8d000aeb194669edf855dd96f0ee4b0a27d14a373d555cdda4f3ca9057f4abbb51d5184167bc4858ce798bf17284e0c74 SHA512 af3c3306c2ed1d47d980f0581324274b4bee6fe6bac657e7cba90d6079ad1a83d57d5279aeed54e63f28764d02476be881972667e84e1c8a85d90c659384766a
 DIST zabbix-5.0.12.tar.gz 20404121 BLAKE2B b458f8dfae5f1c2cc0b8d4d06a41633f00ab0749288e36e50fc13377a544ee01634f2b603cda901fe35600eb883caf084e1d0f72931561996336022e0c8d33ff SHA512 e26012c177d72bc75e63653b6ce4e1c21cf83e123edc0931635887002dbe713637177d95d15e493923416d1f277dd373bf9f568ea31ac9b1b93dc6bbb59ed15c
-DIST zabbix-5.0.8.tar.gz 19474050 BLAKE2B 1043efca2f373553728206837949bce5f5ea32328c6289e4028f65e6f1ed76560c1ffbd610eec9855f050d0330bcd3b364a983db896285729f30a693d5ae6c6f SHA512 19601ace704c8a887ffc9b57da8825d8a28a5d064aac3e59480994bee4156db186d37ecf4bee2208bbafc0cb76c0c7f47de964f99953ce78d0187457255d92e9
-DIST zabbix-5.2.4.tar.gz 19916307 BLAKE2B 17d0f5dc1d4a8b79d2a5e741a0fa18ecf584ddfb45afbe816721d0e69bae4b5e11b44fe5031c8a34562c30fd2818f7b4a8bfb1442489be3ec23a27a70e789f56 SHA512 e218de9a8b9445401e769c14a9efd0b3d1b7e9610ce021cdbfc9db159801a4033b8f1c1a808c853bfa3aeb66db8a6dd0cbb5b44fc1421fa0f54c28589d7314b4
+DIST zabbix-5.0.13.tar.gz 21076927 BLAKE2B 4c5a503fba87fbb0882a60378721e9156a9ffc374b5a127fbaa08aeb23d40aefbf4324b6a00d9c53d65714eb88e04730dc9f43bbc6baedd8b844b29359aca76a SHA512 846607e9c409cb996eb6aed0beaa29fa37450ca61a2e533e477b3bb16fd3c3fd90a59cff1e7234e0dc47276cce052e022f1663c1928e0e4295bff44002720e47
 DIST zabbix-5.2.6.tar.gz 20602665 BLAKE2B 656645ece453564f2f2c58b50e9bfb3df86aeb74fdfef88cc4b597268ebaf9a9db41e1acdcd1253871dbd9a0032f973bbb1b25139ee1a083bef779a1b66ac2fc SHA512 be48fd46bf151ad2618f5136559c7027e64e178001921adefc66a0597b24b6929e52d4b0f575e8bddec1e9db01276dd5993d4500f4df4a1716a1a008e09b41f1
-DIST zabbix-5.4.0.tar.gz 23105171 BLAKE2B 19420887afdeba3d1b68c27fef94264230924aa1800de39ecb05ed9a379ba0c408cc1360f0b0e9d4f5c42b18395518791fba2a6cf843eb7bfd12e5c4dcfe7de8 SHA512 12cc78935ed5046b0f7d97e0248b50e0a0bce110ba85c6c3dade7eb348a4018995ef1d51bcb917061accff334195501793b2c00ce864d0c18245cf5a497df525
+DIST zabbix-5.2.7.tar.gz 20971531 BLAKE2B b67de705dce1252a4dfd6f1ab1b1d5183b3bb1f6706a7cb3acd4bf6b540a06b00bc8df47b43043fd069f20f3cc760ad9f335795e08530aa244eab13da7e8c410 SHA512 4479d8945b8384a3f4a34dd30223a496f7d335be323fb99d72068402829b3c305b9c35651a91e594c9ea7c7579a7265eaa9c91eba18337dba9b2030be2e333d5
 DIST zabbix-5.4.1.tar.gz 23830541 BLAKE2B 93d39c69798dd593a77f2cd0046818763bda6d07ea43295d0fd9cd6d21a974d46f3783649fa63878e85c70e6b7cc6284ea88df2503d5011365641cd58dba9cbb SHA512 d9533bc2fac816a6c5e18462c509fb6307409528979f56cdf03085801c01d6ff17251cbcae83cc2158f944dd9302d429746e39ca669483e442474c51d6caab33
-EBUILD zabbix-4.0.30-r1.ebuild 9256 BLAKE2B b488688e0c285e19b516b3df428e7c58c5d3ec056011b86f7ec4e2a3998663c73c762dd975cd7b99e600b027540fcbffd5aa33b76f026991ab13bf0148464c2a SHA512 6e35f17523841f2f3654bb23e8f574fe1d7a3a4d008b31526c06855defa671e16841ec948a68cb438c05e3bbed7ae202dbd2acef3844000ab3a8e95db0caba4d
-EBUILD zabbix-4.0.31-r1.ebuild 9258 BLAKE2B 694695f1ea325fc639ad808f10278cb4f258cf59a8d5ac67369597301e314916add9d574d38c529e7b348e388acf3f967b1d8191cd20447a222633bd8f614899 SHA512 e0acb577f5a9a534066465b74f3b4004a41c645d981ac3641213dc590111b6819ee8e5e6ce2f71e12a7cfded54c3792c1b9656b642c5925c74bb1a680ef56b0d
-EBUILD zabbix-5.0.10-r1.ebuild 32544 BLAKE2B f735b714d0148a4c3a736615ca8f503b84c00c5dfa754ed98b8f1900022598a8b3bd2be8f64fd6d86b9882873394d941c3d5ce4e0ae87ebc710ebf4d9cf99c79 SHA512 b2e1ec34fa6440697f817c36a4d0ae707d1dc4d8c85fcc809d5b154197f2da69bb32f312a05470e17e8f2b1f90f0e2bd804462a0ef7086b4ff38d69964543520
-EBUILD zabbix-5.0.11-r1.ebuild 32544 BLAKE2B f735b714d0148a4c3a736615ca8f503b84c00c5dfa754ed98b8f1900022598a8b3bd2be8f64fd6d86b9882873394d941c3d5ce4e0ae87ebc710ebf4d9cf99c79 SHA512 b2e1ec34fa6440697f817c36a4d0ae707d1dc4d8c85fcc809d5b154197f2da69bb32f312a05470e17e8f2b1f90f0e2bd804462a0ef7086b4ff38d69964543520
-EBUILD zabbix-5.0.12-r1.ebuild 32307 BLAKE2B c923751c75ebc0ab380f3d6fb3f7fb39f8069ec40753d86d0776806ccf779715801ea54b6649ff3a0d32f7853bbf90840d01963ae3e8b8059961aa32ee86708c SHA512 2dc1cec77eab7b0ef1935eec5be85e609051679c97ea9a72b6d079b4c4113c05629b3040177f2b35f2d9a5761c1270f2408d12bf3e0424a9d0415af5e1acc202
-EBUILD zabbix-5.0.8-r1.ebuild 9126 BLAKE2B 03e3eeed565cc3f7b9e68ce7c29f26361b0f5daa4458643a0a984187b002d2ea25fcb99d780b69c479ac8bc70dc539d96042eff29dec829986d9d6747f32736a SHA512 ae9dc18eb4abb1f020992ef1077959554f2ee8442eae34453c96efa2c314e37a5e122e726e166fe271e64ae273ac657d42c86f36ceb4c25150b02c43b4e93d2e
-EBUILD zabbix-5.2.4-r1.ebuild 9126 BLAKE2B 03e3eeed565cc3f7b9e68ce7c29f26361b0f5daa4458643a0a984187b002d2ea25fcb99d780b69c479ac8bc70dc539d96042eff29dec829986d9d6747f32736a SHA512 ae9dc18eb4abb1f020992ef1077959554f2ee8442eae34453c96efa2c314e37a5e122e726e166fe271e64ae273ac657d42c86f36ceb4c25150b02c43b4e93d2e
-EBUILD zabbix-5.2.6-r1.ebuild 33157 BLAKE2B 0e59ceae6df77d44128c53c58561792c48681033048d703456f1706076fb7a7309b095ab99e2e31c91932d84763b6bbb49ea19b0315b2f0e6acd5ee5d7d38876 SHA512 d8a87a7379d78812ccf72c15d8feb3f534d9b01e4f9dd7935af2f2f5a1b45db82e3cdbe85471f7595393a62504f127d27119a013d4ee6e193ef23e66a8f97b85
-EBUILD zabbix-5.4.0-r1.ebuild 34619 BLAKE2B c4c36b15051f16d04bde822a86db98df94db2f4c09f2371307c378a31ccd89a1e16a9436fc754c2be39b8fabfa6ad3954e4ab6d485b1198857c5c2512d40e4df SHA512 53e8fe670f74eb0228b1ef16616ed3b87aac5d45485ee665ab1cbd6b64bd627369b78ada4f7c14605a901e8ad1e3cbba353eec1d552fe63179d363cf63383714
-EBUILD zabbix-5.4.1-r1.ebuild 34619 BLAKE2B c4c36b15051f16d04bde822a86db98df94db2f4c09f2371307c378a31ccd89a1e16a9436fc754c2be39b8fabfa6ad3954e4ab6d485b1198857c5c2512d40e4df SHA512 53e8fe670f74eb0228b1ef16616ed3b87aac5d45485ee665ab1cbd6b64bd627369b78ada4f7c14605a901e8ad1e3cbba353eec1d552fe63179d363cf63383714
-MISC metadata.xml 1383 BLAKE2B ad7cd9b955c6e1381faf7a93414a2016d157a7ac5fac48c21d1a3bf036bf5f07d71bcc60d7df3883c76206354462cb4d45217ed0af6aeaac2287c7a396355bfb SHA512 09acd88a3aec56f9be171641cf2d8594b831d1c7b5513d535f9a12eabb2cf5a8fda0a9850efc828e9c1e067531fb84b21442076e1aac324dd941685e73445104
+DIST zabbix-5.4.2.tar.gz 24085572 BLAKE2B 0a2f7d645906b7df4dfbd3846de483ad5a9f8e9328daa212cbceb139d71418bea3b7af3a4426a6e2b3a55bbb8d42817ffc79d948152a2eb06ec97ec264efa8bd SHA512 c5ceaecc77d641ba656b52ab335fab664eba093779cbb882dea7de6e2e70be3c5d50f8035f1c709a8e244729f7d2181204e1337ae96b078ec3f08c9adb10bb1b
+EBUILD zabbix-4.0.31-r1.ebuild 9437 BLAKE2B f57c675a872a6a0c176b91086ba7b816ca835a887d8592ffd914e36d8a91a59c16b8025f59895163ca0a5125c7208f8eeb1541abb1f6df75d004a5a09522bdf8 SHA512 6275f6e866202146f148d903b982acd326c52aa802833cc4fcc3da653cfd3ed4ab637ff65857cf73e08f91dfa9dde64fada3ad8ab5aec766078f6a9d1768d6a3
+EBUILD zabbix-4.0.32.ebuild 9439 BLAKE2B 5b8105ee5c68df610474eeec87401927952c673f6f0da783d45a7e75af1df7541ac0a51a2e5db29052f6e1355a0d359c4b7c955827703689c133986cd256958e SHA512 0ca31665694b83574eaa9cfaa267ccf20d0bd3dfe00e2805a480a53c67d2a4d0d98aca25ae673c0ebbece2fca5115ded640d41a70832e9661b919a129ed66564
+EBUILD zabbix-5.0.12-r1.ebuild 32434 BLAKE2B 39beaba2d48e9257397db5fe115e1619af9974c4eecebe8d718fb63c6a8368b6bc944d3d0c8b933e7dea0a3266266c5568fc3c223821a4cdc124b89c9dcd6bc0 SHA512 2adff1e020386cbea1faade1b04eb9bc124476919bfe8e17e5a303d3b3a31905ba1a02a86b062b1afeb61bd06d480cf355396668f30f4807735ca2e5d099641a
+EBUILD zabbix-5.0.13.ebuild 32436 BLAKE2B 08e39e15fe208ea8e6de362267d8d57b7e738ca2fc872e659b25dd5b7257ba6d116b6392795683346b6f0f5bd3e41fd9c6694d625446ad89adcd93f21ee157b1 SHA512 17ea5eba81bc67e5e4af7844f6dfb1e4363e86caf7c804dcad6c458600a29c8e65b91c81cfe43040ab9d9a2918c1bbcd8af70c07a63237b4f1d3e4f8f9d81724
+EBUILD zabbix-5.2.6-r1.ebuild 33287 BLAKE2B c174b19ec3728417ff2214bb85ef416dd7b540f4f7296e3c49b4002e9ac79a00d9fe54dab8ac54203802d6f11bd6fd7ccff8687f1e53c8597af2049bee263015 SHA512 2b38b4be3cf2604c154f78f17ad344c908098c673ed69727b50bb69bea437235c4c5f1bfcf7b517fe87ce73b33359cd0d75569a7a0a7593c017e2d3a844091c9
+EBUILD zabbix-5.2.7.ebuild 33289 BLAKE2B af7cb591b0744b36febe6785732380a05f65125e1863f2bb99f62887ea84fdbdb567a06755c41e683f49b16f8acb8f9ff1ad21c3511dbfcda91a727eecbc1534 SHA512 fb828e60a82ff8499ca68e0248124c1257856c71e4e4babaa8fa860301a7f245c333307fee59d7bff7e9e7cd012eb6f99f78e7178180ff728c638b4cc3ddfe38
+EBUILD zabbix-5.4.1-r1.ebuild 34748 BLAKE2B 8b3124f4a161e0155d5c9822876fd18acd09dbd37395f76af3bbf454b9680f49001bab94f73fbfbea32ce90d7ea9bd3437f58df73c97f5dba7ee25253ce423ff SHA512 7f15082a553f0f510947872a111ba2ea8044d06728ee6054e0eb84cff098dd9a69d39a369130a34d467729843f0798493f3ba1b605468845c2e6dc66ba97a57e
+EBUILD zabbix-5.4.2.ebuild 34750 BLAKE2B a86da673bb948835cfb17d81bd5a41aeea87ca6526ba2f9319063aa73b910b080a47569e0f84e027a4979734c6560336ecc5d041e9427b561d8e52cbf18df5ba SHA512 59d22870078c289e08e4bc31729acba4c66b37901e98a76eccf803e1b51100b7cef3a2c460c73cf14916f41cd0fc5a77d2ae748b993cc8fb362538551644408a
+MISC metadata.xml 1519 BLAKE2B 3ee4cfb156b8bf0378378f73ac7584b16e3cf7b824a43350a77889bd17ceb470240206ee3b3412e826477417be9bb07920d0ef944a7c49d3a56fc2b0f2a9082f SHA512 6bd6020054a9be205b9805fd757f3f71bf3e6334a41c71c1c59d9e760638a51f6a12ae84274ae9be87ed23c0942abdeacb539343643cae33615ee87e20613464
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index 3bb2164c1a5c..40e6f474daf0 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -16,13 +16,15 @@ configure different types of notifications for pre-defined events.
     <flag name="agent2">Enable go-based zabbix agent 2 (for to-be-monitored machines)</flag>
     <flag name="frontend">Enable zabbix web frontend</flag>
     <flag name="ipv6">Turn on support of IPv6</flag>
-    <flag name="proxy">Enable proxy support</flag>
+    <flag name="java">Enable Zabbix Java JMX Management Gateway</flag>
+    <flag name="libxml2">Use libxml2 client library</flag>
+    <flag name="mbedtls">Use net-libs/mbedtls as TLS backend</flag>
+    <flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag>
     <flag name="openipmi">Enable openipmi things</flag>
+    <flag name="openssl">Use dev-libs/openssl as TLS backend</flag>
+    <flag name="proxy">Enable proxy support</flag>
     <flag name="server">Enable zabbix server</flag>
     <flag name="ssh">SSH v2 based checks</flag>
-    <flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag>
     <flag name="static">Build statically linked binaries</flag>
-    <flag name="java">Enable Zabbix Java JMX Management Gateway</flag>
-    <flag name="libxml2">Use libxml2 client library</flag>
   </use>
 </pkgmetadata>
diff --git a/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild
index 321e1e6f6d8f..9aad51163a13 100644
--- a/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild
@@ -15,11 +15,12 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+KEYWORDS="amd64 x86"
+IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static xmpp"
 REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
+	ssl? ( ^^ ( gnutls mbedtls openssl ) )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) )
 	static? ( !oracle !snmp )"
 
 COMMON_DEPEND="
@@ -44,7 +45,11 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist(-)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0= )
+		mbedtls? ( net-libs/mbedtls:0= )
+		openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	)
 	xmpp? ( dev-libs/iksemel )
 "
 
@@ -139,17 +144,19 @@ src_configure() {
 		$(use_enable server) \
 		$(use_enable static) \
 		$(use_with curl libcurl) \
+		$(use_with gnutls) \
 		$(use_with ldap) \
 		$(use_with libxml2) \
+		$(use_with mbedtls) \
 		$(use_with mysql) \
 		$(use_with odbc unixodbc) \
 		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
 		$(use_with oracle) \
 		$(use_with postgres postgresql) \
 		$(use_with snmp net-snmp) \
 		$(use_with sqlite sqlite3) \
 		$(use_with ssh ssh2) \
-		$(use_with ssl openssl) \
 		$(use_with xmpp jabber)
 }
 
diff --git a/net-analyzer/zabbix/zabbix-4.0.30-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.32.ebuild
index 3cfb30a0ed8d..d1235337a343 100644
--- a/net-analyzer/zabbix/zabbix-4.0.30-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.32.ebuild
@@ -15,11 +15,12 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static xmpp"
 REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
+	ssl? ( ^^ ( gnutls mbedtls openssl ) )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) )
 	static? ( !oracle !snmp )"
 
 COMMON_DEPEND="
@@ -44,7 +45,11 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist(-)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0= )
+		mbedtls? ( net-libs/mbedtls:0= )
+		openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	)
 	xmpp? ( dev-libs/iksemel )
 "
 
@@ -139,17 +144,19 @@ src_configure() {
 		$(use_enable server) \
 		$(use_enable static) \
 		$(use_with curl libcurl) \
+		$(use_with gnutls) \
 		$(use_with ldap) \
 		$(use_with libxml2) \
+		$(use_with mbedtls) \
 		$(use_with mysql) \
 		$(use_with odbc unixodbc) \
 		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
 		$(use_with oracle) \
 		$(use_with postgres postgresql) \
 		$(use_with snmp net-snmp) \
 		$(use_with sqlite sqlite3) \
 		$(use_with ssh ssh2) \
-		$(use_with ssl openssl) \
 		$(use_with xmpp jabber)
 }
 
diff --git a/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
index 40d10b23dee7..c94739cfae13 100644
--- a/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd toolchain-funcs go-module user-info
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 EGO_SUM=(
 	"github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
 	"github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I="
@@ -246,11 +246,12 @@ 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 +agent2 java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+KEYWORDS="amd64 x86"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) )
+	ssl? ( ^^ ( gnutls openssl ) )
 	static? ( !oracle !snmp )"
 
 COMMON_DEPEND="
@@ -275,7 +276,10 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist(-)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0= )
+		openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	)
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -322,6 +326,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+# upstream tests fail for agent2
+RESTRICT="test"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
@@ -370,17 +377,18 @@ src_configure() {
 		$(use_enable server) \
 		$(use_enable static) \
 		$(use_with curl libcurl) \
+		$(use_with gnutls) \
 		$(use_with ldap) \
 		$(use_with libxml2) \
 		$(use_with mysql) \
 		$(use_with odbc unixodbc) \
 		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
 		$(use_with oracle) \
 		$(use_with postgres postgresql) \
 		$(use_with snmp net-snmp) \
 		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with ssl openssl)
+		$(use_with ssh ssh2)
 }
 
 src_compile() {
@@ -419,7 +427,7 @@ src_install() {
 		doins -r "${S}"/database/
 
 		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
 	fi
 
 	if use proxy; then
@@ -436,7 +444,7 @@ src_install() {
 		doins -r "${S}"/database/
 
 		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
 	fi
 
 	if use agent; then
@@ -453,7 +461,7 @@ src_install() {
 			src/zabbix_get/zabbix_get
 
 		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
 	fi
 
 	if use agent2; then
@@ -467,7 +475,7 @@ src_install() {
 		dosbin src/go/bin/zabbix_agent2
 
 		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
 	fi
 
 	fowners root:zabbix /etc/zabbix
diff --git a/net-analyzer/zabbix/zabbix-5.0.10-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.13.ebuild
index 87d5506841fe..b921c70a4e01 100644
--- a/net-analyzer/zabbix/zabbix-5.0.10-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.13.ebuild
@@ -5,10 +5,8 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd toolchain-funcs go-module user-info
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 EGO_SUM=(
-	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
-	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg="
 	"github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
 	"github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I="
 	"github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ="
@@ -249,10 +247,11 @@ LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="~amd64 ~x86"
-IUSE="+agent +agent2 java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) )
+	ssl? ( ^^ ( gnutls openssl ) )
 	static? ( !oracle !snmp )"
 
 COMMON_DEPEND="
@@ -277,7 +276,10 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist(-)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0= )
+		openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	)
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -324,6 +326,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+# upstream tests fail for agent2
+RESTRICT="test"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
@@ -372,17 +377,18 @@ src_configure() {
 		$(use_enable server) \
 		$(use_enable static) \
 		$(use_with curl libcurl) \
+		$(use_with gnutls) \
 		$(use_with ldap) \
 		$(use_with libxml2) \
 		$(use_with mysql) \
 		$(use_with odbc unixodbc) \
 		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
 		$(use_with oracle) \
 		$(use_with postgres postgresql) \
 		$(use_with snmp net-snmp) \
 		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with ssl openssl)
+		$(use_with ssh ssh2)
 }
 
 src_compile() {
@@ -421,7 +427,7 @@ src_install() {
 		doins -r "${S}"/database/
 
 		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
 	fi
 
 	if use proxy; then
@@ -438,7 +444,7 @@ src_install() {
 		doins -r "${S}"/database/
 
 		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
 	fi
 
 	if use agent; then
@@ -455,7 +461,7 @@ src_install() {
 			src/zabbix_get/zabbix_get
 
 		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
 	fi
 
 	if use agent2; then
@@ -469,7 +475,7 @@ src_install() {
 		dosbin src/go/bin/zabbix_agent2
 
 		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
 	fi
 
 	fowners root:zabbix /etc/zabbix
diff --git a/net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild
deleted file mode 100644
index fc80e61bdea4..000000000000
--- a/net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2021 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 webapp java-pkg-opt-2 systemd toolchain-funcs tmpfiles user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
-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}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libevent
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-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
-
-	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
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	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
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild
deleted file mode 100644
index fc80e61bdea4..000000000000
--- a/net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2021 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 webapp java-pkg-opt-2 systemd toolchain-funcs tmpfiles user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
-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}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libevent
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-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
-
-	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
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	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
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild
index 7b7445ca6d86..e9c3135b3aac 100644
--- a/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd toolchain-funcs go-module user-info
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 # content of src/go/go.sum
 EGO_SUM=(
 	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
@@ -255,11 +255,13 @@ 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 +agent2 java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+KEYWORDS="amd64 x86"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
+
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) )
+	ssl? ( ^^ ( gnutls openssl ) )
 	static? ( !oracle !snmp )"
 
 COMMON_DEPEND="
@@ -284,7 +286,10 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist(-)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0= )
+		openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	)
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -331,6 +336,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+# upstream tests fail for agent2
+RESTRICT="test"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
@@ -379,17 +387,18 @@ src_configure() {
 		"$(use_enable server)" \
 		"$(use_enable static)" \
 		"$(use_with curl libcurl)" \
+		"$(use_with gnutls)" \
 		"$(use_with ldap)" \
 		"$(use_with libxml2)" \
 		"$(use_with mysql)" \
 		"$(use_with odbc unixodbc)" \
 		"$(use_with openipmi openipmi)" \
+		"$(use_with openssl)" \
 		"$(use_with oracle)" \
 		"$(use_with postgres postgresql)" \
 		"$(use_with snmp net-snmp)" \
 		"$(use_with sqlite sqlite3)" \
-		"$(use_with ssh ssh2)" \
-		"$(use_with ssl openssl)"
+		"$(use_with ssh ssh2)"
 }
 
 src_compile() {
@@ -428,7 +437,7 @@ src_install() {
 		doins -r "${S}"/database/
 
 		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
 	fi
 
 	if use proxy; then
@@ -445,7 +454,7 @@ src_install() {
 		doins -r "${S}"/database/
 
 		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
 	fi
 
 	if use agent; then
@@ -462,7 +471,7 @@ src_install() {
 			src/zabbix_get/zabbix_get
 
 		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
 	fi
 	if use agent2; then
 		insinto /etc/zabbix
@@ -475,7 +484,7 @@ src_install() {
 		dosbin src/go/bin/zabbix_agent2
 
 		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
 	fi
 
 	fowners root:zabbix /etc/zabbix
diff --git a/net-analyzer/zabbix/zabbix-5.0.11-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.7.ebuild
index 87d5506841fe..1b9cb96ff6ed 100644
--- a/net-analyzer/zabbix/zabbix-5.0.11-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.7.ebuild
@@ -5,7 +5,8 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd toolchain-funcs go-module user-info
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+# content of src/go/go.sum
 EGO_SUM=(
 	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
 	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg="
@@ -20,6 +21,8 @@ EGO_SUM=(
 	"github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
 	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143 h1:K9CFK8HRZWzmoIWbpA7u0XYLggCyfa/N77eVaq/nUiA="
 	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143/go.mod h1:BLhrehfVmtABJWBZTJV8HyPWCSZoiMzjjcZ3+vHHhPI="
+	"github.com/eclipse/paho.mqtt.golang v1.2.0 h1:1F8mhG9+aO5/xpdtFkW4SxOJB67ukuDC3t2y2qayIX0="
+	"github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts="
 	"github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4="
 	"github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ="
 	"github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk="
@@ -31,6 +34,10 @@ EGO_SUM=(
 	"github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs="
 	"github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg="
 	"github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY="
+	"github.com/goburrow/modbus v0.1.0 h1:DejRZY73nEM6+bt5JSP6IsFolJ9dVcqxsYbpLbeW/ro="
+	"github.com/goburrow/modbus v0.1.0/go.mod h1:Kx552D5rLIS8E7TyUwQ/UdHEqvX5T8tyiGBTlzMcZBg="
+	"github.com/goburrow/serial v0.1.0 h1:v2T1SQa/dlUqQiYIT8+Cu7YolfqAi3K96UmhwYyuSrA="
+	"github.com/goburrow/serial v0.1.0/go.mod h1:sAiqG0nRVswsm1C97xsttiYCzSLBmUZ/VSlVLZJ8haA="
 	"github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4="
 	"github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw="
 	"github.com/godror/godror v0.20.1 h1:s/ehD65nfVzWR2MrZGChDkLvVPlIVxbt+Jpzfwkl1c8="
@@ -249,10 +256,12 @@ LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="~amd64 ~x86"
-IUSE="+agent +agent2 java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
+
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) )
+	ssl? ( ^^ ( gnutls openssl ) )
 	static? ( !oracle !snmp )"
 
 COMMON_DEPEND="
@@ -277,7 +286,10 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist(-)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0= )
+		openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	)
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -324,6 +336,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+# upstream tests fail for agent2
+RESTRICT="test"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
@@ -364,25 +379,26 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable agent) \
-		$(use_enable agent2) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with 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_enable agent)" \
+		"$(use_enable agent2)" \
+		"$(use_enable ipv6)" \
+		"$(use_enable java)" \
+		"$(use_enable proxy)" \
+		"$(use_enable server)" \
+		"$(use_enable static)" \
+		"$(use_with curl libcurl)" \
+		"$(use_with gnutls)" \
+		"$(use_with ldap)" \
+		"$(use_with libxml2)" \
+		"$(use_with mysql)" \
+		"$(use_with odbc unixodbc)" \
+		"$(use_with openipmi openipmi)" \
+		"$(use_with openssl)" \
+		"$(use_with oracle)" \
+		"$(use_with postgres postgresql)" \
+		"$(use_with snmp net-snmp)" \
+		"$(use_with sqlite sqlite3)" \
+		"$(use_with ssh ssh2)"
 }
 
 src_compile() {
@@ -421,7 +437,7 @@ src_install() {
 		doins -r "${S}"/database/
 
 		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
 	fi
 
 	if use proxy; then
@@ -438,7 +454,7 @@ src_install() {
 		doins -r "${S}"/database/
 
 		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
 	fi
 
 	if use agent; then
@@ -455,9 +471,8 @@ src_install() {
 			src/zabbix_get/zabbix_get
 
 		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
 	fi
-
 	if use agent2; then
 		insinto /etc/zabbix
 		doins "${S}"/src/go/conf/zabbix_agent2.conf
@@ -469,7 +484,7 @@ src_install() {
 		dosbin src/go/bin/zabbix_agent2
 
 		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
 	fi
 
 	fowners root:zabbix /etc/zabbix
@@ -512,7 +527,7 @@ src_install() {
 			/${ZABBIXJAVA_BASE}/lib
 		keepdir /${ZABBIXJAVA_BASE}
 		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
 		exeinto /${ZABBIXJAVA_BASE}/lib
 		doexe \
 			src/zabbix_java/lib/logback-classic-1.2.3.jar \
@@ -535,7 +550,7 @@ pkg_postinst() {
 
 		zabbix_homedir=$(egethome zabbix)
 		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			[ "${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"
diff --git a/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
index 71c7af9479ba..cd6face9be93 100644
--- a/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd toolchain-funcs go-module user-info
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 # content of src/go/go.sum
 EGO_SUM=(
 	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
@@ -271,11 +271,12 @@ 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 +agent2 java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+KEYWORDS="amd64 x86"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) )
+	ssl? ( ^^ ( gnutls openssl ) )
 	static? ( !oracle !snmp )"
 
 COMMON_DEPEND="
@@ -300,7 +301,10 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist(-)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0= )
+		openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	)
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -347,6 +351,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+# upstream tests fail for agent2
+RESTRICT="test"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
@@ -395,17 +402,18 @@ src_configure() {
 		"$(use_enable server)" \
 		"$(use_enable static)" \
 		"$(use_with curl libcurl)" \
+		"$(use_with gnutls)" \
 		"$(use_with ldap)" \
 		"$(use_with libxml2)" \
 		"$(use_with mysql)" \
 		"$(use_with odbc unixodbc)" \
 		"$(use_with openipmi openipmi)" \
+		"$(use_with openssl)" \
 		"$(use_with oracle)" \
 		"$(use_with postgres postgresql)" \
 		"$(use_with snmp net-snmp)" \
 		"$(use_with sqlite sqlite3)" \
-		"$(use_with ssh ssh2)" \
-		"$(use_with ssl openssl)"
+		"$(use_with ssh ssh2)"
 }
 
 src_compile() {
@@ -444,7 +452,7 @@ src_install() {
 		doins -r "${S}"/database/
 
 		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
 	fi
 
 	if use proxy; then
@@ -461,7 +469,7 @@ src_install() {
 		doins -r "${S}"/database/
 
 		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
 	fi
 
 	if use agent; then
@@ -478,7 +486,7 @@ src_install() {
 			src/zabbix_get/zabbix_get
 
 		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
 	fi
 	if use agent2; then
 		insinto /etc/zabbix
@@ -491,7 +499,7 @@ src_install() {
 		dosbin src/go/bin/zabbix_agent2
 
 		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
 	fi
 
 	fowners root:zabbix /etc/zabbix
diff --git a/net-analyzer/zabbix/zabbix-5.4.0-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.2.ebuild
index 71c7af9479ba..8a3157cfa587 100644
--- a/net-analyzer/zabbix/zabbix-5.4.0-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd toolchain-funcs go-module user-info
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 # content of src/go/go.sum
 EGO_SUM=(
 	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
@@ -272,10 +272,11 @@ LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="~amd64 ~x86"
-IUSE="+agent +agent2 java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) )
+	ssl? ( ^^ ( gnutls openssl ) )
 	static? ( !oracle !snmp )"
 
 COMMON_DEPEND="
@@ -300,7 +301,10 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist(-)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0= )
+		openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	)
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -347,6 +351,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+# upstream tests fail for agent2
+RESTRICT="test"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
@@ -395,17 +402,18 @@ src_configure() {
 		"$(use_enable server)" \
 		"$(use_enable static)" \
 		"$(use_with curl libcurl)" \
+		"$(use_with gnutls)" \
 		"$(use_with ldap)" \
 		"$(use_with libxml2)" \
 		"$(use_with mysql)" \
 		"$(use_with odbc unixodbc)" \
 		"$(use_with openipmi openipmi)" \
+		"$(use_with openssl)" \
 		"$(use_with oracle)" \
 		"$(use_with postgres postgresql)" \
 		"$(use_with snmp net-snmp)" \
 		"$(use_with sqlite sqlite3)" \
-		"$(use_with ssh ssh2)" \
-		"$(use_with ssl openssl)"
+		"$(use_with ssh ssh2)"
 }
 
 src_compile() {
@@ -444,7 +452,7 @@ src_install() {
 		doins -r "${S}"/database/
 
 		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
 	fi
 
 	if use proxy; then
@@ -461,7 +469,7 @@ src_install() {
 		doins -r "${S}"/database/
 
 		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
 	fi
 
 	if use agent; then
@@ -478,7 +486,7 @@ src_install() {
 			src/zabbix_get/zabbix_get
 
 		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
 	fi
 	if use agent2; then
 		insinto /etc/zabbix
@@ -491,7 +499,7 @@ src_install() {
 		dosbin src/go/bin/zabbix_agent2
 
 		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
 	fi
 
 	fowners root:zabbix /etc/zabbix