gentoo resync : 22.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
commit: 908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree: c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /net-analyzer
parent: 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
46 files changed, 740 insertions, 1163 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index e090d0eecf8a..89952e6b3d2b 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest
index c43e3561a0f0..be748fe07079 100644
--- a/net-analyzer/barnyard/Manifest
+++ b/net-analyzer/barnyard/Manifest
@@ -2,5 +2,5 @@ AUX barnyard.confd 663 BLAKE2B 23d63eb8f96f17b74179aa10e51aa7a92a8f10f548043fc67
 AUX barnyard.rc6 620 BLAKE2B 7b59c2919d04b236e817fbe43baded639a5b918718585e07b73b01f96627370e7db44214a74c8bd535c6461585d2076c6640ca701abf7ebba1c82302fbe86ae3 SHA512 8dacb73e749b49fe3dbef061a8d5dea5d3f3861a290c846a892264eb2ebf75034121efaff91a352b6ab4639fab76ff11eeb39ce31f407a4d617c9c114e1862f5
 DIST barnyard-0.2.0-patches.tar.xz 13152 BLAKE2B d68aa5298938e50bb1102628cd8ebc0fae55c12fd4094e86306a86aeab3786a096906e4b0612b3dbb0a2de6a8aeba8161fdcfccf3a6915f5492401892eaa8b57 SHA512 9ff4f45e12d12a6b33f22f32be5f258cc9352a53c91d4415c292231ee5e5b03d58ed988011df5d3f13ac0046dd02ff36e0f92b4b0044181f695856118bb9228a
 DIST barnyard-0.2.0.tar.gz 161543 BLAKE2B 07f5fa6b2e01e1b421ea772b8ea0c72b6c8f66569caf176a57d3f4fce438c2dd4b2a8a61dddc4faf27c85b15d002205f1cc3627fe88d523fd25d716cc78747e7 SHA512 73424acf2e0c620b2f8f2f407d74812f7740234ce523e37557273998108c131311fffb16cfc2cea0f652d6b21072431081bad35b045f5654e2245786d27568e6
-EBUILD barnyard-0.2.0-r6.ebuild 2163 BLAKE2B 255b4508e4b0627fa8d87d9714834d6dad4ddca5f3c9908157dc149262a600cfe14c89db4c9bf35240a1b2d26a3448b3ce2b4f601df606f45949789591786fbe SHA512 329a7563e90a768a570bb9763293f59ca038f156fa09301445bd27cb67735ae385d9dacb14c4e2abccf23124cd4d8d2b8718e20119439e216b2f065a84b545fb
+EBUILD barnyard-0.2.0-r7.ebuild 2195 BLAKE2B c8a2a80cd488ce4c0c4a9ce65445aec02a7eebd293c780ade9cdd31ad363296884d467586e0cece948d615bb1ee642af223c6d6745eda1e18d6ef80a8a5c7ec0 SHA512 2c55b97644140469ebbdc14672f9b243f24baca24ce2ca0db5ad27036f12feff156b2b873c5d479818dd8a87b3bb9df98ba25fe97469083a0abe7f096d8e7f22
 MISC metadata.xml 476 BLAKE2B 7373ad6807efd6726704fea0abdeebb82612b5e072a88317399d1e5bf9e6283e4fd9baa606f760b98061afa0e105b219dfdc87f60e7998dabb12383945b152a0 SHA512 503afc115b32c391bbbe820a25a50806f464a3c28ce287b8a135799f61851e1aeeda85472920fd68d732d5202c0ade85db71c73ee2d183dde0bf7bf4aa7e43ad
diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild
index 6786fba3781f..e6c4d3a4e926 100644
--- a/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="
 "
 
 SLOT="0"
-LICENSE="QPL GPL-2"
+LICENSE="QPL-1.0 GPL-2"     # GPL-2 for init script
 KEYWORDS="~amd64 -sparc ~x86"
 IUSE="mysql postgres sguil"
 
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 481846446880..84f898819e2f 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,5 +1,7 @@
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
 DIST cacti-spine-1.2.16.tar.gz 108252 BLAKE2B ba0349cff7f4e82a5dc1d90c216cf7a4e0f939e28ab20d008b1725c948a85a00e2594f8997c8bbd69c305e3e58d944858c8439210956f45220b67229bc6df13d SHA512 0259084d70f9c8d20a8b19daf61e525228f99fba3eac4e2e5c9865114a5f1231b18389ca955fc4644c71c6c48cc45dda9b17e969a02c80552b84f98ad8945951
+DIST cacti-spine-1.2.17.tar.gz 110371 BLAKE2B 1f9605d34fcff0e4e7921ccbb5a22eeb9e2f2e2f22cf56189790dcdec798db5bff681df11cd82006254cc270174248c07ce3d94dca8d3367add6b220f1599adf SHA512 4c616af041d2f08e18fd274409c98d3efce84b7cca2d6e23db3d6c2a0d4c9a77a2c52c0ef8e0ed0c6ad409f28b56fdf3160e27654522d8aeb1b88e3cb4128d4a
 EBUILD cacti-spine-1.2.16.ebuild 812 BLAKE2B 9d463bf6b62d3c1e0af474a29a13b64704b4216b282ea9b0c20136d42222d25d70dd35b193e6c29943f3037fdf22b9a64ca924de9f42854df58d73e171b8750f SHA512 1acbe3686e387bbeebadbc804fcbb75d1a9e05db5e51dfdcc46a46b30707e1adcf9eb0be67e169dc9666404abe38bf32d244b6be9135208f7947c1623454761b
+EBUILD cacti-spine-1.2.17.ebuild 815 BLAKE2B 5d794a4366a7f8b7f4a8948bdb402a16490bcc88e7e0667e841dfbbb1648f5462c89b78b2b5688a92e609d85d0a06467743a64375fc47d0b8c95fd12c5978736 SHA512 02f34b32c9be0ae902c1b47872f0cb2fb2d6913e8c67210106837965738170a7c10c141097a3340ad8b3c28ee6da92cf785d179ec60be96d9d08b3c7748f7932
 EBUILD cacti-spine-99999.ebuild 763 BLAKE2B 5fa057bba01f62088350268e440768f9275c50606a3948dd00c5189a8aa801c0abc3bff41785dc829e3b1fa1313c53f1c42173595ee7bd33a01620fff6cd9e34 SHA512 1068671693e9aba8adb9d9264557985f914a6c557e2f6a5aa5412d02cfc11a1464a21efc6aa6dd35b6bbfca4a20612daa91e51f03dc69bbdb3c550f564a36683
 MISC metadata.xml 804 BLAKE2B 8d0bb7fae8d899f50b443f69baf541947404fe5d283385a54a7a321b3b722420d2ccd253f1dc36ff0fa11878cf1020c7e0e30967cad745b9524b8941f7fc384a SHA512 d64c9fdbfa90a74cf85a9988d9f35af6760c909a74cd2298e7f8e299993757ee867b54bca6ec59b60134d08e80bdb66269e5cba297d38c3a6779779ea87b37bd
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.17.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.17.ebuild
new file mode 100644
index 000000000000..32cee3944471
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.17.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="https://cacti.net/spine_info.php"
+SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+BDEPEND="sys-apps/help2man"
+DEPEND="
+	dev-libs/openssl:0=
+	net-analyzer/net-snmp:=
+	dev-db/mysql-connector-c:0=
+"
+RDEPEND="
+	${DEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	dosbin spine
+
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+
+	doman spine.1
+	dodoc CHANGELOG
+}
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 576f9acca710..29105fd9dbaf 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -2,5 +2,7 @@ AUX cacti-1.2.16-CVE-2020-35701.patch 706 BLAKE2B 746fca9b32bc863fd701f86df53f22
 AUX cacti-1.2.16-XSS-issue-4019.patch 19600 BLAKE2B 3a9f2c7474a633c8633fdaaa5db71c124c486e796dbdbbfdc5ed53ece7cd0f45652b1e62a4355855f8512b03e5a4ca9189ee50dd2784cbd0e8d84ee9f131d0fc SHA512 f002b947c27c3b2a6ba8300eae456fca771d5283bfd9a7516239745e41b7b6521b7affed6122ffc3c8f7108a4de70cfbf2411970065bd47a9164b0a849656947
 AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005c41f91ba7e7da690e8b3734312b7df5ef506aea771284264035517a73c12d37be1e9479dea7e6e5a99d4 SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623
 DIST cacti-1.2.16.tar.gz 29197220 BLAKE2B 19939d0ff79c895b481aeb7ffec8331d8b9c10a6b7e0dbda6532e06ef0322f21cf02f4bf53a9522e1f672dd04b343f5550e2f34f08b3af2050e1f72465cffc43 SHA512 fe22acf4dea8ab6ec79825d66a84ad4c43fdce2815e7327536d182bc04400ed7b1d268209bbbca8b307c4779ee5bf7369a617ec1f052d8805757c2ca9b30cc35
+DIST cacti-1.2.17.tar.gz 38344112 BLAKE2B e555fc99560d10e94181c38b50e6f839532fb3dc66ff688b36a7efd10c15304e7636c9b4b483763fcea751317bcb283bb2bd8f813d5759c98aed6bbf02fd256a SHA512 94ae75b2494a91c536906c7bbeaa948d16c7ad96ed3a62c1eb21175f92c01787c6849960bbc791e04b3df46edbfd3cd787eb825bb423ce0814c0904edb2c915d
 EBUILD cacti-1.2.16-r1.ebuild 1111 BLAKE2B 15341dcd648cf686bd1f840538494b700d96df84a924b5badfe8034d03f2ce859bf9b498b45031459e23a8cc26127ab7454f85c697c4d26cced5d1862232a6a4 SHA512 94639a653783ce6589f523f5506bc6f15abc8f9f21b585b39fa168b3ed8404d34b257673a870dca10c9d99d85425735c5c4527fd54e8f62ed94ff668d47402a6
+EBUILD cacti-1.2.17.ebuild 1019 BLAKE2B 57e9066fc7f369946454a5530453429401e567d96dc29cccd805ddbfa08f39714ab4b96ca25fa4ac39e59f7745b5e4a0ef446c996da87cfcfdf5a96b2b80cf9e SHA512 cb2c4ee15777689a17bcade0e8c51ed6aeee1a28f177aa4236fbe223df080fe115f7f0c45826908d5e4d212dd1afb72eab9d06c70662f67dd7d27c14412c28b5
 MISC metadata.xml 934 BLAKE2B ddf6460296c62f7aef96152fb724b1cdff7a846ac33e9119a935b63d4eb6d9aaf4ab077487300be4d38dd1a005e80de34bffec8a72bc34460e1f772c8e18ed56 SHA512 a7139b430dfe53fca0684b33e8f5e2e496d5b16deb0b5da52e427066b9388eb487273b166c53dc77a2db1770d39fd6669bff61cd70c65c94de35ce3acab0acc3
diff --git a/net-analyzer/cacti/cacti-1.2.17.ebuild b/net-analyzer/cacti/cacti-1.2.17.ebuild
new file mode 100644
index 000000000000..1dfa8747632d
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.2.17.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit edos2unix webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="https://www.cacti.net/"
+SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp doc"
+
+need_httpd
+
+RDEPEND="
+	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_compile() { :; }
+
+src_install() {
+	dodoc CHANGELOG
+	dodoc -r docs
+	mv docs .. || die
+
+	webapp_src_preinst
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${ED}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/cbm/Manifest b/net-analyzer/cbm/Manifest
index 09e4e6f63a85..c9c32b609286 100644
--- a/net-analyzer/cbm/Manifest
+++ b/net-analyzer/cbm/Manifest
@@ -1,4 +1,6 @@
 AUX cbm-0.2-tinfo.patch 531 BLAKE2B 6edd4f9904142badb81f721a0c6f359e189bd544fae32f9084376922843dfa0e7061c37959ad2d8fe59bbd799bcce825ced26e5f7f387e24b620110b7f71804d SHA512 47aa578894550fe920752c3b1dae4f22bcc6fa240e11ecc20c423972a695bd8f374a1b7437048dfbb113e7152aaf959d21a81d0028e4d89ebfb1406c7e3a10cc
 DIST cbm-0.2.tar.gz 16043 BLAKE2B a5c041ac33b4694c2933bee0d71786896ec30d0735b921f34cfb6a247179709afd9fa6d90f0602869976f334391e8138830f538b18a08a7396f4049e26029b24 SHA512 ca9dbbd73e707dca3b7bf10201840de28b2b3956ce3cb2fc76e1b530caf6ff883eb437f8be0df1efe3b5d8398c4949ea00de4ba48ed26b27afa21cf445d5d076
+DIST cbm-0.3.tar.gz 16473 BLAKE2B 165b01ec6d0fdd691763d990e1fe81b010942077f593e64fd3ccf5f070960612ddb2ccd1aef87530b0d0fe4c40e5d758c55d33b4b6e1c4b850769ef46b8a6b79 SHA512 dd4845465b34b978e6c696d6b0fa61969aead4bdd4474a264667af63cd99c5a1035f4961645237c3870dc366ea4b131c2e005d2abb2774814d127a61ecae8e29
 EBUILD cbm-0.2.ebuild 644 BLAKE2B 4d8d12be2e0f22df0671682acb74db9b0664b16fa69397c080c85e390d2288577d2b210d73f1f533dd1dd0bd0935600e7a086e071451985765931c65c4fc0143 SHA512 b7230fa1e1ceb8abbef8f2de5a77173c7b73cd2fad7205abdc6da649dc18c45230a76506b4167fc421d555e7b4c7fa7952069cb68bd5cfe85a70d8de1f5e6215
+EBUILD cbm-0.3.ebuild 652 BLAKE2B e56f7df4a06fdc2305821f6e347bc8f81b3c87eccd7639b6ff48b4a89495d4ee437fd1d58b84993013ff156eeffa4ce2205e9d9f32e16ce10c2d731a121202fb SHA512 53cb4afe0f3a5667fcb2d02510c606141db2e0f11e57b20b1551a51e6e3d3662dfde1f84637e5d3d04e16f0636640add4892856115f8d782124c8f9234ff3bd9
 MISC metadata.xml 387 BLAKE2B 0cb8910fe08af4b1b9a874dc196724cd4e7d7f65d3112ec24bacc6d338d2931afbda0755cafc89e2ce844893e1649675e34f37c0baa6d141faf45a7ca77f866b SHA512 8092aa19143ae23dec4bf31dafb786c6dbc40fce3fbe2bf144ccfaf82581bd9a44ac3bdbfa8d6d60ff6f9cbdbd29b2a77eb860385d3ea242d1e1c430eb8347c6
diff --git a/net-analyzer/cbm/cbm-0.3.ebuild b/net-analyzer/cbm/cbm-0.3.ebuild
new file mode 100644
index 000000000000..22ae3162bb6a
--- /dev/null
+++ b/net-analyzer/cbm/cbm-0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Color Bandwidth Meter"
+HOMEPAGE="
+	http://www.isotton.com/software/unix/cbm/
+	https://github.com/resurrecting-open-source-projects/cbm
+"
+SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="app-text/docbook-xml-dtd:4.4
+	app-text/xmlto
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
index 00bc4689af52..e935966a8e18 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -1,3 +1,5 @@
 DIST etherape-0.9.19.tar.gz 1452435 BLAKE2B d80d0d0eceeff67890d6a992551a136bfdcd3de005468d7d09eccc94ddf472209738c29d06a321116c90da1a31be0349f80dbee73d3297eae3e02588afea4e94 SHA512 3819c36a6ea5b1ec6fc675563ab0264d180824343344bf4f2da834db39547b721c1565b6edb882d55ce4e0ca93e4b34e3a544996a988584aaf7fe8b8d5ca265e
+DIST etherape-0.9.20.tar.gz 1480790 BLAKE2B 22682d1b7b72206519d0ad32855f558a718bed83674753fcc923419845ac8b97ce970c1121f49eac9b910e10675b5397e5d3a16701af5bc9b78187baee455ccf SHA512 1dbfbb0efff7871a4b78ca90f81ac2155b57ace217b72e443cdc8b3d3807f7ab881c876bec12d93673500026a9dbf1111417a419891df62230e664af9b54b636
 EBUILD etherape-0.9.19.ebuild 563 BLAKE2B 408aa0eddba3ddeabf7bc90662f211e7ec73552ecec7d8e09e4577e7e46a28dd25d1a8f833a01525c046cbaf0b580296f4dcf5682dda22dbe32f2d1aa268c6e8 SHA512 a60c429b91d341c11627e635856177cc5b7da7f29bdd287116edcf8e573d8be4da8d3b3a162ae12589bbbb67a444596de3f637e49990d087230e67b0b8d4cfa7
+EBUILD etherape-0.9.20.ebuild 577 BLAKE2B c8565cb20ac438ebd3eb23922cfd166a8f527ad3570671867aa1fa60278d7d21456720c3f017d5139ce62ce08700e11c13be4df57669bd9acca8419ce8fc8838 SHA512 e3b70188c5c89fdf18e5f1eaa8c9e3b290a7cf8f89f2433b59406570c7e610625cab308a89233909602ed713ae92d7a9022eb4cc4b0a593730c11cbbd3d925bd
 MISC metadata.xml 820 BLAKE2B 613982514b7fe5365b2eb8344cd1e7214d71636fec65aba0f4f2d226047e33ede0a0fb0f096f87d20077d0f1907375eaefbbc04bfc81904dd044bbc567cc887a SHA512 8e7b8953034f14069d5d2aad3c0a1b180ec182c9ae8be46bf2b837629e40f0122b4402c0adfeccb1967844c38b241a122a2735df0d63ad475c2355eb4b454e9b
diff --git a/net-analyzer/etherape/etherape-0.9.20.ebuild b/net-analyzer/etherape/etherape-0.9.20.ebuild
new file mode 100644
index 000000000000..1df3baebd4a8
--- /dev/null
+++ b/net-analyzer/etherape/etherape-0.9.20.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
+HOMEPAGE="https://etherape.sourceforge.io/"
+SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/popt
+	net-libs/libpcap
+	x11-libs/goocanvas:2.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.11.5
+	virtual/pkgconfig
+"
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index fb1d05c7805a..3880beb1943a 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,4 +1,5 @@
+AUX fail2ban-0.11.2-fix-tests-for-2021.patch 1821 BLAKE2B 52fae8ace32d6205d290d7e3a57378e10398742a735e9bf734d1ba4c6ff73abeb7bff8d0f76924c815a1dcdd7e57bf1a584956e1c03ff0db93f20ce68f1c8176 SHA512 a3db4065b5e815d409318c7aeb0f2fac87b2f91f7b1923a4c1684cbc97eb086ccd0fab993270d8c84d6f9da911f467d391689f312d89cea7cc6d59c20cfd39b0
 DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97
-EBUILD fail2ban-0.11.2.ebuild 3360 BLAKE2B f4806417afda8f66638e07fec9a17624056adfaf877cf9fad86cbf89e2db8b8dac49662e95ce58fc9ee6d058069acad914e6f59c9f946d9246ec05ddf17e3c69 SHA512 dd0f15854720499bc81ea019936fa0c99e9eda8fd7cb216723c7023e2ae7eb2455a58a74335ab50873a95625b10836ad4d63873af96f8a7b27a9a386bc3dd28b
-EBUILD fail2ban-9999.ebuild 3267 BLAKE2B 329de02c44675b90e31da3711c65daaea4e5f84069d42b436e4ea9f84223a03c70999a33eb361bec732006bef5a4a8a181f46e2552aecdc65790009318d4a8fd SHA512 a1479ca1d45845119e5489750ec0d53d7e8bf82eacdf958173d4c85b33be421bfd57d8f94d73c77f85c216d4a8ecfddac646d484a2137ac08651876474036435
+EBUILD fail2ban-0.11.2.ebuild 3586 BLAKE2B ddef850abaa1cd6d483ad780844fd574f561d308a2468fdf33cbfd479f525bfb6d130ca273cdd403490fb47b33a348c4ae76db70ca6aa017e99bb1eec2856612 SHA512 704a93c15b8101b45add0e217e412aa245fe40e4db92b9a95cc140b6fd605553e2e55fcd61ec3dedcc4a1e94a88b48ff84e42e9b451b0fd2db63ebfce566a84f
+EBUILD fail2ban-9999.ebuild 3538 BLAKE2B 0751d5d88c53d7d8821b9cd8ed7f62bf20c01790ea8007739866999a36f880acc32527a70052136b1e3364e109c130d8a69eccb9b313b26587ab2136180d85c9 SHA512 7b7c7cd7beba19c4c1367d0a37627212346788f9cfe111b8938ff3dbf71e4703617fb951bbf98aac226494cd86fb368b303dfc00a8afa9fbbecadf15d1a45814
 MISC metadata.xml 356 BLAKE2B 28861bc6e3c62f2c21ea1480816f2645de929f009dccf7f6ecf9d8a10ed72214fa80acab6bd72ca314b6f3154096b0c0f0324b07fece238150c356aac17886e9 SHA512 5759cb73ed737bf25d4fc68dc12a722100e5d7aba222a082d49900e8cbc06cbd1bf5d7272fae9f6256d475fe29397f391fcbffda9eee4e73214ad941da27ce69
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
index 8f57fd666aa7..caf428f0ca77 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
@@ -10,14 +10,17 @@ inherit bash-completion-r1 distutils-r1 systemd tmpfiles
 
 DESCRIPTION="Scans log files and bans IPs that show malicious signs"
 HOMEPAGE="https://www.fail2ban.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="selinux systemd"
-# Needs some work to enable them right now
-RESTRICT="test"
 
 RDEPEND="
 	virtual/logger
@@ -29,14 +32,16 @@ RDEPEND="
 				dev-python/python-systemd[${PYTHON_USEDEP}]
 				sys-apps/systemd[python(-),${PYTHON_USEDEP}]
 			)' 'python*' )
-		)
+	)
 "
 
 DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
 
-python_prepare_all() {
-	default
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-tests-for-2021.patch
+)
 
+python_prepare_all() {
 	# Replace /var/run with /run, but not in the top source directory
 	find . -mindepth 2 -type f -exec \
 		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
@@ -51,6 +56,13 @@ python_compile() {
 	distutils-r1_python_compile
 }
 
+python_test() {
+	bin/fail2ban-testcases \
+		--no-network \
+		--no-gamin \
+		--verbosity=4 || die "Tests failed with ${EPYTHON}"
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 
@@ -60,8 +72,8 @@ python_install_all() {
 	newconfd files/gentoo-confd ${PN}
 	newinitd files/gentoo-initd ${PN}
 
-	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die
-	systemd_dounit "${T}/${PN}.service"
+	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}"/${PN}.service || die
+	systemd_dounit "${T}"/${PN}.service
 	dotmpfiles files/${PN}-tmpfiles.conf
 
 	doman man/*.{1,5}
@@ -83,13 +95,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if [[ $previous_less_than_0_7 = 0 ]] ; then
+	if [[ ${previous_less_than_0_7} = 0 ]] ; then
 		elog
 		elog "Configuration files are now in /etc/fail2ban/"
 		elog "You probably have to manually update your configuration"
-		elog "files before restarting Fail2ban!"
+		elog "files before restarting Fail2Ban!"
 		elog
-		elog "Fail2ban is not installed under /usr/lib anymore. The"
+		elog "Fail2Ban is not installed under /usr/lib anymore. The"
 		elog "new location is under /usr/share."
 		elog
 		elog "You are upgrading from version 0.6.x, please see:"
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index 0765abc8425a..d0d4d4ef18f7 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -6,35 +6,39 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 
-inherit bash-completion-r1 distutils-r1 git-r3 systemd tmpfiles
+inherit bash-completion-r1 distutils-r1 systemd tmpfiles
 
 DESCRIPTION="Scans log files and bans IPs that show malicious signs"
 HOMEPAGE="https://www.fail2ban.org/"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="selinux systemd"
-# Needs some work to enable them right now
-RESTRICT="test"
 
 RDEPEND="
 	virtual/logger
 	virtual/mta
 	selinux? ( sec-policy/selinux-fail2ban )
 	systemd? (
-		$(python_gen_cond_dep '|| (
-			dev-python/python-systemd[${PYTHON_USEDEP}]
-			sys-apps/systemd[python(-),${PYTHON_USEDEP}]
-		)' 'python*' )
+		$(python_gen_cond_dep '
+			|| (
+				dev-python/python-systemd[${PYTHON_USEDEP}]
+				sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+			)
+		' 'python*')
 	)
 "
 
 DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
 
 python_prepare_all() {
-	default
-
 	# Replace /var/run with /run, but not in the top source directory
 	find . -mindepth 2 -type f -exec \
 		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
@@ -49,17 +53,24 @@ python_compile() {
 	distutils-r1_python_compile
 }
 
+python_test() {
+	bin/fail2ban-testcases \
+		--no-network \
+		--no-gamin \
+		--verbosity=4 || die "Tests failed with ${EPYTHON}"
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 
-	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
+	rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die
 
-	# not ${FILESDIR}
+	# Not ${FILESDIR}
 	newconfd files/gentoo-confd ${PN}
 	newinitd files/gentoo-initd ${PN}
 
-	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die
-	systemd_dounit "${T}/${PN}.service"
+	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}"/${PN}.service || die
+	systemd_dounit "${T}"/${PN}.service
 	dotmpfiles files/${PN}-tmpfiles.conf
 
 	doman man/*.{1,5}
@@ -81,13 +92,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if [[ $previous_less_than_0_7 = 0 ]] ; then
+	if [[ ${previous_less_than_0_7} == 0 ]] ; then
 		elog
 		elog "Configuration files are now in /etc/fail2ban/"
 		elog "You probably have to manually update your configuration"
-		elog "files before restarting Fail2ban!"
+		elog "files before restarting Fail2Ban!"
 		elog
-		elog "Fail2ban is not installed under /usr/lib anymore. The"
+		elog "Fail2Ban is not installed under /usr/lib anymore. The"
 		elog "new location is under /usr/share."
 		elog
 		elog "You are upgrading from version 0.6.x, please see:"
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-tests-for-2021.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-tests-for-2021.patch
new file mode 100644
index 000000000000..36193b181933
--- /dev/null
+++ b/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-tests-for-2021.patch
@@ -0,0 +1,50 @@
+https://github.com/fail2ban/fail2ban/issues/2904
+
+From 747d4683221b5584f9663695fb48145689b42ceb Mon Sep 17 00:00:00 2001
+From: sebres <info@sebres.de>
+Date: Mon, 4 Jan 2021 02:42:38 +0100
+Subject: [PATCH] fixes century selector of %ExY and %Exy in datepattern for
+ tests, considering interval from 2005 (alternate now) to now; + better
+ grouping algorithm for resulting century RE
+
+---
+ fail2ban/server/strptime.py | 24 ++++++++++++++++++++++--
+ 1 file changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/fail2ban/server/strptime.py b/fail2ban/server/strptime.py
+index 1464a96d1f..39fc795865 100644
+--- a/fail2ban/server/strptime.py
++++ b/fail2ban/server/strptime.py
+@@ -36,10 +36,30 @@ def _getYearCentRE(cent=(0,3), distance=3, now=(MyTime.now(), MyTime.alternateNo
+ 	Thereby respect possible run in the test-cases (alternate date used there)
+ 	"""
+ 	cent = lambda year, f=cent[0], t=cent[1]: str(year)[f:t]
++	def grp(exprset):
++		c = None
++		if len(exprset) > 1:
++			for i in exprset:
++				if c is None or i[0:-1] == c:
++					c = i[0:-1]
++				else:
++					c = None
++					break
++			if not c:
++				for i in exprset:
++					if c is None or i[0] == c:
++						c = i[0]
++					else:
++						c = None
++						break
++			if c:
++				return "%s%s" % (c, grp([i[len(c):] for i in exprset]))
++		return ("(?:%s)" % "|".join(exprset) if len(exprset[0]) > 1 else "[%s]" % "".join(exprset)) \
++			if len(exprset) > 1 else "".join(exprset)
+ 	exprset = set( cent(now[0].year + i) for i in (-1, distance) )
+ 	if len(now) and now[1]:
+-		exprset |= set( cent(now[1].year + i) for i in (-1, distance) )
+-	return "(?:%s)" % "|".join(exprset) if len(exprset) > 1 else "".join(exprset)
++		exprset |= set( cent(now[1].year + i) for i in xrange(-1, now[0].year-now[1].year+1, distance) )
++	return grp(sorted(list(exprset)))
+ 
+ timeRE = TimeRE()
+ 
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 07acb9e8c9eb..b32796816bff 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -19,4 +19,4 @@ DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa3
 EBUILD net-snmp-5.9-r2.ebuild 5608 BLAKE2B 17feaec47a68f5665973fe3e4fcd15af4e7c4573b8f9f6a84afe92672bdf307105d34045229b288afccaea0e16af8f23e3ad969518e6ef82d523b513e94b1401 SHA512 a7300befc2a3881a35cc93a02d7220ffc00fc17a2381a43a0f2a4125087db5b9bc43df33dbacaa7369a13fc4d5b2c4d9cf69eb64fd2ee4d6df915385274e0d5a
 EBUILD net-snmp-5.9-r3.ebuild 5635 BLAKE2B 8fb50677140ae8caf1a56b48dce264f8365defb02c15520136c0e3a5918584fa32f2746e84273818f938c55299a3fdf1a4ec2b163cf8aa455016783a5caa0675 SHA512 2a67bfaa5f11412afa6554f90ae16f39bc3363b0e24f4a4e79e719988c013915870621f25f35c20124b94d4d61d163baa12ca07ce18400172f74ef5fdd6c3501
 EBUILD net-snmp-99999999.ebuild 5582 BLAKE2B 09233dfcf6f51329d0ba47543dda9d9a84cb9b2e9748cb6dd815104da0b6394666d8519dc0b6077cbceca4077c6e0b70b08ae9fb69f3b8d828691f8750d768f0 SHA512 ec5af22c8ca64354ad0039b49fed9749ad87617ed264a182ba08ea5065b56afb0ab1aeea87e4271b8d76df40fb5b65e04404d746874e8e8ebe665d2de3877f53
-MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0
+MISC metadata.xml 1383 BLAKE2B 66b4b2fb72a10c172e0ccdc89aa8903176393f381762e467b1bf7f16be20896b94ea68c67d125f5db7c42c85093f8b4208ded932afebee4a52e47bb691cf708b SHA512 6468e1fcfcbf83104c6165728825d36160e8df8975bc88a8933b6bfd4b28185ba08608e01d7721858760d47bb70d637ca36c6a3e443f02fb799a27fd89a60627
diff --git a/net-analyzer/net-snmp/metadata.xml b/net-analyzer/net-snmp/metadata.xml
index f3f6819a5361..548b747e3e61 100644
--- a/net-analyzer/net-snmp/metadata.xml
+++ b/net-analyzer/net-snmp/metadata.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<use>
-<flag name="elf">Enable the use of elf utils to check uptime on some systems</flag>
-<flag name="kmem">Enable usage of /dev/kmem</flag>
-<flag name="mfd-rewrites">Use MFD rewrites of mib modules where available</flag>
-<flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to fetch TCP statistics instead of using /proc/net/tcp (Linux only).</flag>
-<flag name="pcap">Install snmppcap which reads from PCAP files and writes to the SNMP transport</flag>
-<flag name="pci">Use libpci (from <pkg>sys-apps/pciutils</pkg>) to look up network interface description. This feature is only available on Linux.</flag>
-<flag name="rpm">Enable monitoring of <pkg>app-arch/rpm</pkg>. This flag requires the bzip2 and zlib flags to be enabled as well.</flag>
-<flag name="smux">Enable support for the legacy smux protocol (superseded by agentx)</flag>
-<flag name="ucd-compat">Build UCD compatibility library. Increases significantly the install size.</flag>
-</use>
-<upstream>
-<remote-id type="sourceforge">net-snmp</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="elf">Enable the use of elf utils to check uptime on some systems</flag>
+		<flag name="kmem">Enable usage of /dev/kmem</flag>
+		<flag name="mfd-rewrites">Use MFD rewrites of mib modules where available</flag>
+		<flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to fetch TCP statistics instead of using /proc/net/tcp (Linux only).</flag>
+		<flag name="pcap">Install snmppcap which reads from PCAP files and writes to the SNMP transport</flag>
+		<flag name="pci">Use libpci (from <pkg>sys-apps/pciutils</pkg>) to look up network interface description. This feature is only available on Linux.</flag>
+		<flag name="rpm">Enable monitoring of <pkg>app-arch/rpm</pkg>. This flag requires the bzip2 and zlib flags to be enabled as well.</flag>
+		<flag name="smux">Enable support for the legacy smux protocol (superseded by agentx)</flag>
+		<flag name="ucd-compat">Build UCD compatibility library. Increases significantly the install size.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">net-snmp/net-snmp</remote-id>
+		<remote-id type="sourceforge">net-snmp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index d924d690a392..61f33c834b56 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -3,10 +3,12 @@ DIST netdata-1.29.1.tar.gz 6233282 BLAKE2B 53fd82c0b904b6d29eac1534e46d856c9b134
 DIST netdata-1.29.2.tar.gz 6234502 BLAKE2B b34314114c41e1fd80cfb1c495f34b2dbcc5449189d12215c2af4a5c543fb0be9314842430da75547db0bc5f1027fec313703cbc98d21435807d2105d6761372 SHA512 3046fa99725c9ec9b5cac695d2ab66dbad999fc7b1242722592521b0e270fbb32756a7de4aac9ac8fa4ef5dbf455034f7fdbe84f8e281c12471de61e79a0eacd
 DIST netdata-1.29.3.tar.gz 6234406 BLAKE2B 975b27e8cb66c174d7cf01de0e5b76d57b0eac8005d5da19aa308df530edd8fcacc97b1ba5956ac38ffb9fcd55b2c58f4a1dec3bc691a5b898e886de19b365df SHA512 67e661328d76b3b9d4837e5acae16937300f1b91bc37bafc3ee606aeda88d2775c606126b9f072c682a1b24f5610b7993fedb808fd9032b240702d12cf063b54
 DIST netdata-1.30.1.tar.gz 7153879 BLAKE2B 68553c000ee3a63cbd79cce5fe4daf75239cd76572160e1903f8325548d0cc4222f0c5e43f1488c31087b40de5222115bbe491cc00e36aea331992fc87b9f1ec SHA512 c3d116bf3459ca6224f5cd8341933c2696581178262a37887c532e09e98e5d075217fcd66574e00cc644fc16ec583b7e2fe54be95c98c477fb20fbe7ad9ed1a9
+DIST netdata-1.31.0.tar.gz 12528280 BLAKE2B 739538b26a07f9f607a2f63f50225ce6ea50feaae8bbb2a60e6a2548ebdf36e4bd37f28d43d414cac44eec4ad9459f40e9532ac61f62f947bd0bd61e64803114 SHA512 62deba75e41fca44015a4e36b6791f7f10ea0a2658bcbd640e231abbbdbf56c7317c9fa72218fbd22a3312b33e7ec7886ea254cba331da9b3a51923e45393576
 EBUILD netdata-1.29.0.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc
 EBUILD netdata-1.29.1.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc
 EBUILD netdata-1.29.2.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc
 EBUILD netdata-1.29.3.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc
 EBUILD netdata-1.30.1-r1.ebuild 3484 BLAKE2B 564d1c7b417dbf3456a8b6a87666dc734bfcf77b23f5a067b368e87952dce2608816b7a1bd7e8cbf772590110eb8018d285a2b81601a671af9be58f16322fbac SHA512 ea4a69ebde4d634a77485a1d3c6a30d6b91beb813f449448ad75a7c34423f9c0f6c7e4a8dbe2ad52e8c8b0e737c839bea230b5ece0068e9544431638ed98cd4c
+EBUILD netdata-1.31.0.ebuild 3484 BLAKE2B 564d1c7b417dbf3456a8b6a87666dc734bfcf77b23f5a067b368e87952dce2608816b7a1bd7e8cbf772590110eb8018d285a2b81601a671af9be58f16322fbac SHA512 ea4a69ebde4d634a77485a1d3c6a30d6b91beb813f449448ad75a7c34423f9c0f6c7e4a8dbe2ad52e8c8b0e737c839bea230b5ece0068e9544431638ed98cd4c
 EBUILD netdata-9999.ebuild 3484 BLAKE2B 564d1c7b417dbf3456a8b6a87666dc734bfcf77b23f5a067b368e87952dce2608816b7a1bd7e8cbf772590110eb8018d285a2b81601a671af9be58f16322fbac SHA512 ea4a69ebde4d634a77485a1d3c6a30d6b91beb813f449448ad75a7c34423f9c0f6c7e4a8dbe2ad52e8c8b0e737c839bea230b5ece0068e9544431638ed98cd4c
 MISC metadata.xml 1288 BLAKE2B 33251404c09ccdd7ba653dae7204cf262201fdfc058766eb6b12bd4eacd99be5482867110726ced371a89db6ff022f0c89cf62425ef14f5a2e13734ad1caf70d SHA512 27087ff277f6bec908d23a66183344dfed06761a9b344a3c0d8ec2048e56ac0cb542c3d30bc22fa71cd91aee5d396b4786b546556ce7d64ea394781e05644220
diff --git a/net-analyzer/netdata/netdata-1.31.0.ebuild b/net-analyzer/netdata/netdata-1.31.0.ebuild
new file mode 100644
index 000000000000..64c8c68c5aa7
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.31.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{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}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	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 cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-libs/libwebsockets
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	dev-libs/libuv
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	jsonc? ( dev-libs/json-c:= )
+	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		dev-libs/protobuf:=
+		app-arch/snappy
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_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}]') )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		$(use_enable cloud) \
+		$(use_with cloud aclk-ng) \
+		$(use_enable jsonc) \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable kinesis backend-kinesis) \
+		$(use_enable lto lto) \
+		$(use_enable mongodb backend-mongodb) \
+		$(use_enable prometheus backend-prometheus-remote-write) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_compile() {
+	emake clean
+	default
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+	fowners -Rc netdata:netdata /var/lib/netdata
+
+	fowners -Rc root:netdata /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+}
diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest
index 2d769e5a5a4b..276bc4bbfafb 100644
--- a/net-analyzer/sancp/Manifest
+++ b/net-analyzer/sancp/Manifest
@@ -9,5 +9,5 @@ DIST sancp-1.6.1.fix200511.b.patch 870 BLAKE2B 18ad38c37f11aa1c4804400db5475323d
 DIST sancp-1.6.1.fix200601.c.patch 3578 BLAKE2B 7c7e5ef0e1967d41f731d3c79f4273a4ebfc922159ada1940ba4635f6f82e63ed55faeffe53636d2c8fd96d57e1516211fff8852c73876d019fc13d59f4ace9d SHA512 3d15028d33e7dbddc74d8c6eefac6d66e357f024dca15afdfb8156b0cf969ab093c26baa43ebf7c1ac88f4275ef4bdc91c1cc69c5aa7b439a042ed966edea30f
 DIST sancp-1.6.1.fix200606.d.patch 6847 BLAKE2B 2d3d2369738adef1ae5ea37cfcab5952be243af269574292e042e361d7d4d02174bbaea2769f5fa6bf802eea6ae9559a3b637ee4dbce1b53715f1e4b66f9df51 SHA512 474a69052a2b9642fdc59e28c0237852d49b7b05445f0ffbbd2ea3f01b70a44e10ee49fba6294b413a53afe50271aaf88f979f8c479fb4b464b3ba5a70534276
 DIST sancp-1.6.1.tar.gz 69986 BLAKE2B 66ed4f5817f1bc299edc66441eea97fa0deeb0fffb15aeb251e3b0351d35f1c25aa452b30e0ba3feb80d306929687448228d0b6ac96e8deaf16c83322b73916a SHA512 41c6b35a2e7295d3b8185b9cc556c56b285cae7542c7ace78e663e54cef8d470bfa2ee083d9837fa34cf5ad1e7c325fb838b00e4f776f5662cade7d61e07145c
-EBUILD sancp-1.6.1-r6.ebuild 1776 BLAKE2B 62828e42931e65cea178f0b7d6d5acd6c0db2d0a747056a59d8f039c944a9338868d395f3e94f3a6953b695b2028b48476540398837155776607654775abd86a SHA512 38702d270d041de28d82c8f2d8c1c8c6eb417abaefc722ef14469a0c1549bec772c80e0b36ae8cd6ac856ae3ad77159ee70a5d47adab26b958fa427ed18714e1
+EBUILD sancp-1.6.1-r7.ebuild 1808 BLAKE2B a7dba20da834ab99cebac5e15e5648ef173075988dd7f81e42f2651fe73e3dd286f7913dda797812dbfbdb6de987c8bc1f17df95ebb46ede47652b17ba2bab45 SHA512 e452694838979d828a255aaead1e9f1d9511bccefb7c37c1a5012000856a84c4c0cbc039be1f7f402dbb9e607bba80d67aa81f56738707a4dc9ef361965979e6
 MISC metadata.xml 473 BLAKE2B 2d145ab771bc6ec7572cfc0523c7d9630638909cdd4a8eba60a5ba47bd0d74d14985cca1cb435c26d1f2cf9893d22e8001066d17cbf763014def308c787cad99 SHA512 3328fdd1dc68198464db9730005254454691ac8f4fbdd76dc09eb21c12f21fcd011ce7fb6cb1ce06262eb79fcc3c43abddd2314bdc64e2022fc8e5bb58360a85
diff --git a/net-analyzer/sancp/sancp-1.6.1-r6.ebuild b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
index be00f2204c5c..e18588995cbb 100644
--- a/net-analyzer/sancp/sancp-1.6.1-r6.ebuild
+++ b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="
 	http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch
 "
 
-LICENSE="QPL GPL-2"
+LICENSE="QPL-1.0 GPL-2"     # GPL-2 for init script
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="sguil"
diff --git a/net-analyzer/scanlogd/Manifest b/net-analyzer/scanlogd/Manifest
index 3df640647b33..4394008cc7bf 100644
--- a/net-analyzer/scanlogd/Manifest
+++ b/net-analyzer/scanlogd/Manifest
@@ -1,5 +1,7 @@
 AUX scanlogd-2.2.7-gentoo.patch 407 BLAKE2B e859b5d31f0a599f7a7a10863b1a883440551db1fd7a46613ce1c16229f9245f3312ee1a8577e98623850264e6e338d80c78e579a337b9387607577432a011c9 SHA512 e395e5b7ad59b57959060a1a4abc4cd2f3245a127975d3e780f8af9849df109b4e34d68594dbe6d2978ca62d0676c06dc6fb185effa734b958fa5c8b96e332c5
 AUX scanlogd.rc 382 BLAKE2B 086a833826e21d94c5e8d8bca522dcd69f8a1d42164094b0bcbf9141353e9b3dcb09d718a6c0b4e2b3c4ba7a2dda1fe01700085a3c910b7b169cda79382ce1d2 SHA512 d4f5a640fa9a6a44370fafb621ee8fd91357b0870d04d6852017ca4c108a50a1d76a6e1ac09dcf76f3238893c6084fb998e69b5f5f227b72b8307c8e1d6dc170
 DIST scanlogd-2.2.7.tar.gz 11352 BLAKE2B 480e1ef78ac35ff04fb44961aa501f997786e20a3501f54f74b9e5761edba4736341d364a9a10772d795cb6025b88399bf3b56b0a980a0d2d0787f7a66eeeb22 SHA512 56238cb91a33524a9512914568984ed0d066eb84bea1c08551fbc4e02c9643a3f9535d59b364db00d538e4d9bcd9650ac24f2042584d3a9c639f99eb77ba1a7b
+DIST scanlogd-2.2.8.tar.gz 12190 BLAKE2B 26396c3174de3d3cceed9833354cae7d7bbcf3078a81472ae1fa28856f011e6984fa8182a994d5a10632c19f15f86e31f1ee73309273cad04e05fec942afa0a4 SHA512 92f7a28dd40593dad6afae4fd0572efeceea3f43f334ff82c349538d4a28e9ab624912f82fc5c102a4a9937009bbf7b76a81029588e2815ff9b305144143572a
 EBUILD scanlogd-2.2.7.ebuild 947 BLAKE2B 20bef542281a5979bb04919116210524eef1d4115013f645d6eb9514f70ca4d70dbc691036f2a14cf68b1a6aa501e99ab1c749931921ed658b015f62b679ef78 SHA512 fbb3e20a7d7e91fff05c0093593a599f76393635518dc1313ff520a392e4238f199de538400a2ede78a30a4ae9956f14d59b70e18833b654b0ac15c783b58208
+EBUILD scanlogd-2.2.8.ebuild 963 BLAKE2B 327c2ba0abf77d73676381e6731ec3108859feda67063cadd95650335ba53f5b17419cbe7e53953df10148c54de8920921727eb438d0d7f9a08ebfa7994e5632 SHA512 cc1285616e9700f2b0b607593f41b501ca62ab61ca4694b5debd70203933fa6b188cc738175640d5ab84af73029b176e3744705226de6fd44a057b92997f168d
 MISC metadata.xml 443 BLAKE2B d202f0eaa045670664aaf485c576200a334ba1345a0b03f551e2aa6501e489fbbbd76a9e2fb848a5e8a8e1f8817997c0a00ee41dd048d7a3786d1db90506f92c SHA512 85a26f92ab115fb66fe3d6658ec35891b7a2a45a27e44aa02bf0524e61ee3b517cc3cefa2ffb72c7c1ba8ca306e209e8c411da0e5071b3fc6781747e407f7526
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.8.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.8.ebuild
new file mode 100644
index 000000000000..c21dc3ec5c8f
--- /dev/null
+++ b/net-analyzer/scanlogd/scanlogd-2.2.8.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig toolchain-funcs user
+
+DESCRIPTION="A port scan detection tool"
+SRC_URI="https://www.openwall.com/scanlogd/${P}.tar.gz"
+HOMEPAGE="https://www.openwall.com/scanlogd/"
+
+LICENSE="scanlogd GPL-2" # GPL-2 for initscript
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+nids pcap"
+REQUIRED_USE="?? ( nids pcap )"
+
+DEPEND="
+	nids? ( net-libs/libnids )
+	pcap? ( net-libs/libpcap )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.7-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	restore_config params.h
+
+	tc-export CC
+}
+
+src_compile() {
+	local target=linux
+
+	use nids && target=libnids
+	use pcap && target=libpcap
+	emake ${target}
+}
+
+src_install() {
+	dosbin scanlogd
+
+	doman scanlogd.8
+	newinitd "${FILESDIR}"/scanlogd.rc scanlogd
+
+	save_config params.h
+}
+
+pkg_preinst() {
+	enewgroup scanlogd
+	enewuser scanlogd -1 -1 /dev/null scanlogd
+}
diff --git a/net-analyzer/sguil-client/Manifest b/net-analyzer/sguil-client/Manifest
index b3f918f3e0d9..ed5056c1405f 100644
--- a/net-analyzer/sguil-client/Manifest
+++ b/net-analyzer/sguil-client/Manifest
@@ -1,3 +1,3 @@
 DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab
-EBUILD sguil-client-1.0.0.ebuild 1093 BLAKE2B 83b978b9eb65dc8578259d2b19dac479c0e75b3d38bd7fd93c2167ecd4e01fb9bd86e15d5116431cc67b250c01df6e205c8d66958f6b2779150343f00e5ef05d SHA512 b3dd6e5a199bfc89480de64de547458b9143501b7107292af4849b03f620f72627ef6c2087d5f7aca53109e181cd01afcd59fdf94957a6b23ece0b291c8ee776
+EBUILD sguil-client-1.0.0.ebuild 1110 BLAKE2B e350c916d7066131bc196a3237d86b51d54913cacacd31d853ca0598547c6bacb2faa9d990d3552e44956855e48fe9014be6c56a39c3b08af22e4d27b9aa1d12 SHA512 8f635ba7cedcea957150da090673ca530255c1f11f14319db520982464ca578beeb160d4fb1f6bd7524a642e424eb6c5d8122943ebeb3b0ad250a46a32ccca02
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild b/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild
index 992c2a582baa..a0b8868ce81c 100644
--- a/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild
+++ b/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ DESCRIPTION="GUI Console for sguil Network Security Monitoring"
 HOMEPAGE="https://github.com/bammv/sguil"
 SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-client}.tar.gz"
 
-LICENSE="QPL"
+LICENSE="GPL-3 GPL-2+ QPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ssl"
diff --git a/net-analyzer/sguil-sensor/Manifest b/net-analyzer/sguil-sensor/Manifest
index b283e138f041..135abdcaf99d 100644
--- a/net-analyzer/sguil-sensor/Manifest
+++ b/net-analyzer/sguil-sensor/Manifest
@@ -2,5 +2,5 @@ AUX log_packets.confd 527 BLAKE2B 568a785fab6f027218269378d345986c354246dad66673
 AUX log_packets.initd 2093 BLAKE2B a251bc9692a599e66943d5b3f6615f281d7872da22a76699875853f72836102cdb94fdf558250ee74e8618f8c45725dea0410e5fb635f153aadf5499575b4fe9 SHA512 43bc027f4769e986641a9820a1dfcb8a794ae417cb49efe333fd6a960953e1f9854c660e95ae9c0e14f4c1ec59da9e3096ae7352bbbb77805dc71729ed76514d
 AUX sensor_agent.initd 742 BLAKE2B 6d8a1aee38f81f4d9d971ec3a2d56112c0789ca60d5ee51ff7444109e55ddac889db81199e5883070031fe247cc06506febcb3ae27b5a215974a4f953121b887 SHA512 3a025479579ee9eec6a26d2a2c70efc362d37b7821dfa211236d8fe9dc2ea7b7b0694dccfd9b208655702401c1b0e3ecb08bac9e3b177ee77f161e5c774c1611
 DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab
-EBUILD sguil-sensor-1.0.0-r1.ebuild 2177 BLAKE2B 948191fe3834dd5267c701e38a6c03124f3df2b2c24d5010bfc05242473033a638d1f1a441af398985b032d1012138530380f232c552437bebc6599257bd5c50 SHA512 feb73b40ac4e2dcafbd0d6a50d6c6ca6904dc84d86e787fbd78c57512a57528c40fe474df011e7dbac1088fc600b2aeeb9c09543ae76a32ea8316474b4e475ed
+EBUILD sguil-sensor-1.0.0-r1.ebuild 2221 BLAKE2B 43bfb72e7e71d1439b1ed4a69f7266bb48c27e70f56250cfe61b15586be71bcca8159103db13c0b303ff5d43aa1f999db1c4418ef6f17c37679b82748bda42d2 SHA512 6153b71c0dbba34bfba56d4d760ee6fa7b9b82c9e5e9932401454398f2620fe01ce44e80556bcf8d4e67fe28c95f05d5c3adf411ade18978cf7f708d059a289b
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild
index d07d5ee62911..7007abd7517f 100644
--- a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild
+++ b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Sensor part of sguil Network Security Monitoring"
 HOMEPAGE="https://github.com/bammv/sguil"
 SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz"
 
-LICENSE="GPL-2 QPL"
+LICENSE="GPL-3 GPL-2+ QPL-1.0 GPL-2"    # GPL-2 for init script
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
index a69a3c9c4368..35a5b288044f 100644
--- a/net-analyzer/ssldump/Manifest
+++ b/net-analyzer/ssldump/Manifest
@@ -1,5 +1,7 @@
 DIST ssldump-1.1.tar.gz 187436 BLAKE2B 3cafd7263762a7a326fb30722a918bcfaae5b43eedca37a0b5c341efc510e935671dc7ebf71eb807fcacbfce5f77896f310b634028713deb5516390fcfc21f65 SHA512 00ff449d3818a27fbcb46316733428f6a623488e758a67fcb7ee4390835e3279e7242aa0134ddc158740cb8323f5fd9869bd50efb35189dce977d4768d9636c2
 DIST ssldump-1.3.tar.gz 122819 BLAKE2B 8a96746939eb8d9ba33340ff112b1bc5b436a7eb5756fda494065c8f8fd7d6ec9c1c28d8f7f880d25856f24749fd8a8a98d4104753bb68772b2583dafef099b8 SHA512 6da4db890a30673278b17eb00201b6c2535ba476b769bed6ed4e31c06744f32e299d0f0dd6420aa7255e2c982a378cd721d7bf51dd0aeb23211ab678d1e5f26e
+DIST ssldump-1.4.tar.gz 129184 BLAKE2B db27f94deaa8b1f0e656d22e645db349bba872d8404a1d8a82098c3a2dd4c6d4b12bb3d430094825219a66bd203736cc27766967d3ce0923bd5fdd64a452d6cd SHA512 fb17c5610dcfce3e8020a5148d37be5b2fbc3083d78727281922ae32b5905c4aa882cd368c3581238f3492c6b5bab943dcff6a966d64160a3836d6a95bdc7682
 EBUILD ssldump-1.1.ebuild 937 BLAKE2B cb9e7f84168680586b01f3d7392e92782476684a50f507be370ba5da0cc93fba4410dbb85d172cc2985560c8f4516c893b88a9aae0596ffd78590b481e78a7b7 SHA512 7e2d32d38e73c1768778d54f9357b5da7000ee7e794e74ea05304fef283ccf945643a336ed380cf3098d968649e6ee2f2599bb173a18cb0a7dc7f1af82813314
 EBUILD ssldump-1.3-r2.ebuild 661 BLAKE2B c029ae3caf669efae13cebc005ac4de8cedaaedf6ed584cbd2b057a21c6b01e8ce7913f73007bd4223cd8b4dc9a5b84dffa04734fe2b0e7872ee30bc40fbee77 SHA512 cd906cc11d80bbf8ce11bedc09533f11f50f5fb6a7792861b89361635e04bff241c6353b14a3b13e03165b320004c0b4b6c15ceeaedd22514ba84292c7f4bafe
+EBUILD ssldump-1.4.ebuild 665 BLAKE2B fe067d17d90c5bd86755ba810649138c3e0baf58126eef1ff633ab0ca3d0bc8b1592bbd6d9eea9e7a17774958805b1ad82177af947ce4c78a9fa03c642be8c58 SHA512 60a5a7fa9694a0af18c799ca1feb73b92750fc52e05da8993bc12f79490424bf3c9539117651e293984a003040b1639e3f849bc7f0d42e64b4ff79ee2b6e4860
 MISC metadata.xml 359 BLAKE2B 6cfa34e7b48e628a649c1e0775e8fde048226ba01436a3c275844089fbbe14f0588be44a2fc9ee6a4e89cc16ad1e479a53c926a4c3ba9edabe910bfb7d19bccd SHA512 e3eadb3bc57cdd5909cd93907f9d12a6541d303070a860bed60b10f5e018b6571d89f5100be0ff3800b2da5c58c40e3095cdfa43105273c389714c182ff33fe1
diff --git a/net-analyzer/ssldump/ssldump-1.4.ebuild b/net-analyzer/ssldump/ssldump-1.4.ebuild
new file mode 100644
index 000000000000..1f01a2d17e4a
--- /dev/null
+++ b/net-analyzer/ssldump/ssldump-1.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="An SSLv3/TLS network protocol analyzer"
+HOMEPAGE="https://github.com/adulau/ssldump/"
+SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-libs/json-c:=
+	net-libs/libnet:1.1
+	net-libs/libpcap
+	>=dev-libs/openssl-1:0=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin ssldump
+	doman ssldump.1
+	dodoc ChangeLog CREDITS README README.md
+}
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 80b5d160f248..15e2141da543 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -2,11 +2,12 @@ AUX suricata-5.0.1-conf 2771 BLAKE2B c9f9ac6707f71ace993bcf730df5aab11a6e59fcbb6
 AUX suricata-5.0.1-init 5480 BLAKE2B 48c9484c824f7216d1c4d64394a60b5a5b2c1f5781e8faa775d56765680dd27cb886daf61da7e93f78469f2947f38bd044804acc79f2fb3c40477aff0f470f13 SHA512 6756cebe424b057884904e716af05e74bf2cfc47461a6081b4ff45144d1fefb568ffc3aaffb8162efa3272fea535d0f93632b4778d9c80d64fca26740471ed49
 AUX suricata-5.0.1_configure-no-lz4-automagic.patch 601 BLAKE2B 01874b39d89a8872a35a102018e2e11208549f60790e88f988a689ba09c59fb915bbffccb6db454a8d8d4fee0ccf69b51cd5d2cde11cb6f2a1c401cb74c5c49d SHA512 d26fc7e0193ea3ddd5436964a26bbbfed847890d513c4e7181a0faceb0a688df8ca35ad68045ecd006a25da93d345a942c593f8711f81dff5f63d13e599f78b0
 AUX suricata-5.0.1_default-config.patch 813 BLAKE2B 5758447f2dc6fa50bb6a388c2c83bd35927cf90b66a10e51e5058869e09c05810c037da025a9d26486e33077a06bfe8ba08698618e091bdc40a255d8322062c7 SHA512 0f6337d5bff60cd57f3a3a3edcb82abde9acc6848b158cac1b8f945fc7a228340c420d53a2c5f558d5b5e2b7645f6b104e8105b260245209ba782966d6f04a7c
+AUX suricata-5.0.6_configure-no-sphinx-pdflatex-automagic.patch 938 BLAKE2B 3f5434808567cd314cdc5287397c2f215eca44e775ead00db7095f88798fc86d595418bf4c340c3686f20a43f7a8705985d954ef4ec6c799d9c12036151387c6 SHA512 4b6ca7dbfa61f26f44f83cf1300d428c3322bdad00bed2e8d1820dd8f74c3bbf335a12df05243a0e2d1c35da2cf5b85155ef7b1609790bcfc74ec084daf5d631
 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 6308 BLAKE2B 983a16f52ef856c1a032f9f6b77733fa8119be01f2d9a73d7d34c0715e820d0e45cdca2216a057a82a27b7587890c4db053d402dc930d25cdd6c50749b810d9b SHA512 d8752071b5e14e1e43d08fbf3e999c39669a00d283c35bdfd21ce14e6fc545a8158f8b1be076f933735bc85b8a4b001b38aa636851ccdf92294f67c1252dffb9
-EBUILD suricata-6.0.2.ebuild 6584 BLAKE2B 99f0293db4a5ba8cb76861ccc8a788853be335d70feb895ed63806d1bb0e5038e62b67dd7b4db5e1a821a118c0d1922451e8b72d23d8cc60a709db80a56826f9 SHA512 3ad71d0f084e37de8efc2fc9f517dc7c2b829a5e827588d79c60eac9832498c2367be1ca81df29673354948cb14d8dfca3893cf65cff27e14993c171f9ebeefc
+EBUILD suricata-5.0.6.ebuild 6381 BLAKE2B 43c6b0727584760a1b51ab0023a976e4718bf559c5b98e995efbe65c3138ab9ad8757f316aa383bd8d1ccad185d763406fb361d5becea219d9d95e31f5711de5 SHA512 215ac551bed8822bfdfe941e1bf3bb1b04df6e97c0c9d3c463c60d09a616f32bb5d210160a4a718bf5bdfb667a59bdc2356a0a241b076aba54739686265057c1
+EBUILD suricata-6.0.2.ebuild 6657 BLAKE2B b2443f1fe93ac7025e8b8fd436c49669348e59185b8bf281f8feb057e0207fd89f212b9be5a919454c8cfd769e0e8c66413d2ca8dc23f985a015f766a9d1369e SHA512 447cce2d3bd2790417301ac03609da246b84954aa9ffe733995485c1e1b572746689203c1a0a259669f34f726d167ef443f21fb7b2b35594a3b377d0ef0631bb
 MISC metadata.xml 1015 BLAKE2B 355c550ad2fe7a37d69b92f0bd710824d68a3353be687876449ad5b7d8e2c98b06b833e59ebcf479410aff09dce71e1f7f64be860c348f3d6c3519cd8fe2acf2 SHA512 0837e07a0130baff435e684b47a6b463991aec73b4f570672d0091a70adf163c5e83d19887e1575f12db783d6246050777011d25dc658fe4767cd3fe8fc1d4a5
diff --git a/net-analyzer/suricata/files/suricata-5.0.6_configure-no-sphinx-pdflatex-automagic.patch b/net-analyzer/suricata/files/suricata-5.0.6_configure-no-sphinx-pdflatex-automagic.patch
new file mode 100644
index 000000000000..be5805e67f87
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata-5.0.6_configure-no-sphinx-pdflatex-automagic.patch
@@ -0,0 +1,26 @@
+No configure options to disable looking for these, redundant for releases
+because the tarballs already contain both PDF documentation and man pages,
+and as of 2021-05-11 doc generation is not compatible with sphinx-4.0.0+
+due to conf.py calling long-deprecated app.add_stylesheet() rather
+than app.add_css_file().
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -2423,7 +2423,7 @@
+     fi
+ 
+ # sphinx for documentation
+-    AC_PATH_PROG(HAVE_SPHINXBUILD, sphinx-build, "no")
++    HAVE_SPHINXBUILD="no"
+     if test "$HAVE_SPHINXBUILD" = "no"; then
+        enable_sphinxbuild=no
+        if test -e "$srcdir/doc/userguide/suricata.1"; then
+@@ -2434,7 +2434,7 @@
+     AM_CONDITIONAL([HAVE_SURICATA_MAN], [test "x$have_suricata_man" = "xyes"])
+ 
+ # pdflatex for the pdf version of the user manual
+-    AC_PATH_PROG(HAVE_PDFLATEX, pdflatex, "no")
++    HAVE_PDFLATEX="no"
+     if test "$HAVE_PDFLATEX" = "no"; then
+        enable_pdflatex=no
+     fi
diff --git a/net-analyzer/suricata/suricata-5.0.6.ebuild b/net-analyzer/suricata/suricata-5.0.6.ebuild
index 46d1458df40e..ac0387dc3152 100644
--- a/net-analyzer/suricata/suricata-5.0.6.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles
 
@@ -56,6 +56,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
 	"${FILESDIR}/${PN}-5.0.1_default-config.patch"
+	"${FILESDIR}/${PN}-5.0.6_configure-no-sphinx-pdflatex-automagic.patch"
 )
 
 pkg_pretend() {
diff --git a/net-analyzer/suricata/suricata-6.0.2.ebuild b/net-analyzer/suricata/suricata-6.0.2.ebuild
index 7171dc94415d..ac72587b971d 100644
--- a/net-analyzer/suricata/suricata-6.0.2.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles
 
@@ -55,6 +55,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
+	"${FILESDIR}/${PN}-5.0.6_configure-no-sphinx-pdflatex-automagic.patch"
 	"${FILESDIR}/${PN}-6.0.0_default-config.patch"
 )
 
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index bd512f786e2c..7edc9aa35b08 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -4,6 +4,6 @@ DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f
 DIST tcpdump-4.99.0-upstream.tar.gz 2008080 BLAKE2B 389939ea501edf66b7bb809c835feffebf15f30fbba559ce40963733a79ca271982336884acd7ff3d078decb1aaea0616d98091199918b520ef3d1fe0f194431 SHA512 03a434ec41c0026f237bc1e7a928b7ce67dbc342a8d982caded93d987bd356faf706a9d884231bd94f5e2a8580499fe95a28728e37a6672e371a1501ec5d6f79
 DIST tcpdump-4.99.0-upstream.tar.gz.sig 442 BLAKE2B a6cafbccdc1ecfb236a643b72114411e173cc898cda41edeac0c9755e48980f2d44f54c1f52b23dd992890b5aaa57e19430a600662e623832ccc62bfb7ac6fb4 SHA512 545770f09bec2f4ab3e723ab8582f1256eb0cb774ac2f329de17a45ee8256faea49469b796e17250d10c0455b305d39283c9b1d8b3c5a06c47a0d8088c874803
 EBUILD tcpdump-4.9.3-r4.ebuild 1700 BLAKE2B 807df788ac7f23cfe14a7c8116607bdb8bbdf346df552feeb8b72bd23f6f4867b8701e2b72ff585be5f5a658c12cb1dc955d205437bf9ec80e5e969c9aa7103b SHA512 4f1ea4403015d9b0e01c155f0df4695c4e71a997ac2e35334f3cb2f9cdff6f79dc23e29a963d9305c3d946b98dbd59ee45a22e91c0de13bdac502511bf1b65ef
-EBUILD tcpdump-4.99.0.ebuild 2300 BLAKE2B 441a71ffce86d1a64add726b88e41a54e564291aacee31748ddfab77058452772f9e8290f8a93af147c138fc0fa631b2999f9fba6fb308b5257ad25f4384ab86 SHA512 4beac851d190f8860d20097afa1738e4c0d0d3e77adeec52ad33435333dc28329d2ce75ba30b4eea01d7dc7b7b1b797606d7ca00abb7b9044693ab5a20fd1afd
+EBUILD tcpdump-4.99.0.ebuild 2299 BLAKE2B b12600c20ca80aed3aef1c0206be94cd61cfca8a4ecadb25f1de82b748d416daaa1772533c688a06a609edc4d8fc19f6b526041f6d57a6da8210974cb743cf1d SHA512 8eaed7d2f02b9e1fd3d517f09fce49a5e46c60e027f951a61c2ef7cf2bc51b3c8e2def33703a1104e48f12f02cdd633895f7d83bddb871b1c8ca082d9222c436
 EBUILD tcpdump-9999.ebuild 2144 BLAKE2B f1291e3a4d1f0244dbe4a7e80b40b9ce1f44b5d1f5e76a6888f4cbf77c704497bc316e25f8785faa75319e658e3f162dcde20ce86e2ba497481dfae0c7def580 SHA512 5a64ffdb86df8529d264554aa097cd824e5c26690a9b1a258f5b56238f6af5ee80920109cd1c9e3c128eeb0acfbceffb889ecf2a1310865615c73da1186a3c0c
 MISC metadata.xml 700 BLAKE2B 75eb9e5a825df6e9f4d4ef871e18eeaf6960ee25bbb42d5cb4bcd78775a7ead3ca45c76dd54ccee34c30e56d39303ee4d374a13bbaf449cbcf72242b7c9306f0 SHA512 c248231c288d69b2f71e86054095b599d72e971b9f8e67bacd851907b70b6a252fbf85a47f2b7f0cd3422ec7ef69410e2b3dbbe6de6b96320718dd5400900c74
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
index 7e66b5384bc8..99b6d4b9e939 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
@@ -21,7 +21,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
 
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="BSD"
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 2378c1053feb..df1100d59435 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -13,7 +13,10 @@ DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7
 DIST vnstat-1.17.tar.gz.asc 819 BLAKE2B 3186e28dc29edb37eb0bbef9b29f1ea682e4a9de208b69b83a8bc99c81f272eb6865176aaa30e415bf8423d94f385e0725e1256eeb822c3152638eaace23b749 SHA512 c26af29daefe6431c1769812d04ba5bff92ac1241a6a49df11e28f0e51b21d4eb84ff1f1fb133a388fd8ac59967162bc5d60d5f02c409d34be5414acd34f7818
 DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b865689540b5838ddeb2629da968bc2ba655cb6ff909227a859f0334900a1597c78b772124a993343a4cf23 SHA512 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea
 DIST vnstat-2.6.tar.gz.asc 833 BLAKE2B 5e79d1b622dd4d37603a209b78018a3e88f2c404c700e1f439e4b98e2c2dd5bdf26e8ecd3b1b1242e14a725d7839c5a8b3b5448dc27e1f917cbeaf6012546656 SHA512 c643152bec14b70317465f8adc2256b41b8686e106b35ce492ad5030c2d5b32162441ac5fb2f309071da855efdf444076288cf075d8073bad0c0907067366e7f
-EBUILD vnstat-1.17.ebuild 1636 BLAKE2B 105d76a84e9dbfa5faf872a040815fb48a1579a52d9c6e11b83575bd19005211d6cb607f194d243cad11924e1ec32d7d699b8b506a053e92ee7075941bdce8d0 SHA512 2158ca138388c4e26e2e91d32163cfd8fe4be3b1c42926725b7a74c364140e7b65ba6667669ec874df36b4ee19aeebcdf0470d2e8d93425b266ae2584471bb4e
-EBUILD vnstat-2.6.ebuild 1864 BLAKE2B 1a39357dafe09afb2d7a9786adf30c8e1da186449853cb6d1ac0882c23ce206eca94955fb73c9be90ccd127f7ad6221d709a1742afe9e990af5c8907f95dd820 SHA512 ec17931121e4a52db571c2ca38a3d39ff51429e6e442f319b9b53e317f4c3c2586ba4402639fb3cc71126b724d9fadd7030ae7c7fd0ec447a3c7efcd14bc7e9d
-EBUILD vnstat-9999.ebuild 1880 BLAKE2B a861f7251830efe7e2d6714bf8ed828f0b09d1d6167a0e9e7ba34aca2682ca42ae92c8c73c2bb8bb17ba3a604c3d1d767eb92da2a3b2f80e890c866b2e65c1ff SHA512 01304ab549cfb81fdbf5895bce42d62e609b5291e944a9a003b452be01156a32c53ba24f40b11ef02797f61be825e551f795570ec128cf30f003c30c1b599344
+DIST vnstat-2.7.tar.gz 287304 BLAKE2B f7b50cccfe4b62bce45751e6029650dc6d8ac7b7925cc4177fb1772c6d842b5201f6834d5e6374016b4c42374660b1c127d5b021adffe873de0a4c484171b6b3 SHA512 3d1674ddb5269d29d4d758551dc3e58fb1858a7dd790914c7d74047443b25d242c91f8ab20bdede9c1b061d6b682d73f3d6c1a8aa656a9676bc33c0ed9b1b2d4
+DIST vnstat-2.7.tar.gz.asc 833 BLAKE2B ae9bb28ccd9f10e7ac0c32e9895140cdd9d8498ef18d9b716ffbed3c6693ff08e5ddb08c377ec009df881f7fc1666f09da48cee75857566bdd4f1a2be30a97b9 SHA512 dd1ae2d94400aee9622c28385a103680ca87abfb66b5c92e8ce7240b97f28e81ac1a9cfc97fff7cd6d3934bfa639f46c835acbf855c7a4a29309946d7cbd80d4
+EBUILD vnstat-1.17-r1.ebuild 1705 BLAKE2B cc7ae0926a5cbd7eddbb7c086daf089923047e5e5e7f970d3f43b99f25a8c308a1a366082e0451976115b1f03b37e99db4a40e2a441f86af5cd204ca80988311 SHA512 ae1534aa8199948b44619b91aefa1bfd1d67b025bc3594ab14e3a963e9786dd5a27e98458bdc2fbe9c3d1ef7d6c302331f5c8e8568207ed7291f3209f7d007fe
+EBUILD vnstat-2.6-r1.ebuild 1815 BLAKE2B 214e211c905fb49fcb9e86e878e996d80f9430eb21eb36a91e32860b6e15ba86794a46fb8a79692715f66cdaf006119fae19f4dec1eb6666a5d9fc740534047a SHA512 2fde65ada54835efdd756ed5ffc2f90aabdd4d28036dd1a195bb6669b61c1e054bab8762aa7f076fc009056989d6ec9db45c542bc8f155c8a04a196af0e16995
+EBUILD vnstat-2.7.ebuild 1834 BLAKE2B 62d54236a163b5cbff07c2fa631286cd27675f985677ab73138a278eab96bc6780e5be09fc1d3b3a3d9aa3ad89736de1b6fbc462cfbb734c8c956103d3ac0c72 SHA512 ab2ba9bb3a63f1c9b825a82f3914e2debc23907427f232888d21b3d5f6996b51f007f16f4e40559546e302663f0f61b56027eb865cff3cddf1e8c5bd87490f9d
+EBUILD vnstat-9999.ebuild 1834 BLAKE2B 62d54236a163b5cbff07c2fa631286cd27675f985677ab73138a278eab96bc6780e5be09fc1d3b3a3d9aa3ad89736de1b6fbc462cfbb734c8c956103d3ac0c72 SHA512 ab2ba9bb3a63f1c9b825a82f3914e2debc23907427f232888d21b3d5f6996b51f007f16f4e40559546e302663f0f61b56027eb865cff3cddf1e8c5bd87490f9d
 MISC metadata.xml 835 BLAKE2B 4798aa86fd444665d135f7b2ede84889049113260c965b01999a2f9000c826fefa6877e8d3267a813421df97b2a0076f0718278ad3e0cf376bfc91babaaf87f3 SHA512 1c51f11ba3524329dec2101494c89d26859eab16e862e36e49df9240ee3fddf0380bfd929ec1719fc0e21808fc26f381b3be06f5fc89127f4c7e2fd188b3e886
diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
index 5a1f12b3e07d..8aa25d8a3276 100644
--- a/net-analyzer/vnstat/vnstat-1.17.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc
-inherit toolchain-funcs user verify-sig
+inherit flag-o-matic toolchain-funcs verify-sig
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
 HOMEPAGE="https://humdi.net/vnstat/"
@@ -22,14 +22,11 @@ DEPEND="
 	${RDEPEND}
 	test? ( dev-libs/check )
 "
-RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )"
+RDEPEND+=" acct-group/vnstat
+	acct-user/vnstat
+	selinux? ( sec-policy/selinux-vnstatd )"
 BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )"
 
-pkg_setup() {
-	enewgroup vnstat
-	enewuser vnstat -1 -1 /dev/null vnstat
-}
-
 src_prepare() {
 	default
 
@@ -46,6 +43,15 @@ src_prepare() {
 		src/common.h || die
 }
 
+src_configure() {
+	tc-export CC
+
+	# Fails to build with GCC 10
+	append-flags -fcommon
+
+	default
+}
+
 src_compile() {
 	emake ${PN} ${PN}d $(usex gd ${PN}i '')
 }
diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild
index e1ce66f909cb..3d37feff320b 100644
--- a/net-analyzer/vnstat/vnstat-2.6.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit systemd user tmpfiles
+inherit systemd tmpfiles
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
 HOMEPAGE="https://humdi.net/vnstat/"
@@ -36,7 +36,9 @@ DEPEND="
 	${RDEPEND}
 	test? ( dev-libs/check )
 "
-RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )"
+RDEPEND+=" acct-group/vnstat
+	acct-user/vnstat
+	selinux? ( sec-policy/selinux-vnstatd )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.2-conf.patch
@@ -44,11 +46,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.2-run.patch
 )
 
-pkg_setup() {
-	enewgroup vnstat
-	enewuser vnstat -1 -1 /var/lib/vnstat vnstat
-}
-
 src_compile() {
 	emake ${PN} ${PN}d $(usex gd ${PN}i '')
 }
diff --git a/net-analyzer/vnstat/vnstat-2.7.ebuild b/net-analyzer/vnstat/vnstat-2.7.ebuild
new file mode 100644
index 000000000000..189549001483
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-2.7.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
+HOMEPAGE="https://humdi.net/vnstat/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/vergoh/vnstat"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc
+	inherit verify-sig
+
+	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+	BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gd selinux test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/vnstat
+	acct-user/vnstat
+	dev-db/sqlite
+	gd? ( media-libs/gd[png] )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-libs/check )
+"
+RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2-conf.patch
+	"${FILESDIR}"/${PN}-2.2-drop-root.patch
+	"${FILESDIR}"/${PN}-2.2-run.patch
+)
+
+src_compile() {
+	emake \
+		${PN} \
+		${PN}d \
+		$(usex gd ${PN}i '')
+}
+
+src_install() {
+	use gd && dobin vnstati
+	dobin vnstat vnstatd
+
+	exeinto /usr/share/${PN}
+	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
+
+	insinto /etc
+	doins cfg/vnstat.conf
+	fowners root:vnstat /etc/vnstat.conf
+
+	keepdir /var/lib/vnstat
+	fowners vnstat:vnstat /var/lib/vnstat
+
+	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
+	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
+
+	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
+	newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
+
+	use gd && doman man/vnstati.1
+
+	doman man/vnstat.1 man/vnstatd.8
+
+	newdoc INSTALL README.setup
+	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
+}
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index ef79532e70ff..189549001483 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit systemd user tmpfiles
+inherit systemd tmpfiles
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
 HOMEPAGE="https://humdi.net/vnstat/"
@@ -29,6 +29,8 @@ IUSE="gd selinux test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	acct-group/vnstat
+	acct-user/vnstat
 	dev-db/sqlite
 	gd? ( media-libs/gd[png] )
 "
@@ -44,13 +46,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.2-run.patch
 )
 
-pkg_setup() {
-	enewgroup vnstat
-	enewuser vnstat -1 -1 /var/lib/vnstat vnstat
-}
-
 src_compile() {
-	emake ${PN} ${PN}d $(usex gd ${PN}i '')
+	emake \
+		${PN} \
+		${PN}d \
+		$(usex gd ${PN}i '')
 }
 
 src_install() {
@@ -75,8 +75,8 @@ src_install() {
 
 	use gd && doman man/vnstati.1
 
-	doman man/vnstat.1 man/vnstatd.1
+	doman man/vnstat.1 man/vnstatd.8
 
-	newdoc INSTALL.md README.setup
-	dodoc CHANGES README.md UPGRADE.md FAQ examples/vnstat.cgi
+	newdoc INSTALL README.setup
+	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
 }
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 4e3bebceda8b..d103ab04f338 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -17,6 +17,12 @@ AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5c
 DIST github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.mod 36 BLAKE2B c4bd514ce347b1cef3c84d6a9b0c50c30f627ec96a01b083c240770618fc6ec4a66d73aef4dd3f40426fcce60be02a6fb620c023c56f88930925e71a4b842a83 SHA512 1d855074be6ecc48804f3d70d54a92617864fbcdade80deee03fe29f046d05901628bfe11c37a30838177801aa2bdb8247b7a8ad18bdd4d1d3a2d85d3342b304
 DIST github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip 3289 BLAKE2B 9ee2622ac02197b10ee4798bba13513b6cbd319827ec14688f5950de6d8784813397155694e54ef756ead56791a669a61c190c4d3adbe4bf9795ead4896dcfb4 SHA512 953c2b7b855a5798948b52e82c7cae799b9310ca5978bf3168fdce310b6695647f997c7a9d70e7156870977be2de26479865980acfa36d765bd21fb4fe823bba
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.mod 128 BLAKE2B 4d1baeb3d0a629cbb1fecf51e584ed575dcd8bd5244845f487b884304fb669a16f2b69f1d1e249665f4f493e57d6eb08d315ef1eea2d5180b94fd23b6fe5241a SHA512 2c35c1d5198cdae7437add88eaad34195f29bacc8a59c10ced04994fd15426374ea95a272e0f2988b360a5514d874971c211d8b1812facb4e84e82725077ff55
+DIST github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.zip 478041 BLAKE2B 70c36b8f41f50cc3a22f82650edd42a97509f04cb3dc2b57efd5b7eb76a25300f2dabef41799512f144497a8fdf86a34b59141644f29094838c9b0d68d3f906b SHA512 a3e1b173c11397bbdd9f09fa0e58a876e71791811c52939f99efb91d86c5a5d9adbd5d9b7b02d673fbbf18d380a77db1de3e0e21aac32847905271ef7c7f1780
+DIST github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.mod 341 BLAKE2B 1d74ad6644ee8955e4895d837bf0edb326aa66463852c870ca136c72493fdae768f0026842bef993ef39c1dcf6ef242fa201324983892eed82f088a3dcabd7f5 SHA512 12935a598ddcee53eb6d0eae07fbed13f991ec81f2890f460fc33bbebfeee5d174ced3cc8882812e8231fad41dd545f0106cbbe6c80f5be11df4e579014d1a35
+DIST github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.zip 116255 BLAKE2B c094591651eae92ea95c872eae6ff64923ed6d55a15f109b6c354032ebd35c28f0e81e67b5b6e55633c0ab80b0b9e16ed1a437417433f1f00728205bc68b812e SHA512 19efab2b239a7ef85182bd3480906c4a3a1bbcee7fe1728e9313855bcd1d00b8e9aca8cfde77686ece735a98f7ac933944ad26e66360031766eb7f5deb5fda67
+DIST github.com%2Fchromedp%2Fsysutil%2F@v%2Fv1.0.0.mod 44 BLAKE2B b413e5ccbf855b92d565cb8d7b5afa5157ed4dfdb3db0884949a0bcfafaec68572a3cc554692fd0579e325dcebc2790b6c932b010d7cbb879dc2ccfa6fff75fc SHA512 29a0908cc36fcf65aab1bda94c576e8693e01827d3e00813f1a0dd54e2aeaec1fbe24f0b91d78dc9a18b910377c5df43ffa3c67aaafb76a958ba8253aea62403
+DIST github.com%2Fchromedp%2Fsysutil%2F@v%2Fv1.0.0.zip 5222 BLAKE2B 59cf5bf09b7c10f539f493a8e0f04bb2384d71d96fbb1545d3f33dc7367666d496e542c6c7722303378c711c8c07b486c715c9667cc63334d88500e8e6e1a243 SHA512 1ceba14b19bba9bb005a17cb064421a9da0a43879d4c7fc8eabb6ee024c745b367f34c1348b37454b29d3b3af5d40d3ac926b70ee52a81eed554480daa685c32
 DIST github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod 34 BLAKE2B 21714162b9a8fd9c535eb49321b31d8c574339b2f548a64d4c224323f87e795b5412d502499e83917a1395dabcc9e2455f5e786ae2c3f204688d5c6ca402cdfc SHA512 58f3cc974ff4897b4f160dc47440241bc7084dd62f20c16c019b0c3090d3c8a8adb46ee8cab1afa675c9d3830cfb2eee97e1eb1315a683307d87ea3d2b403efa
 DIST github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip 319838 BLAKE2B 3ee867c0230906ed6f30b32c00e20eff9a087e2b5524b862fd8d7dffbf8145a9511c2cb91e475e50b5415a87be9fd1944fc85019273be4f0b83d4d2dd4504ce6 SHA512 73dae30bad1f236d871b0e4420426a339427150e7bd9ac60f588131a09d267286ac22a9fa907d7c7c7f79bd5935de02666bab0f0c18b9ae7f711deeeaf9115c6
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
@@ -44,6 +50,12 @@ DIST github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.mod 34 BLAKE2B 932f1630c22a0d6
 DIST github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.zip 28066 BLAKE2B 5437c9a233702a920e3b4b59d185c9235dbf80c38ed704e220607cb53dfbf4d65c46e4252b75c45f4e6f1b35029e195a065c699dc201789b0bb7fd18b1433a89 SHA512 a8052c898744ba0e4390a910e6f62049c256bda57b6b2303173064223e91910642d6d26d237aca75ccb425121e616f1fc928bffaaa8557cf39ff93d8b6e09922
 DIST github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.mod 34 BLAKE2B 2ecf7e61e93c4e024b15d30f88866f020e9d7c812b6442acb82907a37d5a276a2d8c107efe17c3bcb3fecf85c916ad4f416c367fbcd117086d7f78d90b97edb0 SHA512 b494afdc4c1df4425d49ef59a7a17c41bf9cbd5fbb498c1f538ce945a6c83157c26b7d9f251b84df50af1faceaa18dad1253d7d122461c4ba31bdbdb5470a3f1
 DIST github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.zip 14614 BLAKE2B 0da30751a36ed55e89ceda4078397c1bb31b95ef5a11d9514d550b0f5ef59d5fa0e8029a77e73510cdd8900c9fc76bb1433467b6e7cd20b76784a945a6337f5f SHA512 d2d38874fbb877675ca02aedf3926cc2452fbee57a84311feb3ddcaf7e3371afa1df54a5ececed66112aa73e3e0c02810e8f3601bd13e0fb217e4758635c81de
+DIST github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.1.0.mod 43 BLAKE2B b3504fd9349cc04e8fcbba279f6cfda6c6ddfc6ad6081d80b8a25c25e798b922dd71cc095a1abd5b68d01abdd67262fd05186799e47fe6a360dde84a297afff7 SHA512 14f5ce1353865e19ed1221cbc8651504d570f35478006bfa68a3b2f43ee3a849b2c7555453eb7685bf75bdfbac579ad000d7902b9f025c38bfb7a59daf8d18b9
+DIST github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.1.0.zip 22450 BLAKE2B c86631473237b9f1ea45604c118b869dde47fc998e74d2948bae973626a19a3e37705a1da08c865b95638d80b2664cc79576c67ad67d3911c368d34264a6e720 SHA512 9d2897d2645cfb0feca769cf3c1a3e000f3cef8684d976b6cd2502fb5efb02b1791df6334bf56c799ca2c477645b03677d46d8ed24fb4125a478a6139ec62346
+DIST github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.1.mod 30 BLAKE2B f12a3a75e2765f49e486ef54e17e6a122b055a32903cca353479c8c10add5f668ed5620df715cd41e6a4bd12b86dfb715e99d48af53a1dd68fa55f1308cf9bcd SHA512 d204c7c36bed4fddd03de8ea40d6e9b3e5713604d0a02481bbdc91e052a9ec85a9b67ab19c3912f43894dc754c84b3e3bf5553df7c0236a5722c585555276c21
+DIST github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.1.zip 13438 BLAKE2B 653d6ffa9fa25def73694a3617f55aa1b248df73caf013390457ba9d380510acc4e1d8836f5fab0fd4a39e53131bc6fdbf973dffbca9f37de21670f1795b4982 SHA512 be4166b6e2e47690bf36da80c3e2a15bd8f669ed40e02012d639a9c52f48709198d46b88ddb7a0266e1f0c89a718d77bd9d34533f3400363b8d30bf3597de71d
+DIST github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.4.mod 28 BLAKE2B 2daa5b0044012f78113be9e697e05a7b3319673508cf66016b12c6034c70c4cebc3767183137f58b40c04bda484832dcc9bf53e7886eb6bdf055b7ed7c3463ae SHA512 58d5f162a23fd51ffd8f2b732904e17090bc1e96f079d18d8e13c0f3a01dbc288dbd32541bfd4a6e6ee3f9002ae0fdde9194c7c10c84823599f18bd4ca4c130c
+DIST github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.4.zip 91123 BLAKE2B bd04415555cc8286bdff7a71fcc371a68252b5e53fad37f0f5225292bb61157ebfc5d9d28ac1c99ce659a5c3f0537e368e8dd8a50ac00b0b80a7869046c880a8 SHA512 3eb341e878a7523b47c4e63b15a3f87303999324dd9f50a2381949798daebdab1a42d4ec8447ee52f4b5a0625c8bf9076dc813dd7476f230cd7afa770052e5f5
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.mod 30 BLAKE2B e9f919d91a822060a84e112358ad361bc7be6f3e6e7cd668aaa89ea053c08d27bd20d281550e1f5a34f3db10ef19d7ec918bf094c755ba58bc01e17f7269fb40 SHA512 b096b5a6e72184dd2be5fb4f7ea9458e0b61cf6ef43f92a5fe5d225318315fdedd92bdc351b0802bb0959f77beb0aba830ef171ed61c6d84103690c22e8d8945
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.zip 77688 BLAKE2B a286ff79092fb33da031d04428d157e75f2acb4d6250bb2d75ef54b37906ef59561c0efaf8dc78ba1e33a323df5f24f00c05319c513bafee4104bf1e379e2cc6 SHA512 8f8b9392124d748e245c3bc95dc0f37a8614ad2df5f5145aea654bcc6c17603ca68378e2b1c3bc94cdeca0bda1e76476446eef39f7920f9c3a2bb142f75511ab
 DIST github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.mod 234 BLAKE2B d11aea5936ed431ff354bd0c7cddb4e2e724d2c12cfc25a6ff752b0749e3bb3453b41aade5e3aef860719e4468993d9d5c260f53e050a53ed68779c0cf699ba0 SHA512 03caef4928a3559e0f5f32ed10b60019d9782087dfed567062ba012493f596c98618fdcf96b8e3c1ca9c484a1b7840ef408ab260fcc8f8fe45094eb31abf4e59
@@ -110,6 +122,8 @@ DIST github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.zip 12273 BLAKE2B 79a048dd7d221f5
 DIST github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.1.mod 84 BLAKE2B d27fee698dacd49602f2d95314f210dda8c53af3ed4c958027c4778cf3de8da81b80df8481d644ffa33a39f7af4bfa4509c706c4c3a27451f91aae367e7833d0 SHA512 fd0f82d20d67f7cbd431a45c909a86c65705cc14bcd3ab7c9c65a14183c11096f08e6ca0d9764cc82869cc9470a82503c68b5e008a7c608a3f7220536cbf43da
 DIST github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.mod 84 BLAKE2B d27fee698dacd49602f2d95314f210dda8c53af3ed4c958027c4778cf3de8da81b80df8481d644ffa33a39f7af4bfa4509c706c4c3a27451f91aae367e7833d0 SHA512 fd0f82d20d67f7cbd431a45c909a86c65705cc14bcd3ab7c9c65a14183c11096f08e6ca0d9764cc82869cc9470a82503c68b5e008a7c608a3f7220536cbf43da
 DIST github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.zip 13592 BLAKE2B e8d1be51fa14271312420586314612dc91c186bd3006167b1a1cded44efde0b124d872432107103405e6564aa72ae3d6bef06237a656aff072c47cc0656d044a SHA512 8fa57cc2eef2f7f9fb7709f359b11e34eb5f3063989d3a07a8c9ff2764243c74f75bc906fe4d3e836b3e4ecc81c4de359ece1de328b91c4ad0ffda0846fcee1a
+DIST github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.mod 43 BLAKE2B 90d71b886a5077e501d659ca78215cd02aea7e24432a1e174045cb7da6235d45c6e32c81b517bf534e40e36361a1ad3998f415f3975b3f73778d7f8201915725 SHA512 ea2a15e05d84d7a0e86e1ecf62eb07c0baab34a8248f59114545cedc80af8146e529557047e5ffa4ce8e5e4bd2e9b2c282f8f2df929f8da5f72ba9aa8156bde9
+DIST github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.zip 2648 BLAKE2B 169a81d606f15df5f98f6ad2ff418bade31be9c6b78ea790a18bf404653f47f69d2ae067315c735e52da5212459975dc9297e6c03cd1d53e4b3a4b3b25b51c2c SHA512 5343e0a259d658899f8eb93035f9677e96f559726ecadb284271ee60e171666ce8c824182cb5d08b3626eb1d539c381c33f6944ade735210ade30158b028c1d9
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
@@ -126,6 +140,8 @@ DIST github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f9
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip 114575 BLAKE2B d88986713d8ab659873b157b8883b074a3e1ded22d588f347f9dff7f6acc351d61a788bfe73c0ae52181b460a8b046953c8cca804bfc616c025603361d43ff63 SHA512 5593f0a31642e1cb8abdafeba356abacc985129df2d18f6470dc90d7cd16806f67780f352bfcef2dfc5ffb95bb35d4a03ba4531c9f1f8bf4e9f9b4059d9bbe05
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip 114746 BLAKE2B 19f9157f1a163b5dfd9e5a2b09d92873c8ac191aade266d1706aff1624f3bb0d87fe7cfe0c00c4c02a7cb649a98d931d1f95ab547961778117b61909982d0231 SHA512 3da4292db7b32b1422a7c85497cd4f8e27b532dbd7570e41b17f9388f9377912cd9c8fc6c205bc504f652f7b3c6945ea21f125c14c5bde97dd4a629e327ef516
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod 87 BLAKE2B e7fdaaee7d16d457c5ff45af261e8dcd7568a105658dd9dbdb61bd62dea3d63456f9e0e7be2bedeefebcce910d9c0734416ea4bbc2a0bbb0e43344aadb8917cc SHA512 b27ca99790b63631bff904271ec74c9d641e05e16455679904b85dbd1800a67c4439cb5ee3da89c40ee51acf8151141881fa7e704d451ea6ee8e62aac84b0ec0
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip 84387 BLAKE2B bf57eb15f428e44e24525c817738460e2473a94d9c4184f74427492f3cc65fd14b3b8c90c08669868d853115a7a44b123cc31267fa4a4dfaf2133cda1099c341 SHA512 eeecc4714e4ca23cb41b01660043caaf9f76ff0beacb99d03372506d19ea97721aa627743040639998421099413498cb5c7b613b7edde39c8e00940f664ade2a
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod 80 BLAKE2B 60990a438d80f62d28312e2ca1f07f9ce277b9d9d52ca762201f9bdb4e9bc72bf7ae95b40f1a249126f70db8f296059bce4d7a098e82d2615186e1267e51eec9 SHA512 89a2e1340f04d1aa40eacc84c94ae2723fa34d2fc5772c60bad2d7e00512adfd5f503896aee75440173037f4d50ceaeb98f7266e80284f29ce00692d15bdd2f9
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
@@ -211,6 +227,8 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.zip 1473712 BLAKE2B fe3a040968f3057669b04e538374c5b57a3394c7fc65ef9883fe298dfdb42329a56351afb887a7921a4612d4d58399c2fb7f5d68e43466f0f9cb4d876b9802c5 SHA512 61f2308d243b69ef923f66d1d7498d8774621dfb1ce02ad6bb4e2752eb11fff5ad4b67c56ed57167c88ad8408aa4ad34ee32751d84671c9ce1046b340aa04901
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.zip 1533790 BLAKE2B ade51a0080dbf82fcf320d06e65ed77ed824f22309892b55340bf6af20e88b704d34f253138ba91b87194fb7117f6145a7c2b76513f3c9a6d259e92e9e4ec6ce SHA512 b7a191ead0d85752296cb87f90664bfe552dc02d554c3aeedb28108d77e722fb44a3d8b305460c2f819e7cccdef9d94d270e629fed579ba6fc570c08d7c1f3ab
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
@@ -248,23 +266,19 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 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.28.tar.gz 17424006 BLAKE2B f45af54d1e54ff6945f13cc684fbe0506dab4d554f65018fc30758d7b8be6814ca3661655778abb7c24dcbb241b8e6c21f0ea72a01a886392cadc917e699a957 SHA512 1f40c7316f92474beecc9470d4ad6c093a3a005180514307eb3d7aa206fa36d1a8decc20628b1fc0e62bc7a2ff0e508d694da0fe05911314de6f6d7aa726f425
-DIST zabbix-4.0.29.tar.gz 17411987 BLAKE2B 187b6de17403c656c2faa93c8e0952be06ca4fc60e8fe62c48dd9f96371bd26b53f333b93de5805d7333b849f93ff7db6cf1f0cf256cea438afeea5d314e0e83 SHA512 778fe43c2394c572b0f1a6d426897bf24391ebda25cce5bfa0dad63827f5d3457776ecd8186c0b783d400a0d87778d9243fdfedd875136383282e56f542eafca
 DIST zabbix-4.0.30.tar.gz 17599032 BLAKE2B 1084ad3e680fff7798c803492d9e719c6c6fd2503db30d4a60a000c9dfac057bb1d5bb947dfac580947ce3d8f051aeb6a8183642808120d2795722c39b8e1a85 SHA512 b26c532e3b1b3402af0433ab29a36efaa1a34e8541797bcb37118ff352d4c29548765ebd10fa8da6b3371b1e3cbdcfb4b1cdb5c6a143b3ce9301db47d425fa36
 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-5.0.8.tar.gz 19474050 BLAKE2B 1043efca2f373553728206837949bce5f5ea32328c6289e4028f65e6f1ed76560c1ffbd610eec9855f050d0330bcd3b364a983db896285729f30a693d5ae6c6f SHA512 19601ace704c8a887ffc9b57da8825d8a28a5d064aac3e59480994bee4156db186d37ecf4bee2208bbafc0cb76c0c7f47de964f99953ce78d0187457255d92e9
-DIST zabbix-5.0.9.tar.gz 19513312 BLAKE2B e60fcf300c3fcd9595e9fa8465403e906672fdc908d9a15646e2ac9e88684999184acb3a0b8226dff1966554769930b0ae6d692ee4569441714912c2eb93540f SHA512 7306afce482b8b8222d46c25d91cdd8df2d5bbbeb755bd54b4bf747dc78031cc24167a954e4de5933f33f59772838ff0b4c66d0bf19c28dc1a27276da9bb0b38
 DIST zabbix-5.2.4.tar.gz 19916307 BLAKE2B 17d0f5dc1d4a8b79d2a5e741a0fa18ecf584ddfb45afbe816721d0e69bae4b5e11b44fe5031c8a34562c30fd2818f7b4a8bfb1442489be3ec23a27a70e789f56 SHA512 e218de9a8b9445401e769c14a9efd0b3d1b7e9610ce021cdbfc9db159801a4033b8f1c1a808c853bfa3aeb66db8a6dd0cbb5b44fc1421fa0f54c28589d7314b4
-DIST zabbix-5.2.5.tar.gz 20039761 BLAKE2B 27510c462947a7dedb16d029799aa1c7b38d68199aae47b4b3e5a757120bd74ddf87c7dade0bf339ff2165111345d79119718ade2fe39fd088971be6dcef2bda SHA512 5014a5a510e9ea4a39aa30bdbe3ee82dc1d0a139f32151bb7739df7442ea707b91446ce1cefb61007b603ccedfb0353c628b043db3e90cfe8fc3d67588f2dfd5
 DIST zabbix-5.2.6.tar.gz 20602665 BLAKE2B 656645ece453564f2f2c58b50e9bfb3df86aeb74fdfef88cc4b597268ebaf9a9db41e1acdcd1253871dbd9a0032f973bbb1b25139ee1a083bef779a1b66ac2fc SHA512 be48fd46bf151ad2618f5136559c7027e64e178001921adefc66a0597b24b6929e52d4b0f575e8bddec1e9db01276dd5993d4500f4df4a1716a1a008e09b41f1
+DIST zabbix-5.4.0.tar.gz 23105171 BLAKE2B 19420887afdeba3d1b68c27fef94264230924aa1800de39ecb05ed9a379ba0c408cc1360f0b0e9d4f5c42b18395518791fba2a6cf843eb7bfd12e5c4dcfe7de8 SHA512 12cc78935ed5046b0f7d97e0248b50e0a0bce110ba85c6c3dade7eb348a4018995ef1d51bcb917061accff334195501793b2c00ce864d0c18245cf5a497df525
 EBUILD zabbix-4.0.28.ebuild 9254 BLAKE2B c74d64e5da10a78b4a15fef31cc42a15ba2cd5c5c28d09abb4e9370bb4f0fc7817e13d32362609b406fc4b5036578ffff4488c3ce618216674678990f8a78f61 SHA512 9ceb803671abd14019e1db9aa7b15f52f56b97204f50b1cc703786f624b12b289e038f1abe7c1cb53072f5cfdd29e54df0201ff20bb95adf06430c33c73fb4e2
-EBUILD zabbix-4.0.29.ebuild 9256 BLAKE2B 752cb3883f7f9acecc4cf63d3f39bc7b669d26234e072053825782d7cd5e7eb8c12b5deecfafa829874eb654e5f0d79ba7ab8e88b0ef3c3890e82ebead189f81 SHA512 9ae895069cebf9fdbab49533736f83e52f5984ab9620114072a72023da7af719e0fa2a0f13c6c03f9809890d91f2dea4e5707100fd02c7ba66f61491c399474c
 EBUILD zabbix-4.0.30.ebuild 9255 BLAKE2B 93b837855adf373866feb50737dcacf53e9741001aa1ee4a6bbcf9f7b76c4e90011a8c820988a7caf64e5a828e15bfbf6400bb075a4c37c4ad72b6c8b0987448 SHA512 02b9d1ead7ef9c08da6340d4a45d235710fc489e3d393c62fbbece3b70c0792899c926ba1d307dffa02621f2655daef75dad41b385fe42927bde6495c4fd32c5
 EBUILD zabbix-5.0.10.ebuild 32541 BLAKE2B d63196438eff036e12d3dc2b84dec5efdff1331d04f214f06e62419466b6deab7f6d70a7a61ad2e0dc3e34651a4878e6db967f36666750e3f9d2d2dbeb744bc6 SHA512 3d7052f96b63a645f51d2614a11adf294569c3942f74f7e018ccd0fa8e52cca6dec50a8609299d76d606421db6acba30a31fd4fd46420670c29e20ec2f191a99
+EBUILD zabbix-5.0.11.ebuild 32541 BLAKE2B d63196438eff036e12d3dc2b84dec5efdff1331d04f214f06e62419466b6deab7f6d70a7a61ad2e0dc3e34651a4878e6db967f36666750e3f9d2d2dbeb744bc6 SHA512 3d7052f96b63a645f51d2614a11adf294569c3942f74f7e018ccd0fa8e52cca6dec50a8609299d76d606421db6acba30a31fd4fd46420670c29e20ec2f191a99
 EBUILD zabbix-5.0.8.ebuild 9123 BLAKE2B fc3c6ad9c543ddb0eb2d15df7ba7bd732fd6001b70d9e520e989b7d42669d67f438e2c4adf242e8cc914ec2777fead7e83a6b7de1f7fd978b1e96766945a5e04 SHA512 eaea26c03a539316d08528713d5499c5ee97973a19b9fcbeecc54d8bd34d62def246010d6d99b0e05613b196ea84861c090c6b88c4c9b4b9e5147936642caa9c
-EBUILD zabbix-5.0.9-r1.ebuild 32331 BLAKE2B 0a07cf6659e88bf96f066c4cdaf5b2ff0974cf8a8043b88c6d6faafa1800b507cfa21eb10eda2dd55b0ed34a313fd13fab6dabdfaa60875be85fc6772f2b447b SHA512 905907bccd8dc121f97e6f23425f6b897fbd1118195ee744307a24bab4514cd40556aaa30b5c16661c2c8a6e31993e93aa4838f77a6a08e808a9a71451e48371
-EBUILD zabbix-5.0.9.ebuild 9125 BLAKE2B 4e9d381b8cb54ec8dedfafebd29e6ba53a06621f838c475ac20d1b58105b49cf508e5bfbf35ee3bb2c008b9ddd251c28bc1f6724fbe194c127664d51c4f448bf SHA512 711ca7d05ded35481c697846d4086c836ee41703b0fedd648ee5183cb80d5acd0aaab700a50471f4dd16322351b9bdaf6e234a017325e85dea80935a1414a773
 EBUILD zabbix-5.2.4.ebuild 9123 BLAKE2B fc3c6ad9c543ddb0eb2d15df7ba7bd732fd6001b70d9e520e989b7d42669d67f438e2c4adf242e8cc914ec2777fead7e83a6b7de1f7fd978b1e96766945a5e04 SHA512 eaea26c03a539316d08528713d5499c5ee97973a19b9fcbeecc54d8bd34d62def246010d6d99b0e05613b196ea84861c090c6b88c4c9b4b9e5147936642caa9c
-EBUILD zabbix-5.2.5-r1.ebuild 32917 BLAKE2B 08ddb3e3e2963b2ebd6193866fbb7e85abb6a958c3631c00295c3cd0641e5dcccc9a6532851a7ef10666173a509b423a7ae7147635cf9564c62b07d1cf1bdfaa SHA512 3252082c8917155a02bc76f409c228f276bd04ca877b7c9fe9cbc94554fcac201a8b6ed451face4c61068cbcb216ed721a020679d63044de60546b3026d39a18
-EBUILD zabbix-5.2.5.ebuild 9125 BLAKE2B 4e9d381b8cb54ec8dedfafebd29e6ba53a06621f838c475ac20d1b58105b49cf508e5bfbf35ee3bb2c008b9ddd251c28bc1f6724fbe194c127664d51c4f448bf SHA512 711ca7d05ded35481c697846d4086c836ee41703b0fedd648ee5183cb80d5acd0aaab700a50471f4dd16322351b9bdaf6e234a017325e85dea80935a1414a773
 EBUILD zabbix-5.2.6.ebuild 33154 BLAKE2B d98021e9b88ab3a4dd66ff88b6d42dc3a72673619a3d98a38582c7c9c3fa855be7b3766debe28f4472ca967b4a7cd7af4d359aaa4211be6feda9619a53ca984d SHA512 dd866d7a9d833123eb9469339577edd8ab42cce492e520e1fc54629b676ff00fc6057c38c6f0d0e7bbe7a019990dd93c660d3d93a18f7fd28b72a1e7c7038aed
+EBUILD zabbix-5.4.0.ebuild 34616 BLAKE2B 992d3bfaca0216d00336e8f610d73488ee0d17bd374511fe8496bc19452c04e247ada6b786599ac0af040acafdbe15dd9b9d6a1e48507927bf99b8150cbbbb1d SHA512 f12329de57f0cbe69ce1fb48edd51facacb5b35ac9f86746c239dbadc39ffffeb557e0385d60084b3463fee54c9c9d89c338faee5d1c19da3c7b2a66238cb856
 MISC metadata.xml 1497 BLAKE2B a8288bd5ec772d1f54db12727cc9b6659ca7563ce054f8cb63d8f8d2373ef4081e391656eb1178ff06bdc64a5ca420d2c56376e5b1207e9baed17a9766406f43 SHA512 042f4daf2f70de1cbbf7ece57a3d5704878b33257002c8a1d9987e8a9249e8af475e24577069ad315d406ae5c29994881c76638c5bccb2e57d3f8ce3b0b1c381
diff --git a/net-analyzer/zabbix/zabbix-4.0.29.ebuild b/net-analyzer/zabbix/zabbix-4.0.29.ebuild
deleted file mode 100644
index 21abe5ecdd87..000000000000
--- a/net-analyzer/zabbix/zabbix-4.0.29.ebuild
+++ /dev/null
@@ -1,353 +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/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}
-	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) \
-		$(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
-		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 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
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-5.0.9-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.11.ebuild
index f0c063425254..78fb7f873441 100644
--- a/net-analyzer/zabbix/zabbix-5.0.9-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.11.ebuild
@@ -226,6 +226,8 @@ EGO_SUM=(
 	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
 	"gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI="
 	"gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s="
+	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw="
+	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA="
 	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU="
 	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c="
 	"gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
@@ -513,12 +515,12 @@ src_install() {
 		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-classic-1.2.3.jar \
 			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback-core-1.2.3.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
+			src/zabbix_java/lib/slf4j-api-1.7.30.jar
 		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
 		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
 	fi
diff --git a/net-analyzer/zabbix/zabbix-5.0.9.ebuild b/net-analyzer/zabbix/zabbix-5.0.9.ebuild
deleted file mode 100644
index 4905f5ae3c0d..000000000000
--- a/net-analyzer/zabbix/zabbix-5.0.9.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.5.ebuild b/net-analyzer/zabbix/zabbix-5.2.5.ebuild
deleted file mode 100644
index 4905f5ae3c0d..000000000000
--- a/net-analyzer/zabbix/zabbix-5.2.5.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.5-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.0.ebuild
index 4decfbca33dd..256ae704de08 100644
--- a/net-analyzer/zabbix/zabbix-5.2.5-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.0.ebuild
@@ -6,10 +6,17 @@ 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
+# 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="
 	"github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
+	"github.com/chromedp/cdproto v0.0.0-20210104223854-2cc87dae3ee3 h1:XeGYLuu3Yu3/2/FLDXyObe6lBYtUFDTJgjjNPcfcU40="
+	"github.com/chromedp/cdproto v0.0.0-20210104223854-2cc87dae3ee3/go.mod h1:55pim6Ht4LJKdVLlyFJV/g++HsEA1hQxPbB5JyNdZC0="
+	"github.com/chromedp/chromedp v0.6.0 h1:jjzHzXW5pNdKt1D9cEDAKZM/yZ2EwL/hLyGbCUFldBI="
+	"github.com/chromedp/chromedp v0.6.0/go.mod h1:Yay7TUDCNOQBK8EJDUon6AUaQI12VEBOuULcGtY4uDY="
+	"github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic="
+	"github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww="
 	"github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I="
 	"github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ="
 	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
@@ -37,6 +44,12 @@ EGO_SUM=(
 	"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/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU="
+	"github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM="
+	"github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og="
+	"github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw="
+	"github.com/gobwas/ws v1.0.4 h1:5eXU1CZhpQdq5kXbKb+sECH5Ia5KiO6CYzIzdlVx6Bs="
+	"github.com/gobwas/ws v1.0.4/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM="
 	"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="
@@ -103,6 +116,8 @@ EGO_SUM=(
 	"github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
 	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a h1:ec2LCBkfN1pOq0PhLRH/QitjSXr9s2dnh0gOFyohxHM="
 	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY="
+	"github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y="
 	"github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck="
 	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
 	"github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s="
@@ -119,6 +134,8 @@ EGO_SUM=(
 	"github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
 	"github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU="
 	"github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA="
+	"github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc="
 	"github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ="
 	"github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE="
 	"github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc="
@@ -202,8 +219,8 @@ EGO_SUM=(
 	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
 	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
 	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20200428200454-593003d681fa h1:yMbJOvnfYkO1dSAviTu/ZguZWLBTXx4xE3LYrxUCCiA="
-	"golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad h1:MCsdmFSdEd4UEa5TKS5JztCRHK/WtvNei1edOj5RSRo="
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
 	"golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
 	"golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs="
 	"golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
@@ -232,6 +249,8 @@ EGO_SUM=(
 	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
 	"gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI="
 	"gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s="
+	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw="
+	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA="
 	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU="
 	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c="
 	"gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
@@ -518,12 +537,12 @@ src_install() {
 		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-classic-1.2.3.jar \
 			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback-core-1.2.3.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
+			src/zabbix_java/lib/slf4j-api-1.7.30.jar
 		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
 		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
 	fi
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
commit	908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree	c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /net-analyzer
parent	185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)