gentoo resync : 02.02.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
commit: fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree: 3bfce096b38a9cea8eed13fc70c1526c456e9abd /net-analyzer
parent: 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
54 files changed, 1105 insertions, 191 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index e75e825e7f4c..0f0efb682253 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/carl/Manifest b/net-analyzer/carl/Manifest
index 3943cc7c5119..b962ba2e607c 100644
--- a/net-analyzer/carl/Manifest
+++ b/net-analyzer/carl/Manifest
@@ -1,3 +1,3 @@
 DIST carl-0.9.tar.gz 11096 BLAKE2B 46298873f8fff62a965a7ec7a657522dd90d1a298814f537bb5b32582ea63d0bcb1d4988cd31e6918f16514c65dd3c6517e9079c3c78f6cb0a4bc6d8ece1614a SHA512 9876e30d171bf00c4e53c6e90c98181ac25aeda004bdb8a03060c45a99c55fa087062076ff3964a222d2981ed682ae7b8f4cbade13c69154198200d35e1a577e
-EBUILD carl-0.9-r5.ebuild 520 BLAKE2B 18618c3a23d15269a337f46112236ccc1f335d9a9a5659384e71f03c3bd0bf13763259381a00b7946bea287ca2ae59794aa2c4924ee9e6093bbb7995373ba186 SHA512 9a2579cab40200adefc5880f7c9e82f4f2eac6e8695566635d898b37a454a365ca94d3cc1da56b98af14d67b79d7e163a66043fe9a51fdf6201356b8de324b64
+EBUILD carl-0.9-r5.ebuild 506 BLAKE2B 944d5dec096f0bd2bd5e1d34286a675dd021ee566bfb947e56a38b78d01a19494bbaf14974697a322eecbd6727ccbc5d6db4b7046f3652283ad1e3d6e9b427fc SHA512 1950f4688fc00e44bcd405b24882054b84f51384847689d5543b42020d09f1adb51831647bcad9a4819092f664b02a9479a43b1743ca7a4eba73f5c3c9102a23
 MISC metadata.xml 357 BLAKE2B 4cf4f1e8b0ae3d4c1109f3b590cfe9cdcb295c3011bb488668dbceb4345ef6e1b879a02a7b18c3029d57436198ae5767d33b34e33167b99d52db0dc120293a5a SHA512 979c2c5ca33d8396910598bba35312f57c03ddb9d85cbcb278001c6bb36bee428a2a71b8bd7b47c0cd72ec227eed2cb447c4f82208ed9219b726dd62280bf6e4
diff --git a/net-analyzer/carl/carl-0.9-r5.ebuild b/net-analyzer/carl/carl-0.9-r5.ebuild
index c0eab0820f04..a8d33e657707 100644
--- a/net-analyzer/carl/carl-0.9-r5.ebuild
+++ b/net-analyzer/carl/carl-0.9-r5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 pypy3)
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
index a4318834ba4e..005687fac447 100644
--- a/net-analyzer/dsniff/Manifest
+++ b/net-analyzer/dsniff/Manifest
@@ -4,4 +4,4 @@ AUX dsniff-2.4_beta1_p30-respect-AR.patch 508 BLAKE2B 585b4e0b959b037f695e191577
 DIST dsniff_2.4b1+debian-30.debian.tar.xz 30788 BLAKE2B 8605b1dcca36f626f31410d88d25a57e6661b57b941155cdbde951991b09fb2dd7c147b1fdd1a22eded1cf904c890317b1844a7829cd6e43fd2fc5defc79b5f3 SHA512 45ffe34fcd30cd1461a354891b9d5567038cc176dbfa79c67020075cd40ae09b7092954925019e583d0d69cae76a558049b489745454a8034ce3e9e832c58f64
 DIST dsniff_2.4b1+debian.orig.tar.gz 130220 BLAKE2B e6953a5bfc5331b030e1a5335987c51fa4cf2c644fc4e7ac9aefe17f52373a1f66ccef36c5d9136542f68a475350138b1f3e501bc9494a0fd4988c7c5a7b2eef SHA512 09c3a864f112f81b8fdf93436886b14eb8f603ec751b13f18cf027307f24098c018eacf98b3ae353731a0cf6f1c9cacfafbb534a0db8b9f0cc793e7515c41b5a
 EBUILD dsniff-2.4_beta1_p30.ebuild 1716 BLAKE2B 604355e16c5721effd2188c483816bf9c3b28c8ffdd3f132c4e6d311852bf158df21436c53fd4c75080d4d82d404124a1a6ca5520cf9c98d52d388ef06263e74 SHA512 41177a0f130770934bfd7c8eb7fdc7d802561f097c6b7e075f78aa37bdd106b61e21988f6228807e50f3530963cb6acf982001ac67f448e9083e24931537ba5c
-MISC metadata.xml 852 BLAKE2B c391a5fcfe580499b3293b9d74ff563a0e919908b91e493bdee2b718811f16b907156d3f2589f12d1d4303034585bf3979d6943d5fb7a261e72537846421ce5a SHA512 a6f4539e1a85d88915a81b3141e52759140b19f38fc2e89349d8c679e5d2d9261325f71299b2c419572359077a053f09f02172266abb0da72623e98f1e0122de
+MISC metadata.xml 853 BLAKE2B d91a9dd0cebe081176b43f3c480532ce6e55fd995c1c24a55cc8dfd4738bd04b82f88fa4422d12c55320c8360003fe5fa0ee1cfcbbec36a102ce68776d9586e1 SHA512 8138c27c6025549ae01ce3c766c1afb52e40f2cd386e27678b43da956b6cf9c42710d293067375d7b79171a0d1d8c5f80264f3d27aacd112a93c84eedd17266e
diff --git a/net-analyzer/dsniff/metadata.xml b/net-analyzer/dsniff/metadata.xml
index 32fb662b8379..505675120273 100644
--- a/net-analyzer/dsniff/metadata.xml
+++ b/net-analyzer/dsniff/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index ae3f333ae567..c30d89b7ed59 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -6,8 +6,8 @@ AUX fail2ban-0.11.2-fix-tests-for-2021.patch 1821 BLAKE2B 52fae8ace32d6205d290d7
 AUX fail2ban-0.11.2-upstream-openrc.patch 8205 BLAKE2B ee85888dbd5ed9b7aa5b8edaba7a0eff430df4677b33c37223d04b46d8b39ff29ded81be8fdd77d0e92e14654e2fb9726064772232af393a053bd3234843218b SHA512 bc4d3ba2c8c1008efe128abe07f6c5125479bf4fb5b96c38b9e5e6401da30faf1a58242b1e01e71638ff922c7e020e16b789f013a0227a8aa6f5bba232dacfd4
 DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97
 EBUILD fail2ban-0.11.2-r1.ebuild 3765 BLAKE2B 01ce7f4b17f4a0aae2961ddbb245039fa321be59ae33f2c92484727ea4fd66ef9e7256b1e47ab715b22fe1754837abcfd18d4ae99c617ff5b809133e12bd3ca2 SHA512 7b38b4e8a5c9b0e604ee713e064ec246e7d1ce1b0d07c0e04111a267672c3270b9c8f378dcac9a2f8f0f43a51d9b363d4d76da6e354cf76f9974ecad89375206
-EBUILD fail2ban-0.11.2-r2.ebuild 3824 BLAKE2B d36184227c44053704df6abcf4055992d24a54e0bfdf30c1412d9bf0e73773590933a77e730e1a3ec33a1034819c99e6f51db8a6451c10e8fffaff1aaac7d0a5 SHA512 0dc0efe83b81a2fcdc01e94ee299f08785f0d0da8b69c5ef8e69535dd0250996a4be1104d6ea22b49fb79e1b5ec16aca4e30c635b57388e5ad3569681783b7e6
-EBUILD fail2ban-0.11.2-r3.ebuild 3812 BLAKE2B cf8ef1ffe073bd274e0a95728b2c5999eb7a8bfbfcf5db961188e8ffc985c5581d57d8b8ad48e1022deccc9c758d94bec8d88314623b9cb2861c404bba6a027c SHA512 c8593db77a44135af70ea63f5ab0c9e98202689c6003946d6cd44f4eb279b6fd81d5113aa5cda0ea85ac855be25637fce6165c6810a4ac836b6106368ed40d21
+EBUILD fail2ban-0.11.2-r2.ebuild 3821 BLAKE2B cf90d89a8f2a23750ce0b9b33cae1986c0d6068ca164be5a0f4abafffe2b9f8f6aa4ecb2d6f623c75697fb76c08025dd96696c66bfd89584a3952cd31fc4c4ec SHA512 4da2928f8ff954574978d423ca0d91420861a99b2b5defbc3561b7148e47270b680ea8dfa9a6ddc2b1d51be214844a529455c52dc5983f5bd65783d26eed53bd
+EBUILD fail2ban-0.11.2-r4.ebuild 3872 BLAKE2B 54233156803dd5e31620b7796c91e45f3ff6c47aec2eb42a9d4c1ccfb391f855ff1958736abd86842560bffdc8a8afe9bcc5a9b72b433c54dc08810b7d11f9c0 SHA512 abf696a64761fec433fb0031206197056d41337b7d3d22efe1d4f59974324f9bf9341956cb9d426e0398ea92a5159d3c8aadc833fa541e3a6351716ecda3e6ae
 EBUILD fail2ban-0.11.2.ebuild 3624 BLAKE2B d0329d4f393ff4fad9d8a89ea297d1105f50b1756448b5c22df469a01d6f2d07c87b2d0bb7d2c399235a3a06831ef4b11f1bfeaa98c47bc855837037641eee1f SHA512 87b1a06d7ea32e04fd5422bbf4f7845e318fc9938101e1e6b3a39988aa752c2a15d75cffb1c0de47ad0c3ab1202b5a32c26e2f85314b68737aebd395487e7642
-EBUILD fail2ban-9999.ebuild 3642 BLAKE2B 09655e688c3157bb524b66edf8ff159ba8327fb765dbe6df9ad5c7f0a4be7bda1090e70640bc1f993df46296043c3d0faf1d2cc2d04e808beae836752338f53a SHA512 3cc3a9f0837c1e1f9c7fa987b7c87c57a58664555b4a023d7c13074453fe5657d5d00f605822f8416b2c0194dc09fc67436f863159d797d92ab6153ed9efc97b
+EBUILD fail2ban-9999.ebuild 3592 BLAKE2B e012b5ac063218af64f4299b2666f2dabc1dd2a497ec049479d058b0590cf3e9531d03d6fde0373bba7f77be83df360e01469d7470637a65860e4ce4609f8ac6 SHA512 056cd95cf7673b5fbae675ebe6c9598cdd4be046003b48e843621127260275f76e98fd5367d626e580df91479e691b522ed288675144f4fe2aa3f7f062d02185
 MISC metadata.xml 357 BLAKE2B a5dee8c760b80bbfad6bca9a7adae797eda34b9db80716db8842c6813b4ed25ed4707290756dc869a7db4163de1ff6114c1995fcc2c485df1bcc6cad9c9a8f14 SHA512 9877a507bd3617c33351036317c5dc7855a1024d8f04f76a57edb93bd80e62b2b7c4f35784f447e94497305eab33246ae5913ba36ea001aa9068d1f91aeee9f0
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2-r2.ebuild
index e1483b6442e6..a8fa65da7679 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.2-r2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	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"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2-r3.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2-r4.ebuild
index 1390bc1bdc39..a86650e9d020 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.2-r3.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2-r4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	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"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 LICENSE="GPL-2"
@@ -64,6 +64,9 @@ python_test() {
 		--no-network \
 		--no-gamin \
 		--verbosity=4 || die "Tests failed with ${EPYTHON}"
+
+	# Workaround for bug #790251
+	rm -r fail2ban.egg-info || die
 }
 
 python_install_all() {
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index 59203cfb4af6..e4e61c3a52a1 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -39,7 +39,6 @@ DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch
-	"${FILESDIR}"/${PN}-0.11.2-upstream-openrc.patch
 )
 
 python_prepare_all() {
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index f79bf7df1654..6e022b873ac7 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,4 +1,3 @@
-AUX graphite-web-1.1.5-fhs-paths.patch 2712 BLAKE2B f3a05cd9a732ee69d52a62ac5164b3e8bdc5e1d29d3474167c2873f4322a882509f60908731a081f971c01681094f2b6a772a4fcf159ade85ac651f7b0d90c1c SHA512 b383da7aebf0c38b557ac07b0ba4ecd22c41bb9f3318a9f491b37f495a8d2ad5cd8d677076c15958d6326aa1a46574c01a8f5a9cd64fb77ac30fc4d630e8f532
 AUX graphite-web-1.1.7-fhs-paths.patch 2691 BLAKE2B fbb09dfef58d94ef7099e98134d46122c2a82ab3cb0af4bd0cb92102f0e924c3efe80f481f898c81358722f7ad312a1168310ebbbc731c18ab788e1a81cf04ce SHA512 1a8bd3f62163004993f676a039035880512bb1add5f0cc80193471f2cfa483277bd24dd36b3b2b5c6e8faa6d83a029e59c5ea8cb8b713c6d063fe212b921c6a8
 AUX graphite-web-1.1.8-pyparsing3.patch 2529 BLAKE2B 644b729b439a7fca9b8e2df1bede1cda48323694686a6c05378cb7a6112353add56ede35136e1c4f73611c5606be8345ee926f6e99b8dfac15c5ab72e133ac48 SHA512 8f837db47d66d859c247b96077ad4e44168123409fb43a074ab6f625c9235c010557da56dfa788851c8a0d18b4ad314dae085cf63bcaf8ec97e8e6f33f9f7b4c
 DIST graphite-web-1.1.8.tar.gz 1177214 BLAKE2B 20e058feff0fa7f12393cfd41acca7cf05ff6a3995aa5f6547764fae3b8824e8b424efb8d5d47227eb2b5591ae6b45ab960da30f810acb4f1fbd0b9ae78ec47b SHA512 4637a541e61f56c1ac69bf18e7eab88ecf93f59099dc3e8022d8bf8fb1b204672bc0a1b5302e5031701714db17aabb316ba40f4cfabb2bf4fb0dedb8f412e4a9
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch
deleted file mode 100644
index 4cbbe7213b35..000000000000
--- a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Install FHS-style paths
-
---- a/conf/graphite.wsgi.example
-+++ b/conf/graphite.wsgi.example
-@@ -1,4 +1,4 @@
- import sys
--sys.path.append('/opt/graphite/webapp')
-+sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp')
- 
- from graphite.wsgi import application
---- a/setup.py
-+++ b/setup.py
-@@ -107,8 +107,8 @@
-       ],
-       package_data={'graphite' :
-         ['templates/*', 'local_settings.py.example']},
--      scripts=glob('bin/*'),
--      data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
-+      scripts=['bin/graphite-web-build-index'],
-+      data_files=list(webapp_content.items()),
-       install_requires=['Django>=1.8,<2.1', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
-       classifiers=[
-           'Intended Audience :: Developers',
---- a/webapp/graphite/local_settings.py.example
-+++ b/webapp/graphite/local_settings.py.example
-@@ -101,6 +101,7 @@
- # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite
- # to somewhere else
- #GRAPHITE_ROOT = '/opt/graphite'
-+GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
- 
- # Most installs done outside of a separate tree such as /opt/graphite will
- # need to change these settings. Note that the default settings for each
-@@ -110,6 +111,11 @@
- #STATIC_ROOT = '/opt/graphite/static'
- #LOG_DIR = '/opt/graphite/storage/log/webapp'
- #INDEX_FILE = '/opt/graphite/storage/index'     # Search index file
-+CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
-+STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
-+STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content'
-+LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web'
-+INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index'  # Search index file
- 
- # To further or fully customize the paths, modify the following. Note that the
- # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
-@@ -127,6 +133,8 @@
- #CERES_DIR = '/opt/graphite/storage/ceres'
- #WHISPER_DIR = '/opt/graphite/storage/whisper'
- #RRD_DIR = '/opt/graphite/storage/rrd'
-+WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper'
-+RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd'
- #
- # Data directories using the "Standard" metrics finder (i.e. not Ceres)
- #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
-@@ -244,7 +244,7 @@
- #
- #DATABASES = {
- #    'default': {
--#        'NAME': '/opt/graphite/storage/graphite.db',
-+#        'NAME': '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/graphite.db',
- #        'ENGINE': 'django.db.backends.sqlite3',
- #        'USER': '',
- #        'PASSWORD': '',
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index c95d7b0413b5..9a6b4bdb94ba 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -3,6 +3,6 @@ AUX linkchecker-9.3-bash-completion.patch 621 BLAKE2B bce120caf1cddcd11e49c06b5c
 DIST linkchecker-10.0.1.tar.gz 512649 BLAKE2B f0373da6c1b4c18394500f32936065dca8b4a92532f5da6f15a4470c2e458df147009599939a41fc36f5ae4941c0fdd97aa9bf77a7237544f3df3bf5772ed884 SHA512 2d57092591187f62f7ae685b867ab02d08108ce3a687ea7da444e57cbe5e9f74220747beee322ccfec0ce4319c95cc37ba0908ba8fae6a8d88bdb0928d099099
 DIST linkchecker-10.1.0.tar.gz 521214 BLAKE2B 767c1176751a2011e0e175eb7c9e7b3704bda0d469bad7b38ac1481db62b470fbb69a62bf11316699e15fd1ca822f801a1237c798754353aba5c559ccd9d3274 SHA512 a6ba57ef9c617ece2c53d54cf460571561bfa60831e038e31e520e7fbee789566616b6e5b0b98529376510ef4e228bebdb6e6e011fb986b74d837ebc69323085
 EBUILD linkchecker-10.0.1.ebuild 1345 BLAKE2B 1ca9ab55b77fddac197d73fd2d87ddae39ee0761c00e2bad6a44b1778b152a4c313f953e22c98c67428d79b2b3dd81f6a3afc7c0277d6bd9cfec8ccd44b31568 SHA512 6d55b89966170c6aff0ebe9747d4a7e1010723a07f21adcbe2eb09965752c2381a48978be295fcb7edcdc09ea0d53c02b8b0b91255068e28c92d5e9b62007fa7
-EBUILD linkchecker-10.1.0.ebuild 1518 BLAKE2B c11b135340af996d7984d3bc4739345f544268a483d55bd0fbb3f853adca753b60ea49f71c3633acfd5ffe388da82c760bb7f025347ad32d38d66fdbbd994fb1 SHA512 29bc79c992d4fbb63135e6c67d18743bc4e76baaeac0086f8e2233f8308b66be8accb996521b7baed7a00ebe8978f9dce3e7175f3a9aa3e85e7769c382456a5a
+EBUILD linkchecker-10.1.0.ebuild 1516 BLAKE2B 33a234bafddd37f87757263f7400b400a9ad55fbcaec626b1e18a5e09ebb6b193cc87a9f1dbde20f85f044389b5fbe7a4a36bc46491ad86f1a590481bbe49545 SHA512 6892c75cf4d4b75f07b64a361f1b3940ff86cf6c19587378ce7529aa81a1c351db225314f88896d670b1020d8ad427c206c6770b546968c3b504c2fb815822a5
 EBUILD linkchecker-9999.ebuild 1373 BLAKE2B 561a9093ba81a165c1e301cce9dba2bfd20a13b45076d2abbb5e65272f74c144c8c67dff35f118ed8b76390ae35123f69fcca435e0344f722667248ce3cedecb SHA512 99404928f407ca31554048fd3a417d034c9d731ab7ab04f979617a966c2f52a05ebf68d6d6097b4518b14252c5aabf0936b47155f11240c37728eac56fcce2aa
 MISC metadata.xml 575 BLAKE2B 6996e2d330f7c0e9976cf1cc2964ce3d426f5527c491dfb0630630bddee0c932f28b0ff9fe1c9d4778ad7d73bbb69816d8740f7b3b1b5fb5545dacd073c51aaf SHA512 567a432bd5410dddf0589eaadc6ea81f516c131ce84c3ba2e1a42757d32362821f3ea1bb832d4f41381d4ee62152c019b8daa46685353cba8a6da89bb892a989
diff --git a/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild b/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild
index c839792807fa..35609f6170a1 100644
--- a/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/linkchecker/linkchecker/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 93c75b4b386e..e047cab471cc 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,4 +1,6 @@
 AUX define-own-mysql-port-constant.patch 3296 BLAKE2B 7a7c88c6f2c71bc1fc2f802ad202c2d2dbf3ede5af55dbe46cc15a064d37178b27670e30aa7bea07147456ce4d3e1ce9f495fa6df9deb4095367a7427e217719 SHA512 3ead6340800ac15fbe76e223599a5b3dbc6b6b13b72b684919aa43487838564ad7117b4e67fa7f36f0f58554fd8b8d6233efbcb82e6927a0c31f22c6a9ab5dbb
+AUX monitoring-plugins-fix-check-disk-on-btrfs.patch 913 BLAKE2B 7fb50e4b83a64da3ebfbe94eafcb03ffc39b6ec1440112c7c1e98c9dfb020466dddecee074cf61fbcdacecae58982456bab99d6e1d771148bb6f111ec9db0900 SHA512 8e4ab9eb474413b22a6893bbcab01edd655bf354c263cfba339c37b2c14093ab22aac05d732576266fa3e98880b29473cf5ff29494c54e954215f58a5768409e
 DIST monitoring-plugins-2.3.1.tar.gz 2529669 BLAKE2B 8dbbab78c1e57e249024fe57439acb41960585f2cccba20d03ca75a04b87e84752665f49cfe545c6a409d29094077dac0485aef872586f853e2f0f2187bf5070 SHA512 0ae76bc776997ed23d142ad9a688edc4df9b8ec0f9539b446e4fb4849a165cc88e97cbfb3a7a9a450de452e021d38f2e4ada7e8a22d78cf58e17e266472d01d7
+EBUILD monitoring-plugins-2.3.1-r1.ebuild 3047 BLAKE2B 37cf560fc5b8f020cf630d5038616ec7a29e6f4e6154522637aa6c73a6326b553f8e763d0e40279ec7a4f61d0a2675d3ba23b14c8a9f42ab43851067f6bcc7d7 SHA512 268a672ef83c9ddc974430b93ef97c51d47498d84116678eec559098e00456bdabd7b6fb30602f2773e04dbd03fca46c64efbbb85b0350aa1010ef45e4a185e9
 EBUILD monitoring-plugins-2.3.1.ebuild 3034 BLAKE2B d9c3b074d9fe133c3cccb3679aac0edff0690fbe5b0f7e67b8b8a232008188ad020fa1f6ddcf753c045ff2d1834f0134c3f3ca2a5856104ac14ba12834c2d026 SHA512 e82fc24872ee362fce26de6836fa912ab0582222c10179d8e159ce678fb0f9455f5b7c5e41a2991711ab6305eaa0a7bebf0cd38926b8fd4ea4cedbe9682fa73d
 MISC metadata.xml 1435 BLAKE2B 19cf3223867cee4899e5bdaf33948497c5cd66e94198b6a0c081ea440bf7ecfc7dcf4855b44a7ead5fc983756490f3a79059d51202be9d9f2eea24c6857eb165 SHA512 c781d735ced89fe81d49f400ada6916702ad2825c35c6bb589199902917df415a50335ce058eea45e6eb3fe66813ed2f4009cc6831e15d2b7369fcc12e8c0b26
diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch
new file mode 100644
index 000000000000..cbd458372133
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/830249
+https://github.com/monitoring-plugins/monitoring-plugins/issues/1357
+https://github.com/monitoring-plugins/monitoring-plugins/commit/e17c1e9ed95b8b9681dccd5a909ac5a02a04416c
+
+diff --git a/plugins/check_disk.c b/plugins/check_disk.c
+index 844e625f..a2735195 100644
+--- a/plugins/check_disk.c
++++ b/plugins/check_disk.c
+@@ -1068,10 +1068,7 @@ get_stats (struct parameter_list *p, struct fs_usage *fsp) {
+ 
+ void
+ get_path_stats (struct parameter_list *p, struct fs_usage *fsp) {
+-  /* 2007-12-08 - Workaround for Gnulib reporting insanely high available
+-  * space on BSD (the actual value should be negative but fsp->fsu_bavail
+-  * is unsigned) */
+-  p->available = fsp->fsu_bavail > fsp->fsu_bfree ? 0 : fsp->fsu_bavail;
++  p->available = fsp->fsu_bavail;
+   p->available_to_root = fsp->fsu_bfree;
+   p->used = fsp->fsu_blocks - fsp->fsu_bfree;
+   if (freespace_ignore_reserved) {
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r1.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..9c951f0457cf
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit flag-o-matic
+
+DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
+HOMEPAGE="https://www.monitoring-plugins.org/"
+SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+	curl? (
+		dev-libs/uriparser
+		net-misc/curl
+	)
+	ldap? ( net-nds/openldap )
+	mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+		gnutls? ( net-libs/gnutls )
+	)
+	radius? ( net-dialup/freeradius-client )"
+
+DEPEND="${REAL_DEPEND}
+	dns? ( net-dns/bind-tools )
+	game? ( games-util/qstat )
+	fping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( net-misc/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+	acct-group/nagios
+	acct-user/nagios
+	!net-analyzer/nagios-plugins"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-check-disk-on-btrfs.patch" #830249
+)
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with !gnutls openssl /usr)
+				  $(use_with gnutls gnutls /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered. Bug #468296.
+	myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with curl libcurl) \
+		$(use_with curl uriparser) \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		$(use_with radius) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+		NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/mrtg-ping-probe/Manifest b/net-analyzer/mrtg-ping-probe/Manifest
index eebe1494db3f..96b0128c798b 100644
--- a/net-analyzer/mrtg-ping-probe/Manifest
+++ b/net-analyzer/mrtg-ping-probe/Manifest
@@ -1,4 +1,4 @@
 AUX mrtg-ping-cfg 2077 BLAKE2B 78f267bc07d301c0b8b37b5ea6398fc2390ed1f0103e0f05c58f483693676f907df0d47d3a41fd44363aad97ab1ffd04f6998372a645fc97e375f00c8132b416 SHA512 d4c9f651fff32b7bb417ae07700cc179c4db596270a9f2dba5ccef45992239b0f964ac7cf63478c3c12a02e02adf088b692a66740872ebc8da2edba376f7029c
 DIST mrtg-ping-probe-2.2.0.tar.gz 36923 BLAKE2B b4556a46d0d644dc5215b686767370542a0b382287aabe4a9c3c7ed8a165005b7602a83135166b9539f3ac479a397ac6e782ef51eda107140ddb426de0f1397c SHA512 efc86ed732547359d8b2d94da367946d8b573e2b4d1b3d240b8eb7c5bfff17971848ad62c1448cdc0305393193d969361328448d9c9b25ae54866f71614b7cea
-EBUILD mrtg-ping-probe-2.2.0-r1.ebuild 712 BLAKE2B 843ee40b38b032680da003cf6550d53ec48d3d243d3eb99b0ba38bdea3a4087e1ac9f5983bf5ca13adf9292deda23d25fc95c48979ab7fac996199c31f8d2950 SHA512 1c07cc1e96ae81c8cd37a191c2926d8b8c1b06ed48a07fa53edec6e2a3a14dade6bde0c29add17ce52754d45f7faa7f62a946073d644f23cad42a8c926cba8a2
+EBUILD mrtg-ping-probe-2.2.0-r1.ebuild 721 BLAKE2B 9271cabfb0557e0be6479ae550b5e11f135911e74d140d927ab8a2f8dfe2050368625a85840ee30f9d4c79930c775debfcbdf11e0f5d5bef8f66f8ee5aec176b SHA512 edb0cbb26315ccd6ab6c3dff6b3d99728b89f378cc3a2a1a5dc472145922337d9dbb01f653703912f324a0765aaf821a22c0dd78cb64b5c91ba96980ce514d6f
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild
index c435fe21a0b3..12267a6386cc 100644
--- a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild
+++ b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild
@@ -17,6 +17,7 @@ RDEPEND="
 "
 
 src_prepare() {
+	default
 	sed -i check-ping-fmt \
 		-e 's:#!/usr/local/bin/perl -w:#!/usr/bin/perl -w:' \
 		|| die
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index a7f6bf1d00ab..83acf20be013 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -3,4 +3,5 @@ AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae
 DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace SHA512 6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.4.6-r2.ebuild 9353 BLAKE2B b8d8a8ba322403d2b5abbded84fee017924f89a1a075be01e48d8b70707712ffff8b6b5f54db6c15a9743cec716234d14a734b5325fd09e427545be58a46bd6e SHA512 1169813389640bef4270ba7f31468d19dc17124434d9c04d6ea9f8fb3c998493da1dfc87a3fb4697ad5c8e5cdc5e960e60b1740bcbe4dc7611cbf2803401301f
+EBUILD nagios-core-4.4.6-r3.ebuild 9243 BLAKE2B 0f21e7a068e3b146f2d44acd0f4663c4e8c114aecbbde52842acc3c10c2e8ae0a5eb7006bcff9210cce96d8448ad60a0e145661f3a442a3b537016044d4d0425 SHA512 d96facbbfb8093145618a413fdc3918153a6eedbf9a70147202e66ce2e5b99035e11386d7775210a4bc61954391f9db9809af8bc9837656bab968d913f0195e3
 MISC metadata.xml 1467 BLAKE2B d5ddd6280aafd3ad3a36a408071037fa757810382761f617eb2763a20e65185b30eef94fb4cdad7d4b5e9b81b6245efacf57d4ec0003406d66ef2053f09f3708 SHA512 25d3d4d19c18b416a0902d2ff39c0ca71b2e7bcc2bac61119b9636c6462391e65b2767d8b0e794abb318b19fe1c2bcbf2c80ee8d1ea6faec3f6eb9cddf60a9cd
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
new file mode 100644
index 000000000000..2f3ebaec2193
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+MY_P="${PN/-core}-${PV}"
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/"
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi (USE=apache2_modules_cgi)
+#   * mod_cgid (USE=apache2_modules_cgid)
+#   * mod_fcgid (www-apache/mod_fcgid)
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+
+# The dependencies checked by the configure script. All of these are
+# also runtime dependencies; that's why ./configure checks for them.
+CONFIGURE_DEPEND="acct-group/nagios
+	acct-user/nagios
+	virtual/mailx
+	dev-lang/perl:="
+
+# In addition to the things that the ./configure script checks for,
+# we also need to be able to unzip stuff on the build host.
+#
+# We need the apache/lighttpd groups in src_install() for the things
+# installed as the --with-command-group argument, so they go here too.
+# The groups are also needed at runtime, but that is ensured by apache
+# and lighttpd themselves being in RDEPEND.
+BDEPEND="${CONFIGURE_DEPEND}
+	apache2? ( acct-group/apache )
+	lighttpd? ( acct-group/lighttpd )
+	web? ( app-arch/unzip )"
+
+# This is linked into /usr/bin/nagios{,tats}
+DEPEND="dev-libs/libltdl:0"
+
+RDEPEND="${CONFIGURE_DEPEND}
+	${DEPEND}
+	web? (
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd[php] )
+		apache2? (
+			|| (
+				www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
+				www-servers/apache[${MOD_ALIAS},apache2_modules_cgid]
+				( www-servers/apache[${MOD_ALIAS}] www-apache/mod_fcgid ) )
+			|| (
+				dev-lang/php:*[apache2]
+				dev-lang/php:*[cgi]
+				dev-lang/php:*[fpm] )
+		)
+	)
+	vim-syntax? ( app-vim/nagios-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local myconf
+
+	if use !apache2 && use !lighttpd ; then
+		myconf="${myconf} --with-command-group=nagios"
+	else
+		if use apache2 ; then
+			myconf="${myconf} --with-command-group=apache"
+			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+		elif use lighttpd ; then
+			myconf="${myconf} --with-command-group=lighttpd"
+		fi
+	fi
+
+	# We pass "unknown" as the init type because we don't want it to
+	# guess. Later on, we'll manually install both OpenRC and systemd
+	# services.
+	econf ${myconf} \
+		--prefix="${EPREFIX}/usr" \
+		--bindir="${EPREFIX}/usr/sbin" \
+		--localstatedir="${EPREFIX}/var/lib/nagios" \
+		--sysconfdir="${EPREFIX}/etc/nagios" \
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \
+		--with-cgibindir="${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin" \
+		--with-webdir="${EPREFIX}/usr/share/nagios/htdocs" \
+		--with-init-type="unknown"
+
+	# The paths in the web server configuration files need to match
+	# those passed to econf above.
+	cp "${FILESDIR}/99_nagios4-r1.conf" \
+		"${FILESDIR}/lighttpd_nagios4-r1.conf" \
+		"${T}/" || die "failed to create copies of web server conf files"
+
+	sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \
+		-e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \
+		-i "${T}/99_nagios4-r1.conf" \
+		-i "${T}/lighttpd_nagios4-r1.conf" \
+		|| die "failed to substitute paths into web server conf files"
+
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) nagios
+
+	if use web; then
+		# Only compile the CGIs/HTML when USE=web is set.
+		emake CC=$(tc-getCC) cgis html
+	fi
+}
+
+src_install() {
+	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
+
+	# There is no way to install the CGIs unstripped from the top-level
+	# makefile, so descend into base/ here. The empty INSTALL_OPTS
+	# ensures that root:root: owns the nagios executables.
+	cd "${S}/base" || die
+	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+	cd "${S}" || die
+
+	# Otherwise this gets installed as 770 and you get "access denied"
+	# for some reason or other when starting nagios. The permissions
+	# on nagiostats are just for consistency (these should both get
+	# fixed upstream).
+	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
+
+	# INSTALL_OPTS are needed for most of install-basic, but we don't
+	# want them on the LIBEXECDIR, argh.
+	emake DESTDIR="${D}" install-basic
+	fowners root:root /usr/$(get_libdir)/nagios/plugins
+
+	# Don't make the configuration owned by the nagios user, because
+	# then he can edit nagios.cfg and trick nagios into running as root
+	# and doing his bidding.
+	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
+
+	# No INSTALL_OPTS used in install-commandmode, thankfully.
+	emake DESTDIR="${D}" install-commandmode
+
+	# The build system installs these directories, but portage assumes
+	# that the build system doesn't know what it's doing so we have to
+	# keepdir them, too. I guess you'll have to manually re-check the
+	# upstream build system forever to see if this is still necessary.
+	keepdir /var/lib/nagios{,/archives,/rw,/spool,/spool/checkresults}
+
+	if use web; then
+		# There is no way to install the CGIs unstripped from the
+		# top-level makefile, so descend into cgi/ here. The empty
+		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
+		cd "${S}/cgi" || die
+		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+		cd "${S}" || die
+
+		# install-html installs the new exfoliation theme
+		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
+
+		if use classicui; then
+			# This overwrites the already-installed exfoliation theme
+			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
+		fi
+
+		# Install cute Gentoo icons (bug #388323), setting their
+		# owner, group, and mode to match those of the rest of Nagios's
+		# images.
+		insinto /usr/share/nagios/htdocs/images/logos
+		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
+	fi
+
+	# The ./configure script for nagios detects the init system on the
+	# build host, which is wrong for all sorts of reasons. We've gone
+	# to great lengths above to avoid running "install-init" -- even
+	# indirectly -- and so now we must install whatever service files
+	# we need by hand.
+	newinitd startup/openrc-init nagios
+	systemd_newunit startup/default-service nagios.service
+
+	if use web ; then
+		if use apache2 ; then
+			# Install the Nagios configuration file for Apache.
+			insinto "/etc/apache2/modules.d"
+			newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf"
+		elif use lighttpd ; then
+			# Install the Nagios configuration file for Lighttpd.
+			insinto /etc/lighttpd
+			newins "${T}/lighttpd_nagios4-r1.conf" nagios.conf
+		else
+			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
+			ewarn "out of the box. Since you are not using one of them, you"
+			ewarn "will have to configure your webserver yourself."
+		fi
+	fi
+}
+
+pkg_postinst() {
+
+	if use web; then
+		if use apache2 || use lighttpd ; then
+			if use apache2; then
+				elog "To enable the Nagios web front-end, please edit"
+				elog "${ROOT}/etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
+				elog "to APACHE2_OPTS. Then Nagios will be available at,"
+				elog
+			elif use lighttpd; then
+				elog "To enable the Nagios web front-end, please add"
+				elog "'include \"nagios.conf\"' to the lighttpd configuration"
+				elog "file at ${ROOT}/etc/lighttpd/lighttpd.conf. Then Nagios"
+				elog "will be available at,"
+				elog
+			fi
+
+			elog "  http://localhost/nagios/"
+		fi
+	fi
+
+	elog
+	elog "If your kernel has /proc protection, nagios"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding nagios into"
+	elog "the group wheel, but this is not recomended."
+	elog
+
+	if [ -n "${REPLACING_VERSIONS}" ]; then
+		ewarn "The local state directory for nagios has changed in v4.4.5,"
+		ewarn "from ${EROOT}/var/nagios to ${EROOT}/var/lib/nagios. If you"
+		ewarn "wish to migrate your state to the new location, first stop"
+		ewarn "nagios and then run"
+		ewarn ""
+		ewarn "  diff --recursive --brief ${EROOT}/var/nagios ${EROOT}/var/lib/nagios"
+		ewarn ""
+		ewarn "to identify any files that should be moved to the new"
+		ewarn "location. They can simply be moved with \"mv\" before"
+		ewarn "restarting nagios."
+	fi
+}
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
index 01896762ffb6..8ab46a04531e 100644
--- a/net-analyzer/nagios-plugins-linux-madrisan/Manifest
+++ b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
@@ -1,5 +1,5 @@
-DIST nagios-plugins-linux-madrisan-28.tar.xz 390428 BLAKE2B bc41fb7d3b639fe2d133c2ff6643562ce94e5523b13aa18045d7265ae8d9d80873b0611aaee0f0fa8b959e0da3e2c350868574a8986c0d9436b6bd4e4154d908 SHA512 c72065ade12ec60c86479276370215bc0dc419ae9681d7260c550f8985300c39c1c8e39537c51c56e0c1ae61283befc5d111ffd47394de7dc7f7daa5993254fc
 DIST nagios-plugins-linux-madrisan-29.tar.xz 392700 BLAKE2B edc93bfb113cb12ce8a345e38627881decb952cb1e7a948dcdced2aaa9c940956b75a7c8f7ad1b72daac132236ab27762b6f8b14a5098eaac648bafae6dfdb33 SHA512 412464b894fe2a0953e495c7c87604ed6b282f65fd1988043757b162ba4fecf9e8f9740e7e09ec2dad8ba8d80fa928df4d7e644260538117d19776f4883045f6
-EBUILD nagios-plugins-linux-madrisan-28.ebuild 1108 BLAKE2B f72e33a87c21f0f18630990cdceb46991b0d2e9de3a0d6395b87fc901fd29bccdff04b5eb2e27b174c860ef45cb97ef33ce74062c4e8cb784e05ca6d87f2b2e4 SHA512 ddababf0001ba44e92ba35a68ae3514425291733fd195fbd3e6ae7101ed246e6e4f5c127844957678e61179772b150396a18ebf7809da4c6a2e358804d4393ff
+DIST nagios-plugins-linux-madrisan-30.tar.xz 391164 BLAKE2B 3b16d0e61a68153fa90bed4c3540d9457546d2448b3b0da2b9313cd99e9b65f44c6f8d52322500570510171a049759ab85855f262d0581c6f926a96fbfe268dd SHA512 c02f81b6bbd4a0453780d9301a5cd1be67b9640e1b75d06c626a433b6e544fb4649c9b14e8e9a2c84dc6917aaf2011fb9a864ef36fef661bbcd673fa00bc5d57
 EBUILD nagios-plugins-linux-madrisan-29.ebuild 1108 BLAKE2B 82f0b4ba52bb68891df6ff166782c6948f3a8c109376d50a16a31e1823e27876153defd68dae5178c662fac00b7c2fd94473dc553861ffc86eb30b59a54a26ca SHA512 b8e953be6c382e79dca6fb973d816881d35b3de68906fcebfe137ada6004483a3f7ea4290bd86b756b654a4ed428771cfcc569dff0ee0ec7d87e38f4c4a16dae
+EBUILD nagios-plugins-linux-madrisan-30.ebuild 1108 BLAKE2B 2aca6ca84f1342ac0c5aa44e70ad6372d97650bd133335066980a707a0bf0607cba5ede1a8f1cd39c95cd7f3a4d7ed0106407b9d7dda2cffcf23e3756428a455 SHA512 026aa2ff3049aee60ee56d9ea0948cd5b4c0bbdd83be5c7f1a3674bbf39c41ded84f87d87da3b7034cb0a59499263a68d1d620d136c82488c4789dea94f424a8
 MISC metadata.xml 613 BLAKE2B c6c247d18381bc631d4c818acbb3051ec35c243519d289816bcd9f9742c45ffa870d552651b0509b8607b8558a35216afaf609a4747df99cba1d4192c251e2f2 SHA512 9648f98d75b34851252c147db60cbdd5d2ca6bcc42555a65170f79adb911ba175f28b1d286e686be7cbb927bb623e09837dd683e42b95cc045507e23ca51b4d9
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-28.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-30.ebuild
index a0e44b8d7feb..6e71445b286d 100644
--- a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-28.ebuild
+++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-30.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 2783c257c6c0..69467be55d72 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,4 +1,6 @@
 DIST netdata-1.32.1.tar.gz 22472431 BLAKE2B e05e4f29930493ad0c31373dabff57a3fd4f178730848fe4153aebb6219055ef0edda59577fe0c6cc9bd5cf3444b055e8330744f75581804f316f343fc692710 SHA512 869829eadcec4dd9c05cc6b6279830691b6cf9345cdcc0834e90d71f3bbee508c658d16bd379c51ce470c4e735e7c8d607dc045f45a60da2aa3dac36f37b5757
+DIST netdata-1.33.0.tar.gz 22470692 BLAKE2B fc0feed8a93876ca7ec304d8ff95312de19f81fccb5ec564e324751488fe6bb10033c815d456238503bcefdd31ec213d61191e21a5ee6671e23183aec7f298d9 SHA512 31b7ce97a3e756fddc358501d98b5ccf056dbe8d22585628873753f30041533d8926b8549a6f1c795c20b33952ec24df2a3ccdce85d6b1da984964bf08a5a66d
 EBUILD netdata-1.32.1.ebuild 3875 BLAKE2B 313c72de1625f81e4404160402e52786579c418bd216d73bb869afad7e55e1e98d11620aa8752bf0a85f0e429d0eaa0d3eabc2f5d71ca954595cf5ad6953c8aa SHA512 84bb620ea6186b8cd0a1301558ce8534d429fd0f50a3d0356ce3b73223ab1364a8e772cbf758e3e87399139aee821ddc25a4ec83e0ff46dc9a0503af67e53421
-EBUILD netdata-9999.ebuild 3873 BLAKE2B 0b6c225286a09d8f0f2ea1afdfd460443b5696b8175dd79c4fc93ff7b52c07f18461baf3a7951195668fd6f27000e753dc35dd960122adc28d03d3fd13b42676 SHA512 4d5973899a060e388111c514653d699a5c95f7068b861b34a6459d4e21b99ee7e3ebf28d63319201ed1a6ab5b421bab03e1bf4f8030245c1e4d4e9eb966f2c96
+EBUILD netdata-1.33.0.ebuild 3846 BLAKE2B 7af687733ca6bda186277185084d6624ed7957d78ea1f4e009dd2447c84833a4bfbdd6dfe916c98178601371e31ab742b909d1de71796f64e920e3a851be76b0 SHA512 a151af5cc52e4e0fae3a30cb6fc7c97a9de6ea6e80d7984fdcbc9777ea5fbc1d1cd18a16f583d3f804f1c13115b536284b11868942f7a62347b55af08d495ab0
+EBUILD netdata-9999.ebuild 3843 BLAKE2B 85ab674b580ec9240397c42eff7f88749f83637cc72f4faf15a9529ba8f19e71e5664819cd970853cf0ead417b9fe210620763ff50a629ee7778cd1532975b37 SHA512 e745c8741094d9510f6f12ea240b93cbb89a64fe5ba4091592b71b45e579c271fce3fe1ce98e29040a861ffa879458eceff8687c3701811258d089db4b4db8ac
 MISC metadata.xml 1289 BLAKE2B 8c18928662fdfb9166a3dd147b73206d41b6038268121b23b464f5e8ff8cacf929ac6374aa8b54b63281599be21dd92c352ac229a0e0ff180a57b86faf020ea2 SHA512 e3a344e81572b366848b51022febaeb9f9f5df3555343757061370dc42757817b4b77de85a4f0efb6b52032461cb97edd4b9d41b44b9cec7681b06448f706484
diff --git a/net-analyzer/netdata/netdata-1.33.0.ebuild b/net-analyzer/netdata/netdata-1.33.0.ebuild
new file mode 100644
index 000000000000..5fe0d66e35d4
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.33.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+
+inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
+
+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 ~ppc64 ~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_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_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() {
+	if use ppc64; then
+		# bundled dlib does not support vsx on big-endian
+		# https://github.com/davisking/dlib/issues/397
+		[[ $(tc-endian) == big ]] && append-flags -mno-vsx
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		$(use_enable cloud) \
+		$(use_enable jsonc) \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable kinesis backend-kinesis) \
+		$(use_enable 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 nfacct ; then
+		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
+	fi
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+
+	if use ipmi ; then
+	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
+	fi
+}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 2acb180f99b4..5759c79ca15e 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -102,7 +102,6 @@ src_configure() {
 		--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) \
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index d29c4bcedc4c..4a43f6cd3a6b 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -19,6 +19,6 @@ DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb
 DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
 EBUILD nmap-7.80-r2.ebuild 3302 BLAKE2B 1067cf3f8cfc655936e8326cb74adbb27c86fa2a4b64a964a68442beb8c496adc968fcfdbd991f90d54e62f7004ac6876a85194c9a198b99fdb515f8b812f9d6 SHA512 5547b397864ba934196705250f714e6bcc7a10613745cef95dff817acde8386627ad494da7748f5e1d0a66e8e74727632f61840253e95d5a191ea2ab16df77ca
 EBUILD nmap-7.91-r2.ebuild 3234 BLAKE2B 0a3cd4470a587606dc00df6d90012f58b257b75e30b52ee180c3cafa3f0b450ad130dbbcd170290ad17f41c6fef6d66780d6e0c8d7ccd0ed9f2f10d6884a9c25 SHA512 180591ea5f8b0fbee002abe708433807b54feb4ea2abb5a4a5fb2e634e9f68d82d7795ee233691ff20a84c19633f88ac8523a9d3826e0306689f80e4d7343ee6
-EBUILD nmap-7.92.ebuild 3172 BLAKE2B f79b29edf7d9088773017c53869cee4203fc49bb7bb8fc97c5848674678951424a406aa19eea779ad099f62e59e0f349ad1ee1f935a6b62e10f710118b9707a0 SHA512 c4dfa5e4ba6af747c2980e42c2fb04a019be56f72365bdfba36a8bef2f3aedf2fb7b946af9badbe3a8145f4d4b7198fa218fba043e0cbe4a66f81d19bd5b7c8d
-EBUILD nmap-9999.ebuild 3217 BLAKE2B 0ab336f6e00a06f3062149f757c24d1af2fbf520aa107d342d67ea0fc8a17ca28257e37c3161bd59283822f2705835e89d3e3f53680463856da83403fef44837 SHA512 5a61e495d7a5cd3633815380816d6c389b3a6208b910bb9d062f45bee2c9461c5f4352bf1e6e3ef5feefffb6350efb691505d8d7a4ed414062a59781363451a7
+EBUILD nmap-7.92.ebuild 3217 BLAKE2B 51b98efbb343a7db44f9a8e084d858b568f8f7bd39947663063815ebdd6f4ff81bd0cbaf33f2e9406b85c6b9c9e97e53f18a6731ad99c6818c1762ae81474319 SHA512 1692b52b42dc6e64f6cab1a951c34d3254a544f4a44b2cad9fd9f3d3712cb6c78d35202ceaae9afb00613d773f22d507ac45863dadd7f99f5bb0692a3536fecb
+EBUILD nmap-9999.ebuild 3262 BLAKE2B e1b820e12e7494a2af5ddbe0761854521caeb72d532166c4defe8ec18d4288db0def874f66ae88b915a8b807e08fe0387128e0c05191594586a9d9761813ee1f SHA512 03f0b3e0a47667e74fd5950fd22c83a9856ca8f66663484e6fc57554a069aa17dccc867cb3b6681ad550d53df2852147bf730cd0ca3c38a79838fbc7397b7098
 MISC metadata.xml 980 BLAKE2B 846ba0a3b3f6da9185f8d8ef3a30e76ffa84da73a3714724493359729af26790cdbe7148058a45d289dbedade8a55ef5608c334c6bfb4cbc61b5ae4db15ef31e SHA512 40bf1717c4f450cf0221c6760b03d33282fb500f29afe0bbf72977d0010dfd57e8a0e07ae67e5ee8ebc671f5ad502722ca0b068a527f98e9506be869a603b074
diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index 348adce730a5..8578d039870f 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -121,7 +121,9 @@ src_compile() {
 }
 
 src_install() {
+	# See bug #831713 for return of -j1
 	LC_ALL=C emake \
+		-j1 \
 		DESTDIR="${D}" \
 		STRIP=: \
 		nmapdatadir="${EPREFIX}"/usr/share/nmap \
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 466e9b414a06..e04fab825e5c 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -122,7 +122,9 @@ src_compile() {
 }
 
 src_install() {
+	# See bug #831713 for return of -j1
 	LC_ALL=C emake \
+		-j1 \
 		DESTDIR="${D}" \
 		STRIP=: \
 		nmapdatadir="${EPREFIX}"/usr/share/nmap \
diff --git a/net-analyzer/snallygaster/Manifest b/net-analyzer/snallygaster/Manifest
index cd88e4d6a051..fd2092d47650 100644
--- a/net-analyzer/snallygaster/Manifest
+++ b/net-analyzer/snallygaster/Manifest
@@ -1,9 +1,5 @@
 DIST snallygaster-0.0.11.tar.gz 25238 BLAKE2B 11867c0a71cd1701205f499cc7e492520018d39dcdeae0d8e8ae130e2034fd15d20039ed2c7325c879b1640b67a02515685640d5278e0aaafba864fd9d47a7a0 SHA512 6c050f8d67748fa148a578e37f3788305251d210691047f045d63dd531eca4ef4eb9e1d74a22ce9db13c71e471ced304d8138b8f283a1fe4841381532baab733
-DIST snallygaster-0.0.6.tar.gz 22260 BLAKE2B 5f5f45678ee83922d477eb7356bf830a4ececbff6fc02bc21d2b714abf350c1b2643fb8134f330d8f54a4c58809b9de2671f46b728e631ac0a5f4996f87fd8e1 SHA512 abca663005e43948ef7c6516a3e85d1b1010811365f39a280b9c091490a8b4687fdaa1b0acbd29f5a84285fe16cd74398098eb9600b5ec41ec880d355cd0ddbd
-DIST snallygaster-0.0.8.tar.gz 23341 BLAKE2B 0b4e92b50c9f766440a19bab6e39f7be323c5574c8f350ed3fbd07499ca04b358ec0e66deeddd30b5e798d093a73fbce65434be4058285eb773918314f373dac SHA512 a4937d5e486109deb54d4a3494fcdb2b06a0938cb9ca686550616d31d2f5bde01b4162f610db15c34c86e41673f6f05f749fb921d5f858cbc4a2fc7f65a6dda6
-DIST snallygaster-0.0.9.tar.gz 24055 BLAKE2B 049a88250877ed87103d23a30443ed638320e61c788716d432d877407c837f439bd16dc78a6eb00f7fea844280975f155898d9b084f7e285a0ed81a6becf9d68 SHA512 e7de6d97576f1651e0a6882c4d2766efe82b8656f53a6c30a5e36eeadbaa4fdc2b79dc370a1106a0bbd916d45d1c92169dcfb5d7c75e89946b371bc80098366c
+DIST snallygaster-0.0.12.tar.gz 25234 BLAKE2B 69082fe94fc65d78b99519511b6850d569401d326788448dffac2baca3e359e166b161e69b5169dc0772c4eba5e3cf70968ed75fe09efad7924869971a0869c8 SHA512 507b5bbaa8a013bbbb18b53778781e1e212e295f113ea91b1b73d5162f93d35be74780fa0cba7499d62f40c8cd27b4cdfd79526bd0ab07018090460ca937eb48
 EBUILD snallygaster-0.0.11.ebuild 642 BLAKE2B 9d3079dd21371f17f19232aa2d257c2376333b59dd8400955426a8e7cd60f78b17aea74cd9bbd3c7f08ef402e525eacf99d23a83ee6e9d3113e63b54645352d6 SHA512 4e9313f287a6a9826bb8b51c9b00dc7e132f6cef752fd36bcdab33bb67edad0be1f447eb5f043f282a8c66881dc7e3522f209b81e9288327d7398b8ce9d1fb32
-EBUILD snallygaster-0.0.6.ebuild 539 BLAKE2B 5a5516a98defdbf161ae131ee503ed1934af7a11bbe803ca96c17745032132d268998d3c2d85d70336a4603be1e324460ac2d6a19240403f7177132188d694b3 SHA512 e503d1569c0c7fd5b0ff9e2b6977d80e40e60fa8006499fc21e1baa1d0c7d811386e0e7173c42effeba3df50b07eb5ab46cf5c89d268c9c8bc891712c5608495
-EBUILD snallygaster-0.0.8.ebuild 539 BLAKE2B 5a5516a98defdbf161ae131ee503ed1934af7a11bbe803ca96c17745032132d268998d3c2d85d70336a4603be1e324460ac2d6a19240403f7177132188d694b3 SHA512 e503d1569c0c7fd5b0ff9e2b6977d80e40e60fa8006499fc21e1baa1d0c7d811386e0e7173c42effeba3df50b07eb5ab46cf5c89d268c9c8bc891712c5608495
-EBUILD snallygaster-0.0.9.ebuild 541 BLAKE2B 284170801319da5c48722d40d2a6a24b950d3468c001acfd4f9635adb1ce8642aa73fa19cd1011189dde28a91c6bdc782be626920c0710a25be7cb0cacc9a91b SHA512 c57c30985a2c41dbda1e9f9f0e9dc7a31cc51fbd7243429e96835fcfaf8be7a01a362bba0b73b2e16550e4a8c6849a9b22f24edd19e39f7e25eed43cf8296638
+EBUILD snallygaster-0.0.12.ebuild 645 BLAKE2B 59a412ec9b2a54725ac0258b2a405a16a3f873ed4891513ec1449772dcbd0d5729ef1d937d7e4bd4e1310805a68ff194f19364cffb201711cb2f103dcb99e099 SHA512 207555354bf8cc13ac851f2d627b6ce11a6ba08f146fb6dacf5161eb28ca7c4f2d4e1ed23cc6b3db449d36532a24df78dacea01fac18616e583940a4fc51a8a2
 MISC metadata.xml 211 BLAKE2B 8a357a845c5cd7c1afeda19eefd020f5cab0b573e5a6914aa4a06c2b48261c7b86a5d72b96731cd78140f992d895cbb1d54ba70a1bb1485ae5a75bd7062e13c4 SHA512 9a2eeafd67a65fd9a667e31692033480c29f9250bfe5b54166130e805e3621c22d9eb9d0515b2622c220dc78255cb42c2ae6b6379070591164b1295441a4c12d
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.12.ebuild
index cef08b8a35a2..578572f0bfbb 100644
--- a/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild
+++ b/net-analyzer/snallygaster/snallygaster-0.0.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1
 
@@ -19,3 +19,7 @@ DEPEND="dev-python/dnspython
 	dev-python/beautifulsoup4"
 RDEPEND="${DEPEND}"
 DOCS=( README.md TESTS.md )
+
+# Only codingstyle and similar tests, require dependencies
+# not packaged in Gentoo
+RESTRICT="test"
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild
deleted file mode 100644
index cef08b8a35a2..000000000000
--- a/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1
-
-DESCRIPTION="Finds file leaks and other security problems on HTTP servers"
-HOMEPAGE="https://github.com/hannob/snallygaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-python/dnspython
-	dev-python/urllib3
-	dev-python/beautifulsoup4"
-RDEPEND="${DEPEND}"
-DOCS=( README.md TESTS.md )
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild
deleted file mode 100644
index b984ebb2e0fc..000000000000
--- a/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1
-
-DESCRIPTION="Finds file leaks and other security problems on HTTP servers"
-HOMEPAGE="https://github.com/hannob/snallygaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-python/dnspython
-	dev-python/urllib3
-	dev-python/beautifulsoup4"
-RDEPEND="${DEPEND}"
-DOCS=( README.md TESTS.md )
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index d263be401994..209bdafe3e9d 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -4,7 +4,8 @@ AUX snort-2.9.8.3-rpc.patch 1010 BLAKE2B 69301ee21b7efb0bc7f4e3b266de315078d7cbc
 AUX snort.confd.2 420 BLAKE2B 984bc3a1b4f9fea044b150d1362950cc2bc0fae07a92351a88f428befbe1fa35166809dfb9d350cd811bec1dd22f5392910a5f2ee2ec11f20a3dfe6bdff4c4c5 SHA512 f8b0dd74a601a8bfadc96f75caeb037059ba4330dc2b52cc113ce9be38b020f098cbc747bfe977ca4dfa6e2ce634a64949ca5cf41a40c16fa90227e49ac9052f
 AUX snort.rc12 1469 BLAKE2B 6238dfc0f9e178fca864ee9485b8cf59c3056d8b047ee5fd62087f55e8a4627a903aff854827175fc80aaa6ecafa924d9ca57cd9fdba5a185d1e31814db69280 SHA512 ec398f06db147bc8ddf98b0d6a200af40c082053062b56a3fe78b1de6629cd7bf0b188e9baf44c1634f5f9f8ce8494a8a71be63c1e3f71838b77de58dbb45c71
 AUX snort.tmpfiles 32 BLAKE2B 39e4f2491f52d2a369b1c4747468ea3a9d5f2c05a85adb4666e733929be16b9cf868ea6878d3d71271dd8ee05ad8e8fac52c4f4ebfd17da873a3dc64c5368810 SHA512 705e49c172ba7bc0afee9910dcbf7b4ee96f05e6d3030c7928bbeb0df658aefb5f61fddd0da078b257ee9a0c86d1750e7b44d6f61d8e56ab799044cd141964b5
-AUX snort_at.service 327 BLAKE2B 36039657ae5a5b7a37585baebc3de15f32f457b3df6313621eea6bafe3e8a34626960bd4adafe110f36f75a15bae8fc045a6e3267b960249536a0f10ac05b88f SHA512 af48018d232eec181eff2f3aa240e11744911874ee08a0311474d73bffcf1e567102ea6d42a26520dd5a1a3c66530d8d3f19fc4b4753b6ac0ae55eb3200747e0
+AUX snort_at.service 322 BLAKE2B 14cc63b941b4931ec42bdd1abd5ac1ec2b67aff4d36db3fb6fbbdae5dc0e6bdf1398699fa3f7cf595c5545270e749d6d22fadcf6a55d721551f8e323ee6e3177 SHA512 7173ec7fb71ae5b2368ea5bbffd562afdc0ddd990071bc08d61577a8754452d200eb39710e7b9cca4792bb2f8572fd50fd771ff0233daade4fde0149bab365c7
 DIST snort-2.9.17.tar.gz 6983018 BLAKE2B 8a6d5f4311e304b141f705fdcd3f570e88540dc5ce5882887b6fa52ea16e41daac384012badcbbc087693ee631e30477b8af2a6c49efa8230c71b80937597355 SHA512 c1a69e697298b4e85b8b8898e29077f5e74d8e2a8e42c2164a5597b3739204d856a74f30bc7c30b1907ec7b3bd3c6c6d798ead890656386b0c2a2da2c201d006
+EBUILD snort-2.9.17-r1.ebuild 8196 BLAKE2B 4b484d9f4f03ce988795fd17c690611531bc15514838096a1bd055432cdf4860f7a823bbef9701248cb3903170c06f395b3e90ef8cb99cb133b58ade07058ff2 SHA512 9a611e49f6f853f841c6904db1a6c00232aa4ec274c6708ee4bf5604022aa329156edc11f37966a7c5e35903e4a775d5020a371ac00cba99a4057d23a0753092
 EBUILD snort-2.9.17.ebuild 8196 BLAKE2B 4b484d9f4f03ce988795fd17c690611531bc15514838096a1bd055432cdf4860f7a823bbef9701248cb3903170c06f395b3e90ef8cb99cb133b58ade07058ff2 SHA512 9a611e49f6f853f841c6904db1a6c00232aa4ec274c6708ee4bf5604022aa329156edc11f37966a7c5e35903e4a775d5020a371ac00cba99a4057d23a0753092
 MISC metadata.xml 4036 BLAKE2B 63694245b4389785af4beef5134f10c069f28cce573ade1e6a0424f34420b38c72e1f611f220c1e8876d76a8d5ab23fbe6f678d4890d3d0be8453de3ed600488 SHA512 90fa5b28b1e90483d07f86ad933f9a9da7660d584fe9f5e1f146abf32b70f136e5b90662093d36542dc6863d459bf6152546a8f7bcfc833d26c24c8b165dd5d5
diff --git a/net-analyzer/snort/files/snort_at.service b/net-analyzer/snort/files/snort_at.service
index f764015c2192..40fb0cb1a1d5 100644
--- a/net-analyzer/snort/files/snort_at.service
+++ b/net-analyzer/snort/files/snort_at.service
@@ -3,7 +3,7 @@ Description=Snort IDS system listening on '%I'
 
 [Service]
 Type=simple
-ExecStartPre=/usr/sbin/ip link set up dev %I
+ExecStartPre=/bin/ip link set up dev %I
 ExecStart=/usr/bin/snort --daq-dir /usr/lib/daq/ -A fast -b -p -u snort -g snort -c /etc/snort/snort.conf -i %I
 ExecReload=/bin/kill -HUP $MAINPID
 
diff --git a/net-analyzer/snort/snort-2.9.17-r1.ebuild b/net-analyzer/snort/snort-2.9.17-r1.ebuild
new file mode 100644
index 000000000000..ba2c56393269
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.17-r1.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+
+inherit autotools lua-single systemd tmpfiles
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="https://www.snort.org"
+SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+active-response control-socket debug file-inspect +flexresp3 +gre
+high-availability inline-init-failopen large-pcap-64bit +libtirpc
+linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react
+reload-error-restart selinux shared-rep side-channel sourcefire +threads"
+
+DEPEND="acct-user/snort
+	acct-group/snort
+	dev-libs/libdnet
+	>=dev-libs/libpcre-8.33
+	net-libs/libnsl:0=
+	>=net-libs/libpcap-1.3.0
+	sys-libs/zlib
+	!libtirpc? ( sys-libs/glibc[rpc(-)] )
+	libtirpc? ( net-libs/libtirpc )
+	open-appid? ( ${LUA_DEPS} )"
+BDEPEND=">=net-libs/daq-2.0.2"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )
+	open-appid? ( ${LUA_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.9.8.3-no-implicit.patch"
+	"${FILESDIR}/${PN}-2.9.8.3-rpc.patch"
+	"${FILESDIR}/${PN}-2.9.12-snort.pc.patch"
+)
+
+pkg_setup() {
+	use open-appid && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	# USE=debug exposes a macro whose name apparently wasn't changed
+	sed -i -e 's/BEFORE_SRV_FAIL/BEFORE_SERVICE_FAIL/' \
+		src/dynamic-preprocessors/appid/appInfoTable.c || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gre) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable open-appid) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		$(use_with libtirpc) \
+		--enable-mpls \
+		--enable-normalizer \
+		--enable-reload \
+		--enable-targetbased \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq \
+		--disable-static \
+		--disable-so-with-static-lib
+}
+
+src_install() {
+	default
+
+	keepdir /var/log/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+	systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service"
+
+	newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+	tmpfiles_process snort.conf
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/snortsam/Manifest b/net-analyzer/snortsam/Manifest
index 4c722403763b..befc0648ae16 100644
--- a/net-analyzer/snortsam/Manifest
+++ b/net-analyzer/snortsam/Manifest
@@ -1,4 +1,4 @@
 AUX snortsam-2.70-gentoo.patch 8979 BLAKE2B 7df4e769ed440b5bd595b6a62a414d9172ec283ab6f48bd00f5ede432c7430c1c936a9915ca40857216e926ccf7354cf45743e97fdbd945374efe01e403a928c SHA512 17f5b03820491ffbd8eda4b5cc99230ab358788194eb07221a303e98cc0ef5855d347804b30bd21f38d2a6f0e370f2433a691a33db0599c50887857bdadb53b6
 DIST snortsam-src-2.70.tar.gz 1971624 BLAKE2B 10f26afb8addffb52db099e0c376a9adb884b625503233b72203070cadc79a688c7a6950014759d6fb58c8844899482057d9701e9eaa5e9d12066f10e88d6421 SHA512 e0b6d53dfc0963e5a0012e25c1cd15f76263cc0d0158f6a50eab3876f1ae40c47eeafb7309113d27f1ca92d5491a19e32748c3bf51754be9320346ebbf26e5b1
-EBUILD snortsam-2.70.ebuild 1024 BLAKE2B 1caa788ed5182079c86f0c22e6387bd0fe3f94eec3b1928259a339d2fdcbb2f035eb0d5c54a97c47d997804acb0edbc0b6285761f99ed4f61fb2e982166e562c SHA512 a3cd84c06d551f9eb179ab6f629ccff178c6e1f5f150fbe4eb2a528340b96402124f06f72edb0121c0cb8d6fb4235e9242d90cbf1cb53f6245977c86e0cc66f3
+EBUILD snortsam-2.70-r1.ebuild 1015 BLAKE2B eca02a1a262fd4af2a799f139d91e85237bded56f6dd8835eb9a11498680a0719a5dbd7f3bc4069f13b89a95a5899a25eae5cee73a204f14d8489e79e77ece07 SHA512 ae07e5f8c5e0003aca62caf60ea7f4c0e80d40a3c1246fc08b0df22395ddb5530010820c6d47f5e883036e1de34cd0af4c0cd4537d7c686316683c4ef1a657aa
 MISC metadata.xml 287 BLAKE2B f19164a15f9d23702c60e146fcf4397bdceb885848c02ca219c14841ecf18066f94c8fff216a6d84e5480545161ead3535bf56e949b037fe61e2dbfd0ab33c48 SHA512 ec0634c44ec4f2564927d307807236bf9e623c63ebb6a5a2c8fcf9dc68f0f871eeee52e04675aa30a3aef2d73cbef0446d0ca7675da82e62cc57a1fd593855f0
diff --git a/net-analyzer/snortsam/snortsam-2.70.ebuild b/net-analyzer/snortsam/snortsam-2.70-r1.ebuild
index f32b3f6db2ed..d900b52d06f6 100644
--- a/net-analyzer/snortsam/snortsam-2.70.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.70-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch flag-o-matic toolchain-funcs vcs-clean
+inherit flag-o-matic toolchain-funcs vcs-clean
 
 DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
 HOMEPAGE="http://www.snortsam.net/"
@@ -15,8 +15,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE="debug"
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	default
 	ecvs_clean
 }
 
@@ -31,14 +33,13 @@ src_compile() {
 
 src_install() {
 	dobin snortsam
-	find "${S}" -depth -type f -name "*.asc" -exec rm -f {} \;
-	dodoc docs/* conf/*
+
+	find . -depth -type f -name '*.asc' -delete || die
+	dodoc -r docs/. conf/.
 }
 
 pkg_postinst() {
-	echo
 	elog "To use snortsam with snort, you'll have to compile snort with USE=snortsam."
 	elog "Read the INSTALL file to configure snort for snortsam, and configure"
 	elog "snortsam for your particular firewall."
-	echo
 }
diff --git a/net-analyzer/sshping/Manifest b/net-analyzer/sshping/Manifest
index 82a757193229..e197773250cf 100644
--- a/net-analyzer/sshping/Manifest
+++ b/net-analyzer/sshping/Manifest
@@ -2,4 +2,4 @@ AUX sshping-0.1.4-fix-man-dir.patch 434 BLAKE2B 322fe43cf4d6d173d5907b46fd338703
 AUX sshping-0.1.4-respect-cxxflags.patch 510 BLAKE2B a835cb27b0198333069253be7379ceb1059835aeeb93fb7249f0b8ba678259b285feac3b1c80026f5a426b027389628a3f2c44bdf1af55ff5b84348a3570bd07 SHA512 ae3af5501085183e3b6e576700a1c4dd07a732dab28d5e5ca7029ef9114f24b29c3093fa4e5103b2460d5b30d86f501981bcb346d33de6c2108e5f9ad35777cf
 DIST sshping-0.1.4.tar.gz 3536227 BLAKE2B 30ee41324046d5ba5fb38a28acbf11dabadcbe41c506f7e4f51f2a5e95c015251d77ad16c534160eb1b83a871a5d25083b2481a5df91f5beb104279268838ae7 SHA512 16d72099b468c58d44835822a372f97863ba0b73282e8e64c20b0a0e6465e6f9efa634a85b0c7c13d03c470c547b08332820bf177f5bad59984270801ab74782
 EBUILD sshping-0.1.4.ebuild 676 BLAKE2B 757d088c49d802674fb1c78fdea41d65c6e42ac2fd4177eac98877856ffde84450af392f73cd01774c046becd682144026bd4799d41f0a9b5b4134c67a28c69b SHA512 f21e515ef966240479357694aebc634e0c614849c950d9600b189dd0b1024ec60b0b81b2a0104b8dc3246c38e9559add60f3615b3deca3ecb139c7086b16f81e
-MISC metadata.xml 325 BLAKE2B 1d538ca76c52ba242830935888ca2cfed4eff1097d337cd26c46e8b9d45a48b9c0a04c8bf7d0cf0832088fc38853ef29915d573e39d4949b524e964fb5f60252 SHA512 c3fab351bf7f77944b4d0d23ac33eea9d4e06a25a84eb0de00a7a5be9d5a3ddb7fbdb315f3166efc9a82f45be14d8b1b7c63cf457d8088410dc28ea8abb22495
+MISC metadata.xml 326 BLAKE2B d145766b60cd8766c9cc3ec5cbdc95359109009597aebc9cb4e0d08704f85e8c85c1a4b438901073677158c7bac0d9d6c271daf0e6aaabe8d0247ac18b626b10 SHA512 195c45e1f5298ff66a166ae8ab2d152ea31fe9913d7902953e7eb97313e1b5762babb495edb884a0fdfe8b9a6cfcc7749f6cd5b69a181511bacb9780e3cfb25b
diff --git a/net-analyzer/sshping/metadata.xml b/net-analyzer/sshping/metadata.xml
index 9a83c70d3479..338f017da09e 100644
--- a/net-analyzer/sshping/metadata.xml
+++ b/net-analyzer/sshping/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>ajak@gentoo.org</email>
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index cdd65808e2d4..6b4a11a9ca28 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,6 +1,7 @@
 AUX vnstat-2.2-conf.patch 318 BLAKE2B 23e9e546a860c5b708fe4d67e5f67e5274e269d5fe6377b8d7921124894a585b9de15c992ae91313940ddc83c79b44ca3d2c529fe2f827d749a70e7c1a4d9031 SHA512 1d28d47adbed2e51eb22b7ed4773aa9ae6a94f1f9ab9e06b5e2501ca59d7ffdbd83ba862194dd2148e4b897c3d28ad4f63b6eb79f8b6ad3e43b7eea931a685a6
 AUX vnstat-2.2-drop-root.patch 415 BLAKE2B c027b6056ec7ae26c64165e170bae3d5823e5017f2d7d25d88b5f030b91d7d60cd1a898d352bc706436e1858e8f2b003e9f4325acddd858f707abf75a9f20d77 SHA512 95e7602f2bd3c7277e4cdabadf4c1379a8217125c72cb2d343d010f8bf877243d3ac02b539e39ce830e3c48e9cdca6c7f35a73d6852d3f66e87a071986a78231
 AUX vnstat-2.2-run.patch 297 BLAKE2B 120045cff99c18d9be8e8a1655f8f043906c2c77563f139973f049c55d8b4c56558f2c47f973e036cb2c5071aafc24e6a6881dc1e13e196fd095ceb20677ff94 SHA512 c1e01bc7e71b56ac958c8071400f6f82c312a5f157333a3298596b85011dab5beb65b8dbc51a5f62aed68b56562266f7306e1cef82a69664b7486b148814db43
+AUX vnstat-2.9-conf.patch 1216 BLAKE2B 2d0ead56c02b4f28dc0f005f5b17276cd7ddc863ed55a0e8f19aba49cf3c3c5b55e226ebc764b8935a60e63dca75285eb74872966d9061e63c1d0731922e7faa SHA512 a99f5ab282054db944047022fd6239dc7043cbf00f19982b82d295b8f9d59efe4096815dc25271e3ecf582a5284587871a12b85b620201da2fdd5400395ae202
 AUX vnstat.cron 220 BLAKE2B de51e83326485932b6112035ec9d25440685f9d110a854eaa7963a54b50ce078d6199d3e491a7e3bfc686af1866e250f0b30eeb2c246424b9805fe11717adf1f SHA512 c901385f97323d1a686cee63d015eaf9ad38ed195a1c0e25dae671dd7061ebc918498684c55b90b0674960891dfca4b83f458174892c1b9efb48cd362fdb8477
 AUX vnstat.cron-r1 177 BLAKE2B 1f015b8db93decce2877ce3c431cbc14c9bb2dd798f0762e5a7fb98d1c42e59e9839ecb6feb25312320cc2fb6b1aecd9b97323a6318a10a4426146c07094f2ae SHA512 8074d65cf2f28bd5c02fe741dbe20f8404bc2e25b94b43d0bcc829ca088828227805caf9cb8cae020ae0a9370d68dc3c757fedf07d48c0fc71ba944f2da1cb94
 AUX vnstatd.confd 216 BLAKE2B d8ffd76612a5a8ce6b62ba4056c3bc91385c1980683cb487cc5fe2432a8d2e363fbc7ebe1e21d553a3b8ea04dea735342fe6f681320c98e8b41d51a869721c4e SHA512 d645817913d5b52e928561b3d6a0e869d8ae5db81b97af91c1ebfc6a8cd2df666c1653e6dc5f91c0a890033a89692f77eaf081c1cae5590446c69a70ea263946
@@ -13,7 +14,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.8.tar.gz 290644 BLAKE2B 21ff801ce6abb135c26eb937eadb447bea9fd3dcb2af123051edb9861e088d8fc217f84ef2d924fe8b480388cfc761d0259f8abb2312ae49c2840643787d49bd SHA512 207aa1699df298ce3008153701782634a96a239599d17a5b2f1fbb298a9cf8edb35298e2de1f4f93415ddf34e0bdb831f95984b47fdd7f89ecc6aeb4821a0afd
 DIST vnstat-2.8.tar.gz.asc 833 BLAKE2B 097d37e1916924901f10d09bba882357c0eb81cf71fca921dbc642735ec8c0bde97f7ab63cd3953718c21687e6f39099cf2446210f41f3698b39b74116c4c025 SHA512 d5448d68da92d434cc6a34e007002c81ed8d97e533bf99364d3f65b4125bd6f21fe2f6f6efb97775ecc4ba4afd09e12add71ae2299a2d990a7a9d0a591c32811
+DIST vnstat-2.9.tar.gz 300796 BLAKE2B 1671fe49f3add0087431b57aaa69d4c6280066a299e6899c00cd5bf6ec21380d1457295f884f683ebfb89959eea08a9d900e898a865e3f6ff2a82ecf354d974a SHA512 883f273c02f6d91478991d95deffba9d90457a1bb0b9dd818c01398365df97ffb72dda88299231d9076756192b05524b6f8820470c9caf6ee6a12e5914a82176
+DIST vnstat-2.9.tar.gz.asc 833 BLAKE2B 4dd17e02e6c0c5232354ea8c4dea1d86ac43015ac66c60dc227b143aa5352e5a1eb0870932662778b2350928b124e2bbc56dfa13cfe7c2fd74538d84c00f9b4c SHA512 bf57974afb028fef7ec311a15bb1dcf275f10b845c5512efe73711b622b5912c4de0ff0553db4152389d2421a468c888191eab8fca08212e164f997ad1e04778
 EBUILD vnstat-1.17-r1.ebuild 1712 BLAKE2B 012f0dbef26d826428b2ffb018307a0f8c9cbd1184e1593442fcea313c100240a536b01ea67be9f80b56b5e3824a6c6ce7b532f4b1580142d6fe3e312a94e024 SHA512 0f12a9c2e8176cbc602d19262441a8c5f4c5367bf0ce3ebb4812f8ba7796768acf676f414cf9d00fac2df8fd5105129e235be081669d6e13bb1026c38e233bce
 EBUILD vnstat-2.8.ebuild 1885 BLAKE2B 06fc6aa3980bab2cf4b99c21d975b71dfe2098989c8f11e269fccfb19430c686622fecbf51d293df867a426502817d64a5e6f4d6d875379792fafcfc8e87312f SHA512 96b4e42f6d52cadbdd5a8f7c18d80b34e6a355abd51ae4f3ebdf00c140120221a0afb26974c1a116f8539c15317925f2d61f6afa4739f9523c18b248ab0be8cc
-EBUILD vnstat-9999.ebuild 1892 BLAKE2B 73fc53b8632521227cbdad344734b826edb3a81114db96ace07d9b143a4fe35360cfa4679104f152b3c4d44073cbb0f4d1f7f944a6e6694f05fe14d7805c0dec SHA512 9429a556b3c5d711dfb03924238399ad9c15ad8c7185c989452fd224f52118a5441d4a89cbfc790422eb524b30c38520e204729b6b2979576f5e082214c26a8d
+EBUILD vnstat-2.9.ebuild 1816 BLAKE2B ea557611e19cf297123e5f8131eb78314a03bda208399be45d2659702657825724faa860ccebe9cdeff22b0f3a39254855b1fb9a91d96e3222bdfab165b3fffb SHA512 4386082d6bc0e960be897123629ebd2d0d3f9c43739692f91f2db1cbc5c4db494ebf9e55da568790f8a15ba15fa02732afddeb73d7ab4191d4990eaf784aba11
+EBUILD vnstat-9999.ebuild 1816 BLAKE2B ea557611e19cf297123e5f8131eb78314a03bda208399be45d2659702657825724faa860ccebe9cdeff22b0f3a39254855b1fb9a91d96e3222bdfab165b3fffb SHA512 4386082d6bc0e960be897123629ebd2d0d3f9c43739692f91f2db1cbc5c4db494ebf9e55da568790f8a15ba15fa02732afddeb73d7ab4191d4990eaf784aba11
 MISC metadata.xml 836 BLAKE2B f87c7da72d6510825ef2a437e02a0b29febae258debbf922885923aac4032eda5f122f29d6f0d0cf4c9876fdba09b030246f851083ae424ec1859073273e0e30 SHA512 21e9f14e00563ea52ebe117d0b80739566d043956c16cc95ad7a67bf9df6360e96ad700d2c739ab20ae2dc2c321432f5c98b67c5cc59853b1fdced8ca70fce01
diff --git a/net-analyzer/vnstat/files/vnstat-2.9-conf.patch b/net-analyzer/vnstat/files/vnstat-2.9-conf.patch
new file mode 100644
index 000000000000..d2cfa3977cfb
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-2.9-conf.patch
@@ -0,0 +1,39 @@
+diff --git a/cfg/vnstat.conf b/cfg/vnstat.conf
+index f404de5..d2bd928 100644
+--- a/cfg/vnstat.conf
++++ b/cfg/vnstat.conf
+@@ -80,10 +80,10 @@
+ ##
+ 
+ # switch to given user when started as root (leave empty to disable)
+-;DaemonUser ""
++;DaemonUser "vnstat"
+ 
+ # switch to given group when started as root (leave empty to disable)
+-;DaemonGroup ""
++;DaemonGroup "vnstat"
+ 
+ # try to detect interface maximum bandwidth, 0 = disable feature
+ # MaxBandwidth will be used as fallback value when enabled
+@@ -161,7 +161,7 @@
+ ;LogFile "/var/log/vnstat/vnstat.log"
+ 
+ # file used as daemon pid / lock file
+-;PidFile "/var/run/vnstat/vnstat.pid"
++;PidFile "/run/vnstat/vnstat.pid"
+ 
+ # 1 = 64-bit, 0 = 32-bit, -1 = old style logic, -2 = automatic detection
+ ;64bitInterfaceCounters -2
+diff --git a/src/common.h b/src/common.h
+index bb2fb56..f148004 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -241,7 +241,7 @@ and most can be changed later from the config file.
+ #define CREATEDIRS 1
+ #define UPDATEFILEOWNER 1
+ #define LOGFILE "/var/log/vnstat/vnstat.log"
+-#define PIDFILE "/var/run/vnstat/vnstat.pid"
++#define PIDFILE "/run/vnstat/vnstat.pid"
+ #define IS64BIT -2
+ #define WALDB 0
+ #define WALDBCHECKPOINTINTERVALMINS 240
diff --git a/net-analyzer/vnstat/vnstat-2.9.ebuild b/net-analyzer/vnstat/vnstat-2.9.ebuild
new file mode 100644
index 000000000000..f9877e7f008d
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-2.9.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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=${BROOT}/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? ( sec-keys/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.9-conf.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
+}
+
+pkg_postinst() {
+	tmpfiles_process vnstatd.conf
+}
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index 407176bb06b7..f9877e7f008d 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd tmpfiles
 
@@ -41,9 +41,7 @@ DEPEND="
 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
+	"${FILESDIR}"/${PN}-2.9-conf.patch
 )
 
 src_compile() {
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ab77410c26b7..16c004d600a2 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,14 +1,15 @@
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
 AUX wireshark-3.6.0-fix-no-tshark.patch 1133 BLAKE2B 05172dd9379550dd50e853e1cbc4c0a4958bdcecd62f9aa1148cfee73e42ff2ec73113cec102d885405235c62e539939d5b786975f74bdea201a07f0b2ada7bc SHA512 532c239c9d9e2a1eaea995b276361cf8e21a52c5577dd5de04ca1ac4d520a0a4dce61f08eef245b60c8162a7ad9a2cef7519444aa8ab0d900774932da1314829
+AUX wireshark-3.6.1-fix-build-no-zlib.patch 2586 BLAKE2B c38506c9ef34cc4f82c402a4d8bd9962bd89e8ebff3ca5d1ce732c9ad29f0c55a2c4f0ff21a75dbd1fe4eb2ee7384a1fc3c5fae4f8df6af8c6b5888a3011b742 SHA512 9b93e947053301c893afbbe17348cf87d81e0a6a99115f61965431cdf19a75be4241e56b2f5fa73d15d3fd7f6844473af5dad7022519efc1b7eb46c8fa6a3888
 AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B fe2ececd4a02530176725d62524fe000816f7f12dd58082d4966dfe7e5e0b90be669ed216c5a664f6496e74cb5dc5e4fb5beeaf513570ae503e3181692635563 SHA512 8a57d5279e9f3821b6ba3dceba89ad77fa8d0cf8cf421eab4d32e039497b429444c147b31abebd65b11b0b3ff73cf10d484480bcf0aedb206011819df8ab0257
 DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B 3e08d01f2d89f5ddd74c4e2215e6852f30c7419234a45b52a25aa9119995ec2c2882cc3993dce7941e6e73230eb4d295bf0785dda5fe8c3df99f9efdb1e42bfd SHA512 cfef2c3e56279baadb7f41a1f46fde9214a467972f69914c14a8153ea2f2adcb55832413bcaf7a3f8d98b4b62d0574f12144de6c06ff382b4fa8b071903993dc
 DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B 17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7 SHA512 7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
 DIST wireshark-3.6.1.tar.xz 39632140 BLAKE2B 49a7385946001a3b4a9890751cfea678c8aefcf8180e1a3008085a453d34e458d60d071975eeb585b92c6d9a210b732cc9fdb4fd952f1a9d74decad79c145fe0 SHA512 8b036d623010a5c4ece22de869847b3d999dac1c1e874e957c091a65c18351d9a1cc400828a70caf3c9f9900f8971dc585a5fafb7b08d446cd5d1d68938b0e81
 EBUILD wireshark-3.4.10.ebuild 7361 BLAKE2B 65370daecce9dffe999ef0099dea5aedd5e7b4a28689c0cfb76847be380ac1d7b0ff09433bc446c3ea0a545bedce0d8ddb259d7d55c2f4492ed4e8dd4f48aa9f SHA512 03549a3ae6ec4e00c16c4d48f016801a848aa8d7d7913c0800c8376d74b31117deeacf442cc901f5c938b82673eec887b00ff695414d9d2873388b79d0995c12
-EBUILD wireshark-3.4.11.ebuild 7458 BLAKE2B 363ae8e38119cc1fab1da1e3d6048648d3d2292ac884872b83c9cce88394b4060abb3f2014799975c4b58ec8e8556c49ee97fb034c6757ccd76c7525c04d85cc SHA512 d434cf292543408131b06c360718efeeee4062eded238708561d613cc7f5043b863c6bf7d02b8db458f9cf21147d699b5d86870117aaeec51097b603bb784e61
+EBUILD wireshark-3.4.11.ebuild 7457 BLAKE2B 05a0c93f8b8137ecb865ad4cc5f409685c79ce8dab0694e2d89b18bda7b8760e6162f5bdd4843fb8e5a21c69cfd62608b31fcb707636c8f6592c5664f64ccf55 SHA512 51cb14b1866282aa3bc83d697aaa999d1ab2a839fcf778483bd290f0366f9a105b5f2813c00f67779c1df60a443cfb7243176857e3ee5b91549447a941b75509
 EBUILD wireshark-3.6.0-r1.ebuild 7239 BLAKE2B 71572576c94fdd09acd7eef362b055e3379544533d153a2076e05cec90dbaec98cd152969507723c49ea7fcd5bdc4f46743ef6d334d2393aa46d4a55ec4962ab SHA512 498b426faf4c297950e8aecf71b1409dfb0de1ed2a8f345d386d6c7b91860ea11107637ec55a54a76a8872eb7cc4dcb8c54c69f420078252953fffcc9f085830
-EBUILD wireshark-3.6.1.ebuild 7263 BLAKE2B 7a54fbd432604ec99bfafc9b5d55b471f1fd79b6747d220c2da5756b0757deb2b99916afed180b84eb74212c9d7e67d4cb03f6b8fd270101bfd20840fb9f6f28 SHA512 5765ffe3414b42e2ae3a55246d0d1e98aed8d6bf97de8e6c868e93f2bfd9c498a85f346a58739a4e2c5d0716f466b804f13bc8267f1b3dd99e5bd59e87464686
+EBUILD wireshark-3.6.1.ebuild 7303 BLAKE2B 9458f05cd1c435afff4377ae7cadab850394529a86388d8ca7f3b7ce59668b69089fd87d50b6eb723d82386492160e43f720976473531c5851de5d6bce1cf391 SHA512 6f89417eabc853120ec481d1b6271832699571372417267099d8b8d487c66917c67df906d4617f76dd4ad0900b8eb75485e3b3adaeb759ed557b77ce25d03a69
 EBUILD wireshark-9999.ebuild 7263 BLAKE2B 7a54fbd432604ec99bfafc9b5d55b471f1fd79b6747d220c2da5756b0757deb2b99916afed180b84eb74212c9d7e67d4cb03f6b8fd270101bfd20840fb9f6f28 SHA512 5765ffe3414b42e2ae3a55246d0d1e98aed8d6bf97de8e6c868e93f2bfd9c498a85f346a58739a4e2c5d0716f466b804f13bc8267f1b3dd99e5bd59e87464686
 MISC metadata.xml 5328 BLAKE2B a030872929b89f0ead3794d8bbff20354b3a1b7a35aa7c3ce37baf5170ced9d39bdc665bd23e03e70d94550085a88224ec6cd260679b2d01501b272c595442d0 SHA512 cbadc90c858ef008b763253ef548e3634643b98bf90069b3fa34bd4f947d93ee8d4a2f3c6d9c7fe4c93b4169e34681e00905b28e64f8edcff02f23867d75b265
diff --git a/net-analyzer/wireshark/files/wireshark-3.6.1-fix-build-no-zlib.patch b/net-analyzer/wireshark/files/wireshark-3.6.1-fix-build-no-zlib.patch
new file mode 100644
index 000000000000..3a935ce89969
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.6.1-fix-build-no-zlib.patch
@@ -0,0 +1,82 @@
+https://gitlab.com/wireshark/wireshark/-/commit/5dc11653a364975e5cc9a4a994d9d88e138e8385.patch
+https://gitlab.com/wireshark/wireshark/-/issues/17899
+
+From: Guy Harris <gharris@sonic.net>
+Date: Fri, 21 Jan 2022 15:04:28 -0800
+Subject: [PATCH] Fix no-ZLib builds.
+
+Don't use ZLib routines or data types if we're built without ZLib.
+
+Don't support --compress-type=gzip, or a gzip check box in the Output
+pane of the Capture Options dialog, if we're built without ZLib.
+
+Fixes #17899.
+
+
+(cherry picked from commit 125f5cbd881c2e1236d968a3e8fdcf5af2606e77)
+--- a/capture_opts.c
++++ b/capture_opts.c
+@@ -986,9 +986,18 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
+         if (strcmp(optarg_str_p, "none") == 0) {
+             ;
+         } else if (strcmp(optarg_str_p, "gzip") == 0) {
++#ifdef HAVE_ZLIB
+             ;
++#else
++            cmdarg_err("'gzip' compression is not supported");
++            return 1;
++#endif
+         } else {
++#ifdef HAVE_ZLIB
+             cmdarg_err("parameter of --compress-type can be 'none' or 'gzip'");
++#else
++            cmdarg_err("parameter of --compress-type can only be 'none'");
++#endif
+             return 1;
+         }
+         capture_opts->compress_type = g_strdup(optarg_str_p);
+--- a/ringbuffer.c
++++ b/ringbuffer.c
+@@ -124,6 +124,7 @@ static void CleanupOldCap(gchar* name)
+   g_mutex_unlock(&rb_data.mutex);
+ }
+ 
++#ifdef HAVE_ZLIB
+ /*
+  * compress capture file
+  */
+@@ -200,6 +201,7 @@ static int ringbuf_start_compress_file(rb_file* rfile)
+   g_thread_new("exec_compress", &exec_compress_thread, name);
+   return 0;
+ }
++#endif
+ 
+ /*
+  * create the next filename and open a new binary file with that name
+@@ -216,9 +218,11 @@ static int ringbuf_open_file(rb_file *rfile, int *err)
+       /* remove old file (if any, so ignore error) */
+       ws_unlink(rfile->name);
+     }
++#ifdef HAVE_ZLIB
+     else if (rb_data.compress_type != NULL && strcmp(rb_data.compress_type, "gzip") == 0) {
+       ringbuf_start_compress_file(rfile);
+     }
++#endif
+     g_free(rfile->name);
+   }
+ 
+--- a/ui/qt/capture_options_dialog.cpp
++++ b/ui/qt/capture_options_dialog.cpp
+@@ -486,7 +486,11 @@ void CaptureOptionsDialog::on_gbNewFileAuto_toggled(bool checked)
+     ui->stopMBComboBox->setEnabled(checked?false:true);
+     ui->gbCompression->setEnabled(checked);
+     ui->rbCompressionNone->setEnabled(checked);
++#ifdef HAVE_ZLIB
+     ui->rbCompressionGzip->setEnabled(checked);
++#else
++    ui->rbCompressionGzip->setEnabled(false);
++#endif
+ }
+ 
+ void CaptureOptionsDialog::on_cbUpdatePacketsRT_toggled(bool checked)
+GitLab
diff --git a/net-analyzer/wireshark/wireshark-3.4.11.ebuild b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
index 509b6ba57993..d1c09690a523 100644
--- a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/wireshark/wireshark-3.6.1.ebuild b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
index 98c2b9131b7c..460b8e001f30 100644
--- a/net-analyzer/wireshark/wireshark-3.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
@@ -96,6 +96,7 @@ RDEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+	"${FILESDIR}"/${P}-fix-build-no-zlib.patch
 )
 
 pkg_setup() {
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 6af445720ce2..9c3f61749167 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -252,16 +252,16 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
-DIST zabbix-4.0.36.tar.gz 17619115 BLAKE2B e64cc78c589cf42dd72e20be18a723fbcce8890de0ccf48d2328b744533c3a9b8d4cb7dd93b5e7b4f7f31c724b2aa797a70d5e6eb8db53ece9ad9a39edae4fb4 SHA512 39ff2a58ea189b75891bf59ebb0e4d85c97595f9754684622f4d3e3f5614ca38408ecf10e62c4055dc1bde3fbca621e41152bb7006c539fb88ca40b1969c49d2
 DIST zabbix-4.0.37.tar.gz 17552391 BLAKE2B c5f3b200e8dda2b4a961a78a3ba8cd97a6e07744c4e16acde3a740559cb70649660b5652d36cf42e87f28d03e14803c4efe9e585583834f7a765fcbf0e5953b9 SHA512 007e7664a6fe1e9b3e76f95c5cfdb9744a27139d243b6fcb78c2e84f01ccdc788130f824514d29f1557724761557e459924d22cb33bb35fe740b5fdc6746ef0e
-DIST zabbix-5.0.18.tar.gz 21377940 BLAKE2B 4143dd2b5c4b04795e2f1b43637e541e3108abd19b489cf720b8256cc3d992bc20e2693846ee53d138df22b1404f6cc86dcb22f1e0805dda444172f18f1c48a7 SHA512 84a6684e413bd9180bab3e19a286c5113e41dab036fe76cded4a7ffeb931314648260c5e379ddea07cfb5a95b05e630a4c5952b5f96cfe03a5022e61f6da8095
+DIST zabbix-4.0.38.tar.gz 17558387 BLAKE2B 1ddf27d76734128ddd197eb9dffeb59018282464a7322973dc4102992c0ade003d4d0291194f5b5a487d83a702917d6f0036636e56acc424bd7a7d6beb3f787c SHA512 0d38a74336c9e46b3f9985aca3508312dd5b15affeadee3497ebf8d5e59b4fa7b99ff28819b01878cbc5c9c304c1992a6a91d73f35bf1a333ae2ee561e0d7e1f
 DIST zabbix-5.0.19.tar.gz 21367685 BLAKE2B 4e6b52d4ace766f700894d1eb6c7adf8e13ac72fe2534a48625302ffa6aea02734f8e81ee781a1d1aa0e6e375428919609edfca6094f17912123a7ed96e22af0 SHA512 b7223c656f8830e302ccc6321ff19e580eed199355ca9070ac2b59375e0794d17de1dfa4e1600ef6ac5a72e8abd2b80191b2f58fa77f25096dee52e6e40940b9
-DIST zabbix-5.4.8.tar.gz 24431613 BLAKE2B 82279ba2a4515603d50083a391ea2c9d230dcc7459d62841cf003eaa092012cb2e5b5ba7c3a5eeabd4df27a8d5b6e97a90824fb119ee078864c6bf06cfec5cad SHA512 1812142cc949a2886cd1edd4d369934022aa5e89ae31b67641b7263dfbc5d3ee6f99a20a51e5b44e4af5719160f728766c5546e74c8bf9b0cf303867d20fba11
+DIST zabbix-5.0.20.tar.gz 21434290 BLAKE2B 8203d9f8831c081af05fa306ce3363ea3d1afd72587459a941e2a20de27e97dce21e34b59e21884f87f6238469c2293dad9e6e5436a9ef82c0139a18a4b0c206 SHA512 af625ee69926b1f0860d4e5e5f4348b3630c642027f5f08f876207cf705d46741c21aacbdde1367b8014c705508236281ba8556700de43c1ccf2b7a9b7f68390
+DIST zabbix-5.4.10.tar.gz 24510838 BLAKE2B 37e8561e031b9267dbfeb786da7d88487142262c3f9063e83b2faafeabd88baa1a0f2e7ffa333d2e29c1b11e09ca995f42442aa60b0b994617b276152d46590c SHA512 452513c56db1778d49a32543814ed83836b480047ebc747e588b5cea8f9b199650824b9ea2042695c5551a81f1f3b2e8d98d0f658003f483bf8edf8ed5427c48
 DIST zabbix-5.4.9.tar.gz 24382685 BLAKE2B 3ec6fac5a7dbdf6b0527e7686a57d3d107be5ec4fb9f5a36254199f9e1ac656459b6582b2b8968e9d8c00a9d1167d03df9b5854584070b74ff5ef8518798a21e SHA512 e2e0dd01b4c2a571f554a60d2b88023ff209111a6e71f2f6dd04173ee2a1c4f31a2a0f19f10f73a43e40634351eeaab0c0e98b0b6a020f39af6cabe7f764409b
-EBUILD zabbix-4.0.36-r1.ebuild 9376 BLAKE2B 89acf1beb09c5bc021ab3a52def9f57428f9eecfe01627f0833c8b5d63a6f89dd9a4753077e2d1515dcccde6b920344fb55f0dbad443647938458b8d250f7ca9 SHA512 08d7f16b29cc76a472d8629a1cc3cff34b310615c33f18ab95ee69065ac4fb1f004cd2be2135234010d9f76f33f38595eab78c7562aff85054843bcfa7f7fa8f
-EBUILD zabbix-4.0.37-r1.ebuild 9377 BLAKE2B ba9b49e4c921ea8b412ad4fe914c5487def605efd517b3a7fecf921c22e44fb4e84efea8aa397b0b56b793faf8dc48b028f14a999ee32fbd30766e7b74482593 SHA512 70d25ca38acbe96cbf7421a58ee3c2b66ef1c712335ff413a492818248c6a7c49897476d519f8ebbb7435d453d0ad0c3bb333f3af0594f7662b6de3ce02d34d3
-EBUILD zabbix-5.0.18-r2.ebuild 31286 BLAKE2B dd9e08873d39b8af81de65535d1109baae7b7bd5aea7252c84aa8cdae50bbb7950957faee21fd66ba93ef9bbcec0b31904509a3a405974f91a984f9c0bb65c48 SHA512 441ff45fe00f177aee0b07b758ecb4b0a4af698a404e8abc7741f124d6f269028c64c728c05e462f99815fb86516b1940008aaa235d6b0d62248b2cba2867765
-EBUILD zabbix-5.0.19-r1.ebuild 31287 BLAKE2B 4b7533425a47a46c878c05f0e001a32d624f519bdc2993f84ecdcf120bf7ebfea821c9108d319b84cf612452ec540e77b9db1522c4c31c6b57265fa4518a4b8e SHA512 e64c2bed1f3e7f8264b2d6a0eb984fe3cc6323efe98a31c93484bcbd7b3d39d52a3abb33a66212de52c1a59ce806377863e77e3801b738aef3b11deb90ca77f6
-EBUILD zabbix-5.4.8-r2.ebuild 33676 BLAKE2B 960c6110ee104fc86b18025286741731c5e8c09f35f92edfb863b7064ec6b490421d52984d4943b4082a46811f976cfec9d0b7c387d0489583dcc7479be71340 SHA512 6835393b32bc6d3b2d6ce6d3bac10cf0d33aac03d281d4297653d91b08dadef3dd0cc7d1de9ff1f2a41cf8955c137f8638023a0911de19744c880364cffdcb05
-EBUILD zabbix-5.4.9-r1.ebuild 33677 BLAKE2B 2bcc7017b2bc2fba99ba7b0f72273562821027f5ba5e8d12ab26893c988dd7535c8844cfdf83c3ade88b5dd079c360797200848407b20ef829519c9b25f73df3 SHA512 516a71a06c9c5a2ba140639623832912700e5b886dda05bd6e5a0a1bbd16663db890da0de32b82ef08e8814df888e2b5da8e263afbe411da969b77885f870c8d
+EBUILD zabbix-4.0.37-r1.ebuild 9376 BLAKE2B 6de3ede88eee61034b75748dbd5b7fbfc7e73bb441f40b267f38d763671a9a9136e5ebad66009b9e5c2219431373b1382051cb963a01862c5969c303aba9184b SHA512 be8aeb179a403d46ec060557b51676906ec2e4747cff286ddb4a3c36d5b6e1267cac9cb38ae71e30e1ea641980a5509d7f83c5813acccb5c0f34bb6d7a5f7db1
+EBUILD zabbix-4.0.38.ebuild 9378 BLAKE2B f1881dc4a7ecc9c8f25a66d566092e8ada4d74c21cb8e11283b82d74355513a1ae7a70e391897ed3f04051f5b1da12a0e3493a3999b631f2fc7c9df86b35cf03 SHA512 114f75c7c8b4672042b58b8f1629d6d72b1aa36b9d2c02097a0836d03fbb134605351d8aaa3eca7e9c04d56620b7d4bb55acbfae4342a50f9dc76c9f2d6bd812
+EBUILD zabbix-5.0.19-r1.ebuild 31286 BLAKE2B 1f04ff0dea70bc8ce6843b1d9a6f133c9a98c52bd18ccf49a4c3e9dac9af39c257f8a9ed3671d57045b73b518c0234f554f1f34b9029e698656422fe70dae376 SHA512 27d0d0865a7e7d0316a847a2f08c312ed578b1531234d55aec8751ef688d8c5bc2abd2171b97dd2c433d1591c6a23875f45501d82a75d45a5f8bb875b9b9d613
+EBUILD zabbix-5.0.20.ebuild 31288 BLAKE2B 58520ae4c590267516c70b445c02b802c0f82420d96fff21c3a3e137e6146e7892fc1d830bb2e736a79b6f358ddebc4c4eaef5a76f9baeb478825cde70ddffd2 SHA512 c38a1bd7b088231e0ad183ef924fc05dfd6fea614e5d686b2235dd3ff3ea22e04dbfc2ef31ce82ae764f5fcab561ad1c3563df8d7be8cb5aeeddac32d9390d2c
+EBUILD zabbix-5.4.10.ebuild 33678 BLAKE2B f0c8e81548005609e5d7d9eb9cd637fe672850d141d6a8987a089dcc5803b5a4261a87a32f815eb8886aaa05fe1230afa3452b2ba570313262c0dbbc86a99e03 SHA512 6ec314195482e6c42760ff913e1d00436cd8542d61f70c11d5dbfa56e2c6df14005d1d7f629c1cf8805a076b70dccb6fbb5c2638c821c2e6446b3847f9458b5b
+EBUILD zabbix-5.4.9-r1.ebuild 33676 BLAKE2B 46a40006b0d39af0a19699236fe94c59b40d6f0db19e165af650a3325a178b731868a6930ceb92930f5bf2d630ac0293b74e5c86c513015ce181d05542e5b61e SHA512 c16a6092bd660812a20e20e5f7b20ab18a7284438da96eead8ed055d303cbc6baa1b49a73bd8987d9ae97f9846b1f8ed9429dacabda33282053b4817ef86ca95
 MISC metadata.xml 1633 BLAKE2B 04e5d43c20e34d9a85139d7ff31e446a4a12cd40730b364ac2cf9cf5d7f913d2bf13711782769670e94e8ac184943a3e58d6392565e2ea9726b0bc0dd179e356 SHA512 2524cf9b092f29e457b39b12a13ce21c9c2e1de912deb147563e5e936991940f26ed93cf0de7213c784196a71b3ea281d7b76e16983fe27c55862fd1d77bbb7d
diff --git a/net-analyzer/zabbix/zabbix-4.0.37-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.37-r1.ebuild
index 81ee2d775f2b..9dc2fb3e59fa 100644
--- a/net-analyzer/zabbix/zabbix-4.0.37-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.37-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static xmpp"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	ssl? ( ^^ ( gnutls mbedtls openssl ) )
diff --git a/net-analyzer/zabbix/zabbix-4.0.36-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.38.ebuild
index 2e40b615546d..3e38c3cbb0e9 100644
--- a/net-analyzer/zabbix/zabbix-4.0.36-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.38.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static xmpp"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	ssl? ( ^^ ( gnutls mbedtls openssl ) )
@@ -266,12 +266,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-1.2.3.jar \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
 			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.3.jar \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
 			src/zabbix_java/lib/logback.xml \
 			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.30.jar
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
 		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
 		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
 	fi
diff --git a/net-analyzer/zabbix/zabbix-5.0.19-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.19-r1.ebuild
index c943193d86ca..f9f281b0e09a 100644
--- a/net-analyzer/zabbix/zabbix-5.0.19-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.19-r1.ebuild
@@ -235,7 +235,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
diff --git a/net-analyzer/zabbix/zabbix-5.0.18-r2.ebuild b/net-analyzer/zabbix/zabbix-5.0.20.ebuild
index 4342e5657f57..0969478dcc2d 100644
--- a/net-analyzer/zabbix/zabbix-5.0.18-r2.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.20.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GO_OPTIONAL="yes"
 # needed to make webapp-config dep optional
@@ -235,7 +235,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
@@ -511,12 +511,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-1.2.3.jar \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
 			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.3.jar \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
 			src/zabbix_java/lib/logback.xml \
 			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.30.jar
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
 		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
 		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
 	fi
diff --git a/net-analyzer/zabbix/zabbix-5.4.8-r2.ebuild b/net-analyzer/zabbix/zabbix-5.4.10.ebuild
index d9e19c691037..c5ea8a8848dc 100644
--- a/net-analyzer/zabbix/zabbix-5.4.8-r2.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.10.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GO_OPTIONAL="yes"
 # needed to make webapp-config dep optional
@@ -260,7 +260,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
@@ -535,12 +535,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-1.2.3.jar \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
 			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.3.jar \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
 			src/zabbix_java/lib/logback.xml \
 			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.30.jar
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
 		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
 		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
 	fi
diff --git a/net-analyzer/zabbix/zabbix-5.4.9-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.9-r1.ebuild
index b39cdf2cd65c..c07b19ad752b 100644
--- a/net-analyzer/zabbix/zabbix-5.4.9-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.9-r1.ebuild
@@ -260,7 +260,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
author	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
commit	fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree	3bfce096b38a9cea8eed13fc70c1526c456e9abd /net-analyzer
parent	2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)