gentoo resync : 09.07.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
commit: 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree: 8c816148bcbd22757d892089c989ae614eae4f5a /net-analyzer
parent: 0f558761aa2dee1017b4751e4017205e015a9560 (diff)
40 files changed, 1496 insertions, 176 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 0ed543ab1187..6357b09d04c6 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest
index 6c1fbcf4fdb0..59ec0f952f9b 100644
--- a/net-analyzer/gr-fosphor/Manifest
+++ b/net-analyzer/gr-fosphor/Manifest
@@ -1,5 +1,5 @@
 AUX gr-fosphor-0.0_p20200131-htmldir.patch 285 BLAKE2B 111862d2e2f2cccd8c9d2e182f7881f2692c31455aae55ca5e8ab3f34c8d4a507c39681ec0f914f9fbd4fa1dc6eba0fcee34957e94f478b8ae280d40cc14a2d3 SHA512 d814f8bc0ff7023a4a4df40346f3eea8835d874de2f4e05175a79b14580851f560b51fde0506ad3f6eb077bbf57433c6f406cc7269c6f8dee92e80fd169a2e22
 DIST gr-fosphor-0.0_p20200131.tar.gz 244685 BLAKE2B db01b9df87f377db2adaaca3d1542f99eaca9f73303c71ea9add1845307704817c8930736d44462191476b4cb935a18401b7012a1ea6465bdb5cf3624c182f2c SHA512 7bf2758f98ae7d088256060878fbf33966880ddbb7fb132da00f9c2530d84b91a6385eabbf61ff40d3002d3a42eadf5e2d78b8c797bc93501cafaf8a7bdde7ae
-EBUILD gr-fosphor-0.0_p20200131-r1.ebuild 1319 BLAKE2B 32917403fc6252e9aad25341425c649bf837f080a7527f64b0f169d239855067add9715a2b84c51509fce61588b4c0e324e3c80924a7ee752922d06bc47285b6 SHA512 e5e460b40c2d0839197df8f11e8d73b23857ec752c45bc017bb5304807001aa7c31a7d99bbd3e05904dce34c1941e156dab33301e709158820ebffe1d637d8a6
-EBUILD gr-fosphor-9999.ebuild 1273 BLAKE2B b0054195c8698e5216d772bbbcf3a2fcfb91130fa6c90dc46dc6872056ab06cf555b82bd3422451282906c79fdc66ee8dd539daa9b0a94ea559d9144c8d72734 SHA512 38dbc67e32d38ee0a3b37faf584c29fe3fbf505a23b6337e5393a0002144ddbf74f8ffadc9ca3e6a1e7615449633a4dcce7f38fe1f48f70834fc84824d591a8b
+EBUILD gr-fosphor-0.0_p20200131-r1.ebuild 1320 BLAKE2B b00a1cc5c5f1d7505290ab93242ca028336a29f0831691f9cb8e4b5c33130dfd4ce2c598a8a1d7e8f8ba60c1fc46a994ec172e0d4dfb3e1151c1bc0abc18aa6c SHA512 9abaa23e2f4f3b3077b32d24ab93ff508b8cd894478e860157fb7fe01bd126385b2572ee98a27008f542d00a6fbd381b49472ad1f28cef6c93b4fc24fbd04981
+EBUILD gr-fosphor-9999.ebuild 1274 BLAKE2B 9c420d39d7ebd6f8001a7eab0eee4702e4698e37947bd8f8867162c230e55e69430845a50099dc72f782ecca82d0b3af5240a5cd3bf8881a148cf1f6aaa378b5 SHA512 febd9b645b3aebaf31fc05201b352cb6174de0bb2fcfb782ffa6fc0678127752eaf30d2b8cf6490191cf6a71142b2688572e359f6e2d4302d877e7a91dc73667
 MISC metadata.xml 309 BLAKE2B 37919b71ccbab01f305f01b618c18d1eb9ec5073ea7498daee75016faa65241d6ec835cad89d3a143650d27164e04091fa3f72d028ad6dd2d8634d67656e37af SHA512 3a0cb1788a6c420b95b9ddb283d3423749254059064f50c8f7436dc1a928657e43ae732ac54a5edfab03d5c30d572b2947a04b84709b435836664013d51e35e3
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild
index b26a6c758c2e..a95757d28db1 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index d02fe4973709..efd198c13e93 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index ad7cba0188c3..43cf39d4d1cd 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,5 +1,7 @@
 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.10.tar.gz 1192965 BLAKE2B cd60e38a70c124c2be53c12394e994f4772a3fcdbae5fa8f26097e79de3de326ec90d5ee23b4e2e8c696e50d7d7ba897b6bb441a1fc7692d1b6e581c11a3da04 SHA512 fb0a2ed5cfa4a8c12bbb7f64f0c7846b439d8094a0b415e5750fe175bbcc2c047fccad50fdeda7696aee0ed9532eb75948f3a376ee34e188cacf226c02bbb3f9
 DIST graphite-web-1.1.8.tar.gz 1177214 BLAKE2B 20e058feff0fa7f12393cfd41acca7cf05ff6a3995aa5f6547764fae3b8824e8b424efb8d5d47227eb2b5591ae6b45ab960da30f810acb4f1fbd0b9ae78ec47b SHA512 4637a541e61f56c1ac69bf18e7eab88ecf93f59099dc3e8022d8bf8fb1b204672bc0a1b5302e5031701714db17aabb316ba40f4cfabb2bf4fb0dedb8f412e4a9
+EBUILD graphite-web-1.1.10.ebuild 3178 BLAKE2B 9428840b3f83a4a14f2d8a069248b9670901e2daa028a7362b35409f4c6737997a00bb5d5208b2240d8217be2c4745e966ad257663b992b5508ceaebe3dbb5f2 SHA512 f9b9d7de7066370db98e9222924fe0ca1b8fac9530f60ab484de37744909c22eec9ef558afa2103bb370a1d34b7060a8c46a53e71f545dbe1d9ce5b11e4c5dc4
 EBUILD graphite-web-1.1.8-r3.ebuild 3273 BLAKE2B c8d999b3ad12098e5b85961a3750ab013477d4c4b77e09868ae0640ccdca9bf5bcc0febd025e8dcbee75e7c0c4bbc4fbd5e695885df7b6018edf36e2644d824c SHA512 57402ecd2065bbe1a4878c63ee08008a442acfab6d508fd3331b8957a5d097da103a04ee21eec06b8cba678751e07aa84907031d84d68fa85a5a8df852005e8d
 MISC metadata.xml 593 BLAKE2B 35159475d570570bde9acc2dd8d6abdf742d03ced88259125cc474f9ea2b9bfcf80c64da1dd44bcb69e55390d72c11c8aaa3b947f68571940c3b8676e6024387 SHA512 7a07c214a85f09ded5ecb5a353d96fc746c5c67f5c71f7539647651fd1519e78e1a3887a4865e9dab59d9804a9b0d801cc1ee72e0fd7225fe75273790e31e28f
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild
new file mode 100644
index 000000000000..ca42298c3bf5
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_SETUPTOOLS=no  # export USE_SETUPTOOLS to activate
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Enterprise scalable realtime graphing"
+HOMEPAGE="https://graphiteapp.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+carbon ldap mysql memcached postgres +sqlite"
+
+DEPEND=""
+RDEPEND="
+	carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	>=dev-python/django-1.11.19[sqlite?,${PYTHON_USEDEP}]
+	<dev-python/django-4[sqlite?,${PYTHON_USEDEP}]
+	>=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}]
+	dev-python/cairocffi[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	media-libs/fontconfig
+"
+
+PATCHES=(
+	# Do not install the configuration and data files. We install them
+	# somewhere sensible by hand.
+	"${FILESDIR}"/${PN}-1.1.7-fhs-paths.patch
+)
+
+python_prepare_all() {
+	# Use a less common name
+	mv bin/build-index bin/${PN}-build-index || die
+	# use FHS-style paths
+	export GRAPHITE_NO_PREFIX=yes
+	distutils-r1_python_prepare_all
+	eprefixify \
+		conf/graphite.wsgi.example \
+		webapp/graphite/local_settings.py.example
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /var/{lib,log}/${PN}
+	docinto examples
+	docompress -x "/usr/share/doc/${PF}/examples"
+	dodoc \
+		examples/example-graphite-vhost.conf \
+		conf/dashboard.conf.example \
+		conf/graphite.wsgi.example
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--install-data="${EPREFIX}"/usr/share/${PN}
+
+	# copy the file once, to keep the timestamps correct, #808863
+	if [[ ! -e ${ED}/etc/${PN}/local_settings.py ]] ; then
+		insinto /etc/${PN}
+		newins webapp/graphite/local_settings.py.example local_settings.py
+	fi
+	pushd "${D}/$(python_get_sitedir)"/graphite > /dev/null || die
+	ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py || die
+	popd > /dev/null || die
+
+	python_optimize
+}
+
+pkg_config() {
+	"${EROOT}"/usr/bin/django-admin.py migrate \
+		--settings=graphite.settings --run-syncdb
+	"${EROOT}"/usr/bin/${PN}-build-index
+}
+
+pkg_postinst() {
+	# Only display this for new installs
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You need to configure ${PN} to run with a WSGI server of your choice."
+		elog "For example using Apache, you can use www-apache/mod_wsgi,"
+		elog "            using Nginx, you can use www-servers/uwsgi."
+		elog "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
+		elog "See https://graphite.readthedocs.org/en/latest/config-local-settings.html"
+		elog "Run emerge --config =${PN}-${PVR} if this is a fresh install."
+		elog ""
+		elog "If you want to update the search index regularily, you should consider running"
+		elog "the '${PN}-build-index' script in a crontab."
+	fi
+}
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index a01b09bff498..055b6df26c11 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,6 +1,8 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.13.3.tar.gz 7529976 BLAKE2B f661919b0a7b420eba663d6cb01f2223c15b2be7f4ad649e1e09b7b4068d1122d63c6baac490ff3a0bd808066b759138748e70de364eea4d89f560168a448c72 SHA512 818eb565c6d46bfb538d70b9e33bb7424ab6fb98289da9eb947ec1f36b7e3b0e3869db789acd565b5e5b3d8b4819fe991000f4df362e28686dd9e3394cec3743
+DIST icinga2-2.13.4.tar.gz 9662432 BLAKE2B fdae71d081a646b2f70d768b43c56602221d585997a1fca96d2f6c30c27eb6344a443a1d12981c94542fdb77443b40be3c4ec87796a82bfcab1b53fe6b46e0ec SHA512 454eb03587c66de2697d0d604fab37ae4ce243653357cd3295998ab9b58287acefc27876e06e530b8bd6bb4d96c1289a1f05ef25f0b19573123a0cf1d99b5cfb
 EBUILD icinga2-2.13.3.ebuild 3992 BLAKE2B bd30da34efda8d4462a26c9341143d1448041dcf3bd478e9e40197ac5de8e75584bec8dac41a2c0eafd1e52243cf4a60c266052c715470ccbf640e13e823aa3b SHA512 fcff3842f02f39e902b1fa16a8fc5603fca0d021f9d17a137248c85b72cb3648df0869936e838b549889cfa61fa397e7dcf2db9ad502f854185e09a8c702ceb3
+EBUILD icinga2-2.13.4.ebuild 3994 BLAKE2B 1f6c3f53948145032d5f40342ddc0a48b39dcaf646f56b6d5ba38ff3b1ea8a1fc6f627a6e529ea2af5d157187491b0245ded84bc023463bc3f7866abbdf8c8e7 SHA512 d5f1bd8198b1ff7336a5ec23c77b5538e155769c4f901b1be333899090f869e51f7d3d451ed654cf78bb42790f300f07242241eec624d0173e24b26f30638655
 EBUILD icinga2-9999.ebuild 3994 BLAKE2B 1ab39f8060c4d052b299d79c4481edba30662e69754cc7595d267e3a68c743115341ca3ec0cfbc0e3f3d4122f27de9bf58b02ffc7942b5df2c6e18fde7f404ea SHA512 b0189c1ea6d4eaffdd0a9f749fb323f31810f51e5e7e71d951df7ef3b0aea9ec5e07f508177655692f853385c50c01a869a3608c590d15140edd82ac7d2364f2
 MISC metadata.xml 871 BLAKE2B ffd6aeebf603ed90bfa4cc34d557e947e435d204c84e062532cedecd3e811710d9bd39f9f43dd70afd575104be5661b5f7e7de3f79365a961d45f61835a602c6 SHA512 3ca0916252061c1705d194066a30a8fc19cfe4341911646b7ed797e131e02f40eeddc91c2449a5b049888be749d16a5103e70678e5d6c1604db0ac3fe9f4e0d7
diff --git a/net-analyzer/icinga2/icinga2-2.13.4.ebuild b/net-analyzer/icinga2/icinga2-2.13.4.ebuild
new file mode 100644
index 000000000000..d9cef157f92b
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.4.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.66.0:=[context]
+	console? ( dev-libs/libedit )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl:=
+	acct-user/icinga
+	acct-group/icinga
+	acct-group/icingacmd"
+BDEPEND="
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DICINGA2_RUNDIR=/run
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+		-DUSE_SYSTEMD=$(usex systemd)
+		-DLOGROTATE_HAS_SU=ON
+		-DICINGA2_LTO_BUILD=$(usex lto)
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres)
+			-DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+	if use mysql || use mariadb; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/run" || die "failed to remove /run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners -R icinga:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests
+	fowners -R icinga:icingacmd /var/lib/icinga2/certs
+	fowners icinga:icinga /var/spool/icinga2
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}
diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest
index 1663cc94a087..fa351dc64351 100644
--- a/net-analyzer/nagios-plugin-check_raid/Manifest
+++ b/net-analyzer/nagios-plugin-check_raid/Manifest
@@ -1,5 +1,3 @@
 DIST nagios-plugin-check_raid-4.0.10.tar.gz 54895 BLAKE2B 6432624de419fca2d376362e5d13031272b6feeccdc6202b8a7eec92ab1f6c362ab88f9c912b10695c34347388dd154b12757a8b4268d30c0436589da060d5cc SHA512 1b8c353fbd0dff6fea5311c4149af16b1e1a5778794ef0085dcd8ee18f196579cca0b9f8c1ecef51f3ee36665aec6069f64ebe4d2e565bf7223bed59f2de5ee1
-DIST nagios-plugin-check_raid-4.0.8.tar.gz 53803 BLAKE2B debc312ccf688c6ed4c4d89d77efbf454ae030260741277f1f10966d28348a317255a69a932ceba69300c37b98448ebb3ca3a0b463d64814a4ca11043bdc5850 SHA512 237cbe798aa6c65b4bd6b9c9e24923e172d3d62c50afd7df23e2b6c8888041368025860edf5f826a77c6858e6312bba05225f0e20787e1bb579d833950b324ee
-EBUILD nagios-plugin-check_raid-4.0.10-r2.ebuild 2061 BLAKE2B 31e1011b3058601fbfebec0b964ad7359000260ed50f2acae5ff4581306047e8e707b8b6931c4cae0bffa1d30ed92cf5ec3af93346fbbcd058554ad7c118d8ab SHA512 87ec9af55255d410cf74ec007603e859cdd0f05db4698c6b01caf97dbe6710c305749ba77a3d3c0c1dbbb27eaf33d751035cef18ff36156cca2df4b64fa8244e
-EBUILD nagios-plugin-check_raid-4.0.8-r2.ebuild 2061 BLAKE2B 31e1011b3058601fbfebec0b964ad7359000260ed50f2acae5ff4581306047e8e707b8b6931c4cae0bffa1d30ed92cf5ec3af93346fbbcd058554ad7c118d8ab SHA512 87ec9af55255d410cf74ec007603e859cdd0f05db4698c6b01caf97dbe6710c305749ba77a3d3c0c1dbbb27eaf33d751035cef18ff36156cca2df4b64fa8244e
+EBUILD nagios-plugin-check_raid-4.0.10-r3.ebuild 2014 BLAKE2B 390162524585e1449c130e05b6cd3a56c6191aae571dafc90a9451501af8aeae9c872a0f466f331bf2e26a91c1db75010d17012c0e1fe629270847311abfb3f7 SHA512 33794a090a2834fe75374532286f18b0d2992a2b11be4664e1a1019ac91ce443002318a791f9645dd79e171b92623a08a86364894e1b5f8ea8d82104c36f3f6a
 MISC metadata.xml 1061 BLAKE2B 1aff6dfaf869ceb1ad828a45c58c4ed1645cdff139822e781753552e612dcd48f9533ee644808530e696a33fe02b7aeb3935be7f320d8400e9c9bf9621c0782d SHA512 3022372191de1bd349f9b7f22ed1d17dbde5dd56cbcef2cf9770c06ebae8a59b48cc9cfc9b050f90640a2c48088dd5dfa384d304f6dbd27ada1ac626b39a2a97
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r2.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r3.ebuild
index d0caa68e4912..e5295fefced0 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r2.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r3.ebuild
@@ -1,52 +1,53 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit perl-module
 
-DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
-HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
 #COMMIT=""
 MY_PV="${COMMIT:-${PV}}"
 MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
+HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
 SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas mpt mpt-sas2"
 
-DEPEND="dev-perl/Monitoring-Plugin
-		dev-perl/Module-Pluggable"
+DEPEND="
+	dev-perl/Monitoring-Plugin
+	dev-perl/Module-Pluggable"
 RDEPEND="${DEPEND}
-		sys-apps/smartmontools
-		sys-fs/lsscsi
-		3ware? ( sys-block/tw_cli )
-		aacraid? ( sys-block/arcconf )
-		dmraid? ( sys-fs/dmraid )
-		hpa? ( sys-block/hpacucli )
-		hpsa? ( sys-apps/cciss_vol_status )
-		megaraid-sas? ( sys-block/megacli )
-		mpt-sas2? ( sys-block/sas2ircu )
-		mpt? ( sys-block/mpt-status )
-"
-
-S="${WORKDIR}/${MY_P}"
+	sys-apps/smartmontools
+	sys-fs/lsscsi
+	3ware? ( sys-block/tw_cli )
+	aacraid? ( sys-block/arcconf )
+	dmraid? ( sys-fs/dmraid )
+	hpa? ( sys-block/hpacucli )
+	hpsa? ( sys-apps/cciss_vol_status )
+	megaraid-sas? ( sys-block/megacli )
+	mpt-sas2? ( sys-block/sas2ircu )
+	mpt? ( sys-block/mpt-status )"
 
 src_prepare() {
-	# Upstream has a custom Makefile that is meant to build bundles.
-	#mv -f Makefile Makefile.upstream || die
-	sed -i '/CPANfile/d' Makefile.PL || die
 	default
+
+	# Upstream has a custom Makefile that is meant to build bundles
+	sed -i '/CPANfile/d' Makefile.PL || die
 }
 
 src_install() {
 	default
-	plugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "${plugindir}"
-	mv -f "${ED}"/usr/bin/check_raid.pl "${ED}"/"${plugindir}" || die
 	dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg
+
+	local plugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "${plugindir}"
+	mv -f "${ED}"/usr/bin/check_raid.pl "${ED}/${plugindir}" || die
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r2.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r2.ebuild
deleted file mode 100644
index d0caa68e4912..000000000000
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-module
-
-DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
-HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
-#COMMIT=""
-MY_PV="${COMMIT:-${PV}}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas mpt mpt-sas2"
-
-DEPEND="dev-perl/Monitoring-Plugin
-		dev-perl/Module-Pluggable"
-RDEPEND="${DEPEND}
-		sys-apps/smartmontools
-		sys-fs/lsscsi
-		3ware? ( sys-block/tw_cli )
-		aacraid? ( sys-block/arcconf )
-		dmraid? ( sys-fs/dmraid )
-		hpa? ( sys-block/hpacucli )
-		hpsa? ( sys-apps/cciss_vol_status )
-		megaraid-sas? ( sys-block/megacli )
-		mpt-sas2? ( sys-block/sas2ircu )
-		mpt? ( sys-block/mpt-status )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Upstream has a custom Makefile that is meant to build bundles.
-	#mv -f Makefile Makefile.upstream || die
-	sed -i '/CPANfile/d' Makefile.PL || die
-	default
-}
-
-src_install() {
-	default
-	plugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "${plugindir}"
-	mv -f "${ED}"/usr/bin/check_raid.pl "${ED}"/"${plugindir}" || die
-	dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg
-}
-
-pkg_postinst() {
-	einfo "The following RAID controllers are supported without special tools:"
-	einfo "GDT (Intel/ICP) RAID Controller"
-	einfo "HP MSA (special configuration needed)"
-	einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
-	einfo "Intel: CmdTool2"
-	einfo "Areca: areca-cli"
-	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
-	einfo "Marvell RAID: mvcli"
-	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
-	einfo "Adaptec ServeRAID: aaccli"
-	einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
-	einfo "Adaptec ServeRAID 7k: ipssend"
-}
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 350c10f6ae2e..7e43b3c83eb9 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -6,6 +6,7 @@ AUX net-snmp-5.8.1-mysqlclient.patch 785 BLAKE2B 932b635c9a86f5637be849713f18636
 AUX net-snmp-5.8.1-net-snmp-config-libdir.patch 1395 BLAKE2B d22fa136b32cab28ffff0f9ba47f7f16823313309504bdc3d36979648d2cb697dd061c8c048e03241d897f39652b35d27db6080eab1f003dbdd9e72499bd2b83 SHA512 082b0befa290c917271acca3bfa5a6258a0712c9f1fb42990db3e4858af6be500317bc12efbd51ca3da76d53d0924e034f8d77d1be79dc1cf90f7196a7830bb8
 AUX net-snmp-5.8.1-pkg-config.patch 744 BLAKE2B bdcd74073b174fdf208f44bbe17546ab5e61420927e34cb1c9ecad5a208d00b52d3577cf686baf2ffb515c28ae6caa1d88696a3ddd6fde8eeabed17170d057c0 SHA512 10a1fcc115fdf19e03ba04651cd90063b9c05a6d075a5c79bcea5074145b22c65ab5a6974aade3072349b1f3b2543fff5000467d30526d02e22762ea9af5ff86
 AUX net-snmp-5.9-MakeMaker.patch 215 BLAKE2B 72b8b903d89bb7eff1dd69f9a212f6b1dcd13fcdc2a38650b3ffaadaae0ffe042bbb4ee3b2a8badb10c43f8179d405de45ff7dae42d83dc29f0929388bd0046d SHA512 2ade984435766624c2dcf3755644760d123745feaf9283f9f94230647df6fdc92cd27af7a8e144377ff17a6812b50c80d660d9a050e0a346b5260ec7963e0300
+AUX net-snmp-5.9.2-fix-LDFLAGS.patch 744 BLAKE2B 1d53469057630097c9c2a527ab276f8c30346c9b45b5ff4780cf9e51fb0f81193b9113e121a282d92268f73831fc3d4bf60ae2ea035f0eda9196351faa65f889 SHA512 7ebcc0128180c3690cd594dc3ec9c6428bff81ef31cf3b6f35be74a3d32c3753d0cb8e8b41b2dd6363a97811daa4786827a6a7a93b49804dfbb14545f157d360
 AUX net-snmp-99999999-tinfo.patch 280 BLAKE2B 4a762bb037beb054d6afa1d3047e9bfa9df7746bdbcbf3ee4050377deee5d4107433e983f1e443a801adcabcd7f13c71f27e14ab49b729850beeb06a096d4c2b SHA512 19c65a7f80eea80fbe88bb5653dadb46f36b4921123aa7c7874c71ab82c6b14b5331b2d697a3d273d3bf93a961b80bf0a9252d833c21f81aa6f73d7e2a4a39d7
 AUX snmpd.conf 552 BLAKE2B 9d2801b0ddc2148a62e332a1d355a9ddc050ec95aea2dde31f25413096c4b91dbab794c1e71b75f5baba1234d89729a6e8c50287098c04991a3eec4d9f512b3c SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc
 AUX snmpd.init.2 680 BLAKE2B ce21b60980c2a0d74c810bb473c6b4c70eb11a2fc0636ec4af8a262ce412324ba80bc6c72b2544d359b4e2f536cf329df99e0be7d96035fa20c25f9ab7dc4a16 SHA512 10394f04dee23537a195f5aed63a3e758ca90227e269076ae9d13f883c7bd666c1c43823d1b869c43f232e97dc4138e52648cae995327f7a7f676ba416ee6fff
@@ -15,6 +16,8 @@ AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf92524
 AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c5976394c04bfd8da30917395b1a752f8e66502259d271ccf264c3e99f99e95df62b80447d4099d1dd7 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.9.1.tar.gz 6781346 BLAKE2B 4242ca77372005f995dfd228bec51d35b6b0f8c0ab0e44ed40cdb3cc0578b64e97444ffcb074dceca30739deadb46e68f1c75e87d3f1768d81b5e084b0fc0f5f SHA512 ae158ab41961ee2064d85187337979e6ff6ba90f3136b8a960e9ae46ee1408d9d2f0c5c4dfc3a3302e6dbb357cddf1221489435288c4f52182a03e94a9e450c3
+DIST net-snmp-5.9.2.tar.gz 6646200 BLAKE2B 95af69d530d3f5267bb75165cc2cf72128547a14fe4148d20610a45d42298475fb4c553c1e4eff1ffb4a368b609868b0ca36530c0f3a98800cf6290707bb3fb7 SHA512 d67810b15c4956a28ccb4d9a3870604bc94e71247d9a8d3a9959041268122b3500cf68a7912cfb01a6cff27f3f4364cbd106629ab80c12974f694b6c548bde59
 EBUILD net-snmp-5.9.1-r1.ebuild 5648 BLAKE2B 400e3ae52051e4ebff51dfe10ba2e12b3cf339f4262b2b5ecaeec47c957f234f81b75d876fe9c3e477f1da19d369e904c63c553ae8e6541ad7ed991c3731aac4 SHA512 9f7dd02a3adfb5176ea2b94cbb77cc47d003de227b9e324b290f2d88e7a09ff5eb65d35663713e5b384e042053ce6b43fa073fbb66390c34e071c0c2d747e3d4
-EBUILD net-snmp-99999999.ebuild 5581 BLAKE2B b3a9b7063d2936ef7f9dc328dced5d41473d494cca623c2aee7f957493184423be51662e18c0a2c0d7e904bd49d0b401e9ea3db0e57786cc20d270916ac4820f SHA512 1a05649925ab42e97dc52d091ac73b76ff818785ad64976d44663f35f91318d2cbc8aab1413cda1c9456ec050963f59d2f2f6a1816a3ea845fbd155df866e2b3
+EBUILD net-snmp-5.9.2.ebuild 6058 BLAKE2B 8d753f806c020caee67aceb3f9904c294f44bfc8015ac00e8fd39ac023c68990931130c42b44bf9da1350ba9d21d1fc37df59e00c7be66a3a482e0e399f2b78f SHA512 9753fd60e9407b5774a56fec6a8c2bf9b1bd4e9d22033b435f6e3fa5255e2b1b34f9346a9f93f168fdef4b906425bfde803948827090983b73a5599f76f6c870
+EBUILD net-snmp-9999.ebuild 6058 BLAKE2B 8d753f806c020caee67aceb3f9904c294f44bfc8015ac00e8fd39ac023c68990931130c42b44bf9da1350ba9d21d1fc37df59e00c7be66a3a482e0e399f2b78f SHA512 9753fd60e9407b5774a56fec6a8c2bf9b1bd4e9d22033b435f6e3fa5255e2b1b34f9346a9f93f168fdef4b906425bfde803948827090983b73a5599f76f6c870
 MISC metadata.xml 1384 BLAKE2B 7482ef34aa0a5fb60c32a11449e6eb53bcebc7852c013650151392401532ff66f56e0c43dc98ad8a47e8166c97ce04d24bbe1d8a2ee21b934a19983d0847d941 SHA512 9ed265ee76578df5f4edb04d7fbc3eacfab7c27603bac65a3ae5086a31d3a9ce4f128cc751d63e1c27fd13e16fcb83a7966771b73026b7339663802ce51023e4
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch
new file mode 100644
index 000000000000..158d8f1b5bee
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch
@@ -0,0 +1,18 @@
+diff --git a/Makefile.top b/Makefile.top
+index d6394ca..f5119b5 100644
+--- a/Makefile.top
++++ b/Makefile.top
+@@ -86,11 +86,11 @@ LIBCURRENT  = 41
+ LIBAGE      = 2
+ LIBREVISION = 0
+ 
+-LIB_LD_CMD      = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
++LIB_LD_CMD      = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
+ LIB_EXTENSION   = la
+ LIB_VERSION     =
+ LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir)
+-LINK		= $(LIBTOOL) --mode=link $(LINKCC)
++LINK		= $(LIBTOOL) --mode=link $(LINKCC) $(LDFLAGS)
+ # RANLIB 	= @RANLIB@
+ RANLIB		= :
+ 
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.2.ebuild
index 80a7944c40df..ca95665fcf9a 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.2.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
 
 DISTUTILS_OPTIONAL=yes
 DISTUTILS_SINGLE_IMPL=yes
@@ -9,12 +9,21 @@ GENTOO_DEPEND_ON_PERL=no
 PYTHON_COMPAT=( python3_{8..10} )
 WANT_AUTOMAKE=none
 
-inherit autotools distutils-r1 git-r3 perl-module systemd
+inherit autotools distutils-r1 perl-module systemd
 
 DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://www.net-snmp.org/"
-EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
-SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
+HOMEPAGE="https://www.net-snmp.org/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
+	inherit git-r3
+else
+	# https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
 
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
@@ -67,13 +76,13 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
 	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
 	"${FILESDIR}"/${PN}-5.8-pcap.patch
 	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
 	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
 	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
 	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
+	"${FILESDIR}"/${PN}-5.9.2-fix-LDFLAGS.patch
 	"${FILESDIR}"/${PN}-99999999-tinfo.patch
 )
 
@@ -83,15 +92,18 @@ pkg_setup() {
 
 src_unpack() {
 	default
-	git-r3_src_unpack
+
+	[[ ${PV} == 9999 ]] && git-r3_src_unpack
 }
 
 src_prepare() {
 	# snmpconf generates config files with proper selinux context
 	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
 
+	mv "${WORKDIR}"/patches/0001-Fix-toolchain-quadruplet-detection-Gentoo-bug-432004.patch{,.disabled} || die
 	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
 	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0005-Respect-LDFLAGS-properly.patch{,.disabled} || die
 	eapply "${WORKDIR}"/patches/*.patch
 
 	default
@@ -127,7 +139,6 @@ src_configure() {
 		$(use_with ssl openssl) \
 		$(use_with tcpd libwrap) \
 		$(use_with zlib) \
-		--disable-static \
 		--enable-shared \
 		--with-default-snmp-version="3" \
 		--with-ldflags="${LDFLAGS}" \
diff --git a/net-analyzer/net-snmp/net-snmp-9999.ebuild b/net-analyzer/net-snmp/net-snmp-9999.ebuild
new file mode 100644
index 000000000000..ca95665fcf9a
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-9999.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=yes
+DISTUTILS_SINGLE_IMPL=yes
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{8..10} )
+WANT_AUTOMAKE=none
+
+inherit autotools distutils-r1 perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="https://www.net-snmp.org/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
+	inherit git-r3
+else
+	# https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/40"
+IUSE="
+	X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
+	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
+"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	virtual/libcrypt:=
+	bzip2? ( app-arch/bzip2 )
+	elf? ( dev-libs/elfutils )
+	lm-sensors? ( sys-apps/lm-sensors )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	netlink? ( dev-libs/libnl:3 )
+	pcap? ( net-libs/libpcap )
+	pci? ( sys-apps/pciutils )
+	perl? ( dev-lang/perl:= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	ssl? (
+		>=dev-libs/openssl-0.9.6d:0=
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
+	"${FILESDIR}"/${PN}-5.8-pcap.patch
+	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
+	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
+	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
+	"${FILESDIR}"/${PN}-5.9.2-fix-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-99999999-tinfo.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	[[ ${PV} == 9999 ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	mv "${WORKDIR}"/patches/0001-Fix-toolchain-quadruplet-detection-Gentoo-bug-432004.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0005-Respect-LDFLAGS-properly.patch{,.disabled} || die
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with kmem kmem-usage) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pcap) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--enable-shared \
+		--with-default-snmp-version="3" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	emake sedscript
+
+	local subdir
+	for subdir in snmplib agent/mibgroup agent apps .; do
+		emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all
+	done
+
+	use doc && emake docsdox
+}
+
+src_install() {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	use python && python_optimize
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/html/*
+	fi
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 5f825ebc37a1..84c9a5161ce2 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,10 +1,15 @@
+AUX nfacctd.service 372 BLAKE2B 9b15af6cf0c9cca8fbd45511db7bc51f2ca04aca349813bb8abc0670ee7a687c9453c13e9406eef7301a1c2a52ef3974fe52064197ede69d754e2d16a6ce52cd SHA512 0e25c7fb6a3ccf0e201c895c76e10bd3ffa258ee0de127e7a227369b50c8427601bdebdab53ad72cbcdae8f35ed3a4bc83b5234f616c0eb4aa64eb6509cf4f4e
 AUX pmacct-1.7.4--Werror.patch 327 BLAKE2B 1b77ca15ef64a48ca6b477be9f37fa7b88d79e7fedb47895648b6637e9af9e38c959b8838d28d1370dd11b4c722d2b18adabcdd72c8e074dbc10467b770ea6de SHA512 06e1cce962022e51c960881c6f169c91605c5ed597960085f38b5c9fffa4056813014c08070ba7f016cb0f6c449038df9666e5f0d7ab7879563d2dfdc53d2b0a
 AUX pmacct-1.7.6-fix-mysql-crash.patch 1018 BLAKE2B dc8f53581007e068b96af57595bb2cd4b63638118087f088e7f7a2c4c74f528616cbfecd47062e23ff1a653e0bb80732f3703c07ec47e2060084cdea03405aa4 SHA512 706098dc5f9e1f265369039e27489e67c930eba3f711d81d70d85d5d33f75b2b9d5f81879bfe69159934f8c662fa4558916bd34338d765a45ff164d4512911fe
 AUX pmacct-1.7.6-nogit.patch 617 BLAKE2B 2e8d0874bf97ceeb0be43ecea9be9bb29094a4a663a688503520166e0807478b14256b89e8828bfb877fa1e3f70eb4e0cab52e2d40307506cfd833815b77f2f8 SHA512 383d95027b79f1eddd16d8e9490c3d324ea84b65a74fe0bcc15cbf231063f84ce0d5d2114b4cc35a50d6c46c9be1a53f52a4c16f555a3ebe144fa7a22993ee45
 AUX pmacctd-conf.d 153 BLAKE2B 10329deaac64fb5e03bf673c806ad691fb00579d16c77b05aa73662b5e187a31c25da38afb3be853434900ad65103bef3b9d1d9c3b24e0f241a98e4c9b6696b8 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31
 AUX pmacctd-init.d 834 BLAKE2B 15b66c0495690bd42069abed21962db93edc798650cd23944206eddebe1f4baa3086537620c58fa0e63f83336bf2956318eb5ac7521235555ce3f67b2d54eca8 SHA512 eb87cafae945c13a5eff12c1140e0943bed59d46ca91d46a9fe71e1269549064d04980b04ce78f6a87eeacb7253d1d59f32461ee68734e7cac6510d187fb7f3c
+AUX pmacctd.service 382 BLAKE2B 32bc56cffd69785a8ecc13b6ed7592c729f1d829ba5ad92c7928b54dc7f8e04a605806427ef9834f7d196c29ae77dbe31a51019e9ea95f745835f71c4e5f0730 SHA512 203aaa83ee4e194a11476a11e6b2eb787bcddcb8b3b5853c80520bbe1287286dfc56a28d3d34db03627a58e4923b7abf0ac41185d79a231061848cd990693cc7
+AUX sfacctd.service 370 BLAKE2B 49a18ae94d108d043f1e67f7c2082f7f154c2a7c5e795f457e6bf2b48fb8d43d9e94bbd9b07a0765e4f27f3b5e6339491701a470622b3d51fc031af91751a648 SHA512 89833651c56b63098ba93965470e7450ea44e43a10790e4bfed050031dbe8c5e15965721c20b0c7e700f693428f65a98e9737dd944efc477abd9776b18fed0d8
 DIST pmacct-1.7.6.tar.gz 2126837 BLAKE2B df04822e88f9409d335457031fb26ce4ae8b5da13cf2f55f8d6c78eb50dade62ef763d389ac81a509d9351e12844446ac73171e9966a5aeeecc0e5fb10219c73 SHA512 b370d20f8b8d49b9114db3ab74c66cd16962dee5e7c3642fab0b2787c4ea924a249ff4d8d770c0ccc8ca81366b9a5e557dcfb7cdddf878b99b719d0accdb949a
+DIST pmacct-1.7.7.tar.gz 2149629 BLAKE2B 00357cbf1f52452c4a9ee9807e2c18f823019521cc9cb99553fe262826d7343e286694d666c7bab59e62767598ff373b3abafbecfdd43a823ba8784777740643 SHA512 7bc4c48041f023b5cd7ba927722478b0008d751bdb679f44beb2b281f4b16cb0bafb211d0fb947516ca80f86082f1bce578973ec298f4947ffd9d063a44bd00b
 EBUILD pmacct-1.7.6-r2.ebuild 2154 BLAKE2B e27390ed851b65f2040d0206dfec450cb3c76e47c873c28bd3328c34f732f094b64e8155d8ababa2456a654de58f3e6ee04232df842dd9a38c5541173bd62436 SHA512 29b3def341c1d7733afdc39a400f28b8d1e7adff7383e14b3d4f3a5ddf9b9b1fb95a6626e901b0b2feaa3ab4946414e3fcd1da95c6e1f86e3ca9bd8dfe45edb5
 EBUILD pmacct-1.7.6-r3.ebuild 2196 BLAKE2B 257f50df7f45eed32ae95965998b77a11800dd4fa2f8f010442525002a262009a11619941aa4ad99076e39f59deceeb05f8a6853036c6c55642441d2b3359c4a SHA512 dfc7ec6b9f33cb21797271ac5b533dcce5a3c36bd0696fb116f6534a5c0c77354bb663671642403d46141c8ea7662930432c0618bc6c50cd86efc0614409eab1
-EBUILD pmacct-999999.ebuild 2109 BLAKE2B 42b545bea0b7c97d1bb12a8c2247be19fa6b335703b160b77d4a6cfe292258a87660b026eedd626d7d7e4669239eb866f852caf1fdc5800e0c4334cd8a00296f SHA512 e39cb151c33ac53a22376a55a5d23d99561a5c7fcddbecf42dc966e1112824a16e86aae9925a3c66645d68aa8230f71061defd3f4c41b3807b7bb73a2ac1d6f2
-MISC metadata.xml 1241 BLAKE2B fdaae9649fb01505523873cdf5873329e4a636b4cc7087f5bcf9cf0dec5acc907d6cca8a8bb0c9e8b5ab378aa76c6ab5dea5da42647daca8a1a218c0ae1985a2 SHA512 5f94b8356e7c0be897534a2a78ea78b43bd763764a179e90a44ba662dbffdca4ce12505d64c973bbd8bd51dbe5d45a40b2ff3576a0af8f8d88d0ae31e9c6228b
+EBUILD pmacct-1.7.7-r1.ebuild 2375 BLAKE2B 90f2386edb435fd1d1274f0951833405f860494570f04061e92efce801cac61b985bfc08ad68a27baf4c2ad09886b1cf7676aa2f9af14b09b9eeb957ca20baa2 SHA512 b417bb4f2b7ee8580c876381dd601d79dd4adefa276b16e7c9e2564dbf14a7fd94f376eed6636a4cfc1fce70a272683e65cac5894fb694d7b602f65ddd551cb0
+EBUILD pmacct-9999.ebuild 2375 BLAKE2B 90f2386edb435fd1d1274f0951833405f860494570f04061e92efce801cac61b985bfc08ad68a27baf4c2ad09886b1cf7676aa2f9af14b09b9eeb957ca20baa2 SHA512 b417bb4f2b7ee8580c876381dd601d79dd4adefa276b16e7c9e2564dbf14a7fd94f376eed6636a4cfc1fce70a272683e65cac5894fb694d7b602f65ddd551cb0
+MISC metadata.xml 1319 BLAKE2B 0c53f8db498bcc1837e4f99ee751c5948eacc6cb513efcf7fc63f160f863a6995048b5e7987f28be2e5b0d190b7830a6d5a3f740392087371bd977ac1a50ba9a SHA512 a767f13848e711702a32586ebb02401d93e9ef65eca1d5a7f1b7951d4875638b730d074a8c09cbdc0d14b1b9b641472102ea91d1c52b4108201f7a382b2b142a
diff --git a/net-analyzer/pmacct/files/nfacctd.service b/net-analyzer/pmacct/files/nfacctd.service
new file mode 100644
index 000000000000..d649f47030bf
--- /dev/null
+++ b/net-analyzer/pmacct/files/nfacctd.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=netflow accounting daemon
+After=network.target
+
+[Service]
+ProtectSystem=full
+ProtectHome=true
+ProtectHostname=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+Type=forking
+ExecStart=/usr/sbin/nfacctd -f /etc/pmacctd/nfacctd.conf -i %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/pmacct/files/pmacctd.service b/net-analyzer/pmacct/files/pmacctd.service
new file mode 100644
index 000000000000..a2dbb8c45846
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacctd.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=promiscuous mode accounting daemon
+After=network.target
+
+[Service]
+ProtectSystem=full
+ProtectHome=true
+ProtectHostname=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+Type=forking
+ExecStart=/usr/sbin/pmacctd -f /etc/pmacctd/pmacctd.conf -i %I
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-analyzer/pmacct/files/sfacctd.service b/net-analyzer/pmacct/files/sfacctd.service
new file mode 100644
index 000000000000..7a334e0ffadd
--- /dev/null
+++ b/net-analyzer/pmacct/files/sfacctd.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=sflow accounting daemon
+After=network.target
+
+[Service]
+ProtectSystem=full
+ProtectHome=true
+ProtectHostname=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+Type=forking
+ExecStart=/usr/sbin/sfacctd -f /etc/pmacctd/sfacctd.conf -i %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index a700a40b473b..1c025fea769e 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -19,4 +19,7 @@
 		<flag name="traffic-bins">Link IPv4/IPv6 traffic accounting binaries</flag>
 		<flag name="zmq">Enable support for ZeroMQ through <pkg>net-libs/zeromq</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">pmacct/pmacct</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/pmacct/pmacct-999999.ebuild b/net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild
index 4446fb29a9c9..55db903b6abd 100644
--- a/net-analyzer/pmacct/pmacct-999999.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild
@@ -1,21 +1,27 @@
-# 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 autotools flag-o-matic git-r3 toolchain-funcs
+inherit autotools toolchain-funcs systemd
 
 DESCRIPTION="A network tool to gather IP traffic information"
 HOMEPAGE="http://www.pmacct.net/"
-EGIT_REPO_URI="https://github.com/pmacct/pmacct/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pmacct/pmacct"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/pmacct/pmacct/releases/download/v${PV}/${P}.tar.gz
+		http://www.pmacct.net/${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="
-	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog
-	postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-"
+
+IUSE="+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq"
+
 REQUIRED_USE="
 	?? ( geoip geoipv2 )
 	kafka? ( jansson )
@@ -41,6 +47,11 @@ RDEPEND="dev-libs/libcdada
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.4--Werror.patch"
+	"${FILESDIR}/${PN}-1.7.6-nogit.patch"
+)
+
 DOCS=(
 	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
 	docs/INTERNALS docs/PLUGINS docs/SIGNALS
@@ -48,34 +59,36 @@ DOCS=(
 
 src_prepare() {
 	default
-	sed -i -e 's|-Werror||g' configure.ac || die
 	eautoreconf
 }
 
 src_configure() {
 	tc-export CC AR RANLIB
-	append-cflags -fcommon
-
-	econf \
-		$(use_enable bgp-bins) \
-		$(use_enable bmp-bins) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(use_enable jansson) \
-		$(use_enable kafka) \
-		$(use_enable l2) \
-		$(use_enable mysql) \
-		$(use_enable ndpi) \
-		$(use_enable nflog) \
-		$(use_enable postgres pgsql) \
-		$(use_enable rabbitmq) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable st-bins) \
-		$(use_enable traffic-bins) \
-		$(use_enable zmq) \
-		--without-external-deps \
-		--disable-debug \
+
+	local myeconfargs=(
+		$(use_enable bgp-bins)
+		$(use_enable bmp-bins)
+		$(use_enable geoip)
+		$(use_enable geoipv2)
+		$(use_enable jansson)
+		$(use_enable kafka)
+		$(use_enable l2)
+		$(use_enable mysql)
+		$(use_enable ndpi)
+		$(use_enable nflog)
+		$(use_enable postgres pgsql)
+		$(use_enable rabbitmq)
+		$(use_enable sqlite sqlite3)
+		$(use_enable st-bins)
+		$(use_enable traffic-bins)
+		$(use_enable zmq)
+
+		--without-external-deps
+		--disable-debug
 		--disable-mongodb
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -89,6 +102,8 @@ src_install() {
 	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
 	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
 
+	systemd_dounit "${FILESDIR}"/{nfacctd,pmacctd,sfacctd}.service
+
 	insinto /etc/pmacctd
 	newins examples/pmacctd-imt.conf.example pmacctd.conf
 }
diff --git a/net-analyzer/pmacct/pmacct-9999.ebuild b/net-analyzer/pmacct/pmacct-9999.ebuild
new file mode 100644
index 000000000000..55db903b6abd
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-9999.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs systemd
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pmacct/pmacct"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/pmacct/pmacct/releases/download/v${PV}/${P}.tar.gz
+		http://www.pmacct.net/${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq"
+
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+	kafka? ( jansson )
+	rabbitmq? ( jansson )
+"
+
+RDEPEND="dev-libs/libcdada
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	jansson? ( dev-libs/jansson:= )
+	kafka? ( dev-libs/librdkafka )
+	mysql? (
+		dev-db/mysql-connector-c:0=
+		sys-process/numactl
+	)
+	ndpi? ( >=net-libs/nDPI-3.2:= )
+	nflog? ( net-libs/libnetfilter_log )
+	postgres? ( dev-db/postgresql:* )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	sqlite? ( =dev-db/sqlite-3* )
+	zmq? ( >=net-libs/zeromq-4.2.0:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.4--Werror.patch"
+	"${FILESDIR}/${PN}-1.7.6-nogit.patch"
+)
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC AR RANLIB
+
+	local myeconfargs=(
+		$(use_enable bgp-bins)
+		$(use_enable bmp-bins)
+		$(use_enable geoip)
+		$(use_enable geoipv2)
+		$(use_enable jansson)
+		$(use_enable kafka)
+		$(use_enable l2)
+		$(use_enable mysql)
+		$(use_enable ndpi)
+		$(use_enable nflog)
+		$(use_enable postgres pgsql)
+		$(use_enable rabbitmq)
+		$(use_enable sqlite sqlite3)
+		$(use_enable st-bins)
+		$(use_enable traffic-bins)
+		$(use_enable zmq)
+
+		--without-external-deps
+		--disable-debug
+		--disable-mongodb
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql telemetry; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	systemd_dounit "${FILESDIR}"/{nfacctd,pmacctd,sfacctd}.service
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index 676829964867..a16cbf7aa863 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1,5 +1,8 @@
 AUX sngrep-1.4.7-LDFLAGS.patch 290 BLAKE2B f15317a47b09dca8c0d28f2aa8c9bb96fdbb4f10cecfc0e5fb2f40d0cd98ad675471f793e46ff4092086b887c99bc7d6efea6d6170b3c7bb4d1db3e4032da5d3 SHA512 0c63147bcedab91a0b5a8c34b55a0c8ac11dfdd52f607b31658e8e8891963b87b8fdce8674f1eecf30829257006219c7ea42945fff5dce4502b62dcaf72505b3
 AUX sngrep-1.4.7-tinfo.patch 699 BLAKE2B 92943ef1b2b4b9bd0d0101667999ebbd7ef9dbfbfa4c2cc39a24f190e88482bbe6053813a8e32745565e3f61d3585207a540de823e715e4e0d1f013fd398ca0f SHA512 59276d306b6db2e5318f3b23c172b692b4f35884c7bf68f27a1a8636b2a5187dcdfbee58f11bee0a7de7afe068e0e1486d6a305d0b215a58627a041804452a4f
+AUX sngrep-1.5.0-bashisms.patch 2821 BLAKE2B d2f035182f8183870b16a4137f0abcc32776db01592a0432be8189be39ee0e5e627e01335766e2d656561e0ad5dc12be667b351ca551975678068d8cf7325765 SHA512 6c85cf1670b7b9f376e1409f833090bc5ba8aed705698dad5f82b782537804eac32f71a716a960c4ed042a3a81d4005acbd3cf1f0d171e00ce9c0094971be77d
 DIST sngrep-1.4.7.tar.gz 237978 BLAKE2B 30172748aeab2910e7fa13f35b447d7bd1688bb206576af6233c8c47405eb3fe93316cc72255169f19f3752e7fe3ada63c5c0bba0d9ab75706c1b0d3ac296474 SHA512 f414f9cc49b0c34cbbf5a77d285f12eb4091af3395953ed93dbe2f57d4ba3731d16c4b56c37e90744cf3784572975f485aed48cdd100898ffaee18e9a18943b1
+DIST sngrep-1.5.0.tar.gz 244965 BLAKE2B 85c8ddbbb5c81dfa886086543df9ccb6f4a297c95a23afddfcf1a359e4af19a1f37cd75136881aba07fd70c177737fa93440f04f97ed9ffd01afef3055971472 SHA512 20be55f80d029739b1db4c0ccbc028604019acd8ca45181eb9952759ced4f20549d991c2916c9d1c84c989ccb123cad44f545a9146471a79273c0a6053615fbe
 EBUILD sngrep-1.4.7-r1.ebuild 910 BLAKE2B d2a839a65c30f662def7cecf6c2dd3816a97d1affa8c23ac67f5ef04b881a4bda243ef7e9acaffcc6995015ab01b5a6f209dbfa743d594b0e13bf7ff54c15596 SHA512 000db85ac51346367bfe39630367839711aa31100e2725db8cca54f36b47e24ce136705d7a13d03d20ebbb81697c074a390df12540693f8b7f261fb90d1978d8
+EBUILD sngrep-1.5.0.ebuild 914 BLAKE2B 75b222192e6334bde5850937f11a8b3b8cdb2e0351c1bbcaea2179ffcede360902f4b10b094e3f641fda6104ebc6f80196ec3bce1f10539e09799a4bbfe4ba34 SHA512 b15fbf07226d7b5a3241c95a78539517f1dde107c8cce3e4cb9267db10f6dc1be9dd5fe42a059286e34fa5fb44d22e86b460ae3c4fc979e046d2bc20840c1037
 MISC metadata.xml 469 BLAKE2B f7089818921cdd0fd8e443e17928839dddea0efafba77fb6abc511aaffe66616c154dc9d8ad7422e0732334729980547aa514392f9d0467627d163c9cba15338 SHA512 42a9e042b858c16d34ba9a124f9d245134a1ed7f6593ae00736c0685c310eeac1d773aafbba529f153dbab5f766497bdc0bbdb2b8621f7feeb67af3eae9c2d63
diff --git a/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch b/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch
new file mode 100644
index 000000000000..ffcd38d2f7f3
--- /dev/null
+++ b/net-analyzer/sngrep/files/sngrep-1.5.0-bashisms.patch
@@ -0,0 +1,79 @@
+https://github.com/irontec/sngrep/pull/404
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,7 +51,7 @@ AC_ARG_ENABLE([unicode],
+ 	[AC_SUBST(UNICODE, no)]
+ )
+ 
+-AS_IF([test "x$enable_unicode" == "xyes"], [
++AS_IF([test "x$enable_unicode" = "xyes"], [
+ 	# Ncurses with wide-character support
+ 	AC_DEFINE([WITH_UNICODE], [], [Compile With Unicode compatibility])
+ 
+@@ -123,7 +123,7 @@ AC_ARG_WITH([gnutls],
+     [AC_SUBST(WITH_GNUTLS, no)]
+ )
+ 
+-AS_IF([test "x$WITH_GNUTLS" == "xyes"], [
++AS_IF([test "x$WITH_GNUTLS" = "xyes"], [
+ 
+     m4_ifdef([PKG_CHECK_MODULES], [
+         PKG_CHECK_MODULES([LIBGNUTLS], [gnutls])
+@@ -160,8 +160,8 @@ AC_ARG_WITH([openssl],
+     [AC_SUBST(WITH_OPENSSL, no)]
+ )
+ 
+-AS_IF([test "x$WITH_OPENSSL" == "xyes"], [
+-	AS_IF([test "x$WITH_GNUTLS" == "xyes"], [
++AS_IF([test "x$WITH_OPENSSL" = "xyes"], [
++	AS_IF([test "x$WITH_GNUTLS" = "xyes"], [
+ 	    AC_MSG_ERROR([ GnuTLS and OpenSSL can not be enabled at the same time ])
+ 	], [])
+     m4_ifdef([PKG_CHECK_MODULES], [
+@@ -187,7 +187,7 @@ AC_ARG_WITH([pcre],
+     [AC_SUBST(WITH_PCRE, no)]
+ )
+ 
+-AS_IF([test "x$WITH_PCRE" == "xyes"], [
++AS_IF([test "x$WITH_PCRE" = "xyes"], [
+ 	AC_CHECK_HEADER([pcre.h], [], [
+ 	    AC_MSG_ERROR([ You need libpcre development files installed to compile with pcre support.])
+ 	])
+@@ -206,7 +206,7 @@ AC_ARG_ENABLE([ipv6],
+     [AC_SUBST(USE_IPV6, no)]
+ )
+ 
+-AS_IF([test "x$USE_IPV6" == "xyes"], [
++AS_IF([test "x$USE_IPV6" = "xyes"], [
+ 	AC_CHECK_HEADERS([netinet/in.h netinet/ip6.h], [], [
+ 	    AC_MSG_ERROR([ You dont seem to have ipv6 support (no ip6.h found).])
+ 	], [
+@@ -231,15 +231,15 @@ AC_ARG_ENABLE([eep],
+     [AC_SUBST(USE_EEP, no)]
+ )
+ 
+-AS_IF([test "x$USE_EEP" == "xyes"], [
++AS_IF([test "x$USE_EEP" = "xyes"], [
+ 	AC_DEFINE([USE_EEP],[],[Compile With EEP support])
+ ], [])
+ 
+ 
+ # Conditional Source inclusion 
+-AM_CONDITIONAL([WITH_GNUTLS], [test "x$WITH_GNUTLS" == "xyes"])
+-AM_CONDITIONAL([WITH_OPENSSL], [test "x$WITH_OPENSSL" == "xyes"])
+-AM_CONDITIONAL([USE_EEP], [test "x$USE_EEP" == "xyes"])
++AM_CONDITIONAL([WITH_GNUTLS], [test "x$WITH_GNUTLS" = "xyes"])
++AM_CONDITIONAL([WITH_OPENSSL], [test "x$WITH_OPENSSL" = "xyes"])
++AM_CONDITIONAL([USE_EEP], [test "x$USE_EEP" = "xyes"])
+ 
+ 
+ ######################################################################
+@@ -249,7 +249,7 @@ AC_ARG_ENABLE(logo,
+     [ enable_logo=$enableval],
+     [ enable_logo=yes])
+ 
+-AS_IF([test "x$enable_logo" == "xyes"], [
++AS_IF([test "x$enable_logo" = "xyes"], [
+     echo ''
+     echo ' ██╗██████╗  ██████╗ ███╗   ██╗████████╗███████╗ ██████╗'
+     echo ' ██║██╔══██╗██╔═══██╗████╗  ██║╚══██╔══╝██╔════╝██╔════╝'
diff --git a/net-analyzer/sngrep/sngrep-1.5.0.ebuild b/net-analyzer/sngrep/sngrep-1.5.0.ebuild
new file mode 100644
index 000000000000..af7e30fcebf6
--- /dev/null
+++ b/net-analyzer/sngrep/sngrep-1.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Ncurses SIP Messages flow viewer"
+HOMEPAGE="https://github.com/irontec/sngrep"
+SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="eep gnutls pcre ssl unicode"
+
+# In next release, libpcre -> libpcre2
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:=[unicode(+)?]
+	ssl? (
+		!gnutls? ( dev-libs/openssl:= )
+		gnutls? ( net-libs/gnutls:= )
+	)
+	pcre? ( dev-libs/libpcre )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-bashisms.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-ipv6
+
+		$(use_enable eep)
+		$(use_enable unicode)
+		$(use_with pcre)
+		$(use_with ssl $(usex gnutls gnutls openssl))
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 12f6c589bb31..f9845527ef87 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -2,10 +2,13 @@ AUX gentoo.config-1.0.2 5253 BLAKE2B 2a167c760399401cd595e6b85ee8c29f8e4d3e4a44e
 DIST sslscan-2.0.11.tar.gz 110704 BLAKE2B 4d4db6fa7b8f6f611e752d0f97ff1219fcbd064280bc4133dd38d1268cb268847801d25403eeb6bc475579a931e944c9a21d90e40fed6bed2a6a6bc535540f7d SHA512 99681cd8b7240cf85dedfaf210cae11ba3dbf2d56c3fa8ef3f3cdcabb6b29916b640e5955a7876ebb9be36dbe326da303e5bda7537b48743ff0a8c1bd35dbf0c
 DIST sslscan-2.0.13.tar.gz 111142 BLAKE2B 049791183ebf1e00d11868c0dd7b79eddcd27cbb1f915812938f46837c4b300844c26e0a0bee0a4bee4886f24f7b10e5bc77ddedc86893ae228658ab71d11bea SHA512 50455a4f4a999e63107e705a4bc703b94b30d4fa71b5126cdc08788eedeb02f4c7a204a385fa485f0c9d0fa368c7a48f96c492b91631fe8833b68f20d45b0fca
 DIST sslscan-2.0.14.tar.gz 111539 BLAKE2B 392a5f043172aa5800c40e1a86c198421de7fb4ddf92f8504e0b6270c70f4c58f0527cfaaff4892469d763d970b044168ab2a37fa4d836cddda88e5e9fd04586 SHA512 bb496fffbd4e130bae8b9272d1303bfa0a681ff88aa3471e4b3f56bece2072ad8f8f41c19c4325de3d5772e785c1ab7491d3520ac3a44a7a170636ae4e13ed0d
+DIST sslscan-2.0.15.tar.gz 111609 BLAKE2B fc24c00ba3b6aab3c5a05e2ce7fc61c31df76682ef85ae29ad029358b1a51dd4a2c861546eb2eef38eb1d3f5dfad1d77c03fe02ccff8e9f74aa0e09b39a84b72 SHA512 1076914ea86d45fc70bbb60861793acd5e1d64714a5cadca0297a5ad1ab7948a838de7b2d101c199088ee315b802b4342508d37bda94e6b1da47c2bf2289b353
 DIST sslscan-OpenSSL_1_1_1m.tar.gz 10023608 BLAKE2B a6951bfcddea224a4920f18b7352feb427b979965f8f563b9adf3dc3152133fd44d7a3c490c522986066db6b23c2e878f135a7a9160f564d435e66c2cce0c51f SHA512 af85d15c9db06eb9cdfa9e16ef9f859df752d823aa7c7f0c1b334cd71ba924878c686a65e756fd09c7630b650aad1a2bbe02acdfd6c389b52c2560d32d4150fb
 DIST sslscan-OpenSSL_1_1_1n.tar.gz 10031245 BLAKE2B 8af659fc9eead7b91a7553c17570dabb17d15fb37a77e7eecfa2a9dffc9eb0a331dd3f11a193907d16e535594eb8c31707ae91d91db91e99c75d75bdd43a7774 SHA512 bfe45e4cbe082e45d165212caa8e660c8af68559675c42461aba5685a7baa7e16c9c0096557106706114176dc31142c760fe835022f796e4341eb08d1b20408d
 DIST sslscan-OpenSSL_1_1_1o.tar.gz 10030908 BLAKE2B 97b2e9a385ef8d2c9b23cacb6c5f5998572299cc4189b1110691c87b3d56fa9eebcedf6cc4cdaf305e3c419f2ab6bbac7b3260ff0e1070b0c2f620b7bb18db9c SHA512 ee9e9a8dd2ccc5dc63ede1774c4bf931570be3bad4555b208bca718cb2b814eea7a067dfe29f0eee8dcf5588d0d2df272b578526fea6fc3bf5ed2d6bbf21d2fb
+DIST sslscan-OpenSSL_1_1_1p.tar.gz 10039630 BLAKE2B 52f4750e66fec5b9eda7e0110b2bf6c5ec514444c51b4ab4bdee194e76a3ac97806dbb47b38ad427575c960d2598505e4380cbd2a598c07c306695fb2ae1d8e2 SHA512 5722b2de033301cb283c21b88a113cd8bff08808de31c8e663c9f93466b3ce04e589f6ad20dfbbc5e1d07ed90aa9fe60d1a35882aa31e2215a8cecae0e4bb39f
 EBUILD sslscan-2.0.11.ebuild 983 BLAKE2B 58a4c15afea3ec7b7ca0a5a9abbcf34b091387c27713021fd63e52b5dac3f252bb942659b4445b773adff21f29f9c8c289b051ad73d9ae0de0395067f5367162 SHA512 92d02a25e68b9c36fac4d4fdb1b720ce595066c2beb4818c7c127c9f03759a1cbf6fd42e5a8a469bc99ace37305a8904374204178d8272e43cda3c40c229988b
 EBUILD sslscan-2.0.13-r1.ebuild 2054 BLAKE2B 3a0e0c3686b70511e285c42f8396b0b697d6cc3a222f4764ab0d648e6c52d86c51986f5018799dc153cca729586b0a374ada8520f3deb05b266cd18e995f01ed SHA512 d96b30fd216312f0172dae40403d7dc609490f9dc0c7224a07f54fffc51f14dda74c3dd538f932e86bc670f0126a64c467191198d51b2dccd62afd582c11ce6d
 EBUILD sslscan-2.0.14.ebuild 2056 BLAKE2B fb3e0132b6d675d2344b391b7b54e7a6efaa634480242cdcfc5acd7dcd096ffeb63a1c2c507508fd15db10ffbfffdec28ccce110ed143c4ccb0811c22cb984f5 SHA512 4359b5ae36c5430523fe8109ce6394c4403c53b7bd1f57b380563f937408fe368a7454d9f6beb3fde45469de8262bdf41b7213b9630b905e4e74b8b3704bb98c
+EBUILD sslscan-2.0.15.ebuild 2056 BLAKE2B 745768c0cbe59e5070bd9e660db6ba923ce6c0664e626dfe43aff7c9931ffec865192336a606faef59f2c8f2fa596a1b712acde81ec912f31b5e299971e8fe3a SHA512 7c5c3f1a99cba2b7c1361263180c433c452be9a261906d289a219f4c35e537d227ff1bf968e35f4788d050cfe71d3551051e4a9a5e59474621e957d04d85bad8
 MISC metadata.xml 296 BLAKE2B b16b4e5a187d36ca8495bd63c691f67ae420fcc4cc742cdd8e477534edbe36414cef5eaa60eca31bdb62b9fbd7a6922754ea0d3d2adeb6d0d4181fefcbe3cb81 SHA512 650f60a88d140869a64a7287d094832e0e553f5d0093d248c3b94f9f3565bed26784ba2e6629128b602c3fcb56496fc4a92d1cd5148acf3b00b72aae22f16780
diff --git a/net-analyzer/sslscan/sslscan-2.0.15.ebuild b/net-analyzer/sslscan/sslscan-2.0.15.ebuild
new file mode 100644
index 000000000000..56a41bfe3d9a
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.15.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+# sslscan builds against a static openssl library to allow weak ciphers
+# to be enabled so that they can be tested.
+OPENSSL_RELEASE_TAG="OpenSSL_1_1_1p"
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
+		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# Requires a docker environment
+RESTRICT="test"
+
+# S="${WORKDIR}/${P}-${MY_FORK}"
+
+src_prepare() {
+	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
+	touch .openssl_is_fresh || die
+	sed -i -e '/openssl\/.git/,/fi/d' \
+		-e '/openssl test/d' Makefile || die
+
+	# Copied from dev-libs/openssl
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	default
+}
+
+src_configure() {
+	# Copied from dev-libs/openssl
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+src_compile() {
+	emake static
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	dodoc Changelog README.md
+}
diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index 0d835c357623..aa78d4817867 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1,4 +1,6 @@
 DIST wapiti3-3.0.5.tar.gz 573630 BLAKE2B 4f6425c54542e3fcf12f50a7ebe4aeeb38083bd04e6a9415466a24ca907e787149b6462972cb6c9d29f4c89bf1f941ae2566b126746bee3697172f342befd7fb SHA512 c1bfdcd4114ec508b4b16e7a4389b23b25326816c7daf0e7fb634ce08b59b983dec92f92287a18cbe7ecde9a06a04da98cfd744f818efc57c606be143fe7db4d
+DIST wapiti3-3.1.2.tar.gz 654586 BLAKE2B 6abbb35060ef554e8b803a82744527a361fe3803871b39dc078938c4af70a3f6e1a2adeec95c0ff487aff650d92a3638cb655439d342c2b516a5279ee02af472 SHA512 cd16d5b265a49441ad45341630ea6a2df150172b774d3282ee229b5a73274eed293ad35c6fc5e26443dc96f1437dcd28b77240210840c65cb3f1f7b6e9234c2d
 EBUILD wapiti-3.0.5.ebuild 1178 BLAKE2B 89931c4319e7a120ac3fe1e06770a11691d75c41c8208e01b611448cc6bbe7b6b8d24ced28b79bc4ffd0ce5cb09607088ae6c255b93be9216623064a40e8ef5c SHA512 57d8831c22c3473923c546badfe52c067dbbc75b0bd263274d7f7ec7aa26e30f47722d1a96a5edea44e67191ad121e253652c5976bc94fc896cad4f76724a615
-EBUILD wapiti-9999.ebuild 1146 BLAKE2B aa89174a5e38d39699307d03660b2d73462cf76c46aa36b4e2795c7ba8a172f2864a5ac777a7d8b762b97962167f905bb712bddefc99b597c783adc3eb457346 SHA512 f7282751bcf844410cf488b83ebeefb0cc432f397d1bb57f3768eba2ce403f32868f1af336d601b5eb2ebaca905427fcbd39186b2f85167fe609e36cc3714a97
+EBUILD wapiti-3.1.2.ebuild 1390 BLAKE2B 562667e0a3c36ce3f4d4257cf19b67fd7016d0b79ea23568824e132209fb63bbcb9fb321b6bb1944de2ee1e173d633125d27f219bab960158a12f30c99ad9e56 SHA512 457adf9733fd0c914643dd5bad43069c983da43b06932a78626ef68faa37e26ee4716003813f03fdc86031e00b08c78660a2b54bf5eebf2b4a98ba2ba1591960
+EBUILD wapiti-9999.ebuild 1358 BLAKE2B b7d0920f05fb6a45ad568fc6a846080927a180a64b1e59e984ae129a28f1dfb0351953aee24ff6ed290fa8273c3af58dbf2b5f183067476db6abe12faf339e7a SHA512 0a82eb56c829168b37e901085c465be634343a98c227076806170b8e21b565ad4fe5c1ecacac3efe613ab7eaa20149cdde45f4fd30ca29e1b25bd430a5d7097f
 MISC metadata.xml 865 BLAKE2B e8781a338561470a25c292df4d1daf6e44321f78c9209b5606bc2fc1746853750b591b670ebd2567423926c4b65d85580e0d752c3dfd0b833b8010f4f4cb5f48 SHA512 f67382517b25273f45510a2d84128c139b9ac989584290c1ff84e22c16ba79d5a950071434ab54818a09c127db6c0ab1f3c15bb1e1171c9618b7f8c3744e9876
diff --git a/net-analyzer/wapiti/wapiti-3.1.2.ebuild b/net-analyzer/wapiti/wapiti-3.1.2.ebuild
new file mode 100644
index 000000000000..8d4a9ed067d8
--- /dev/null
+++ b/net-analyzer/wapiti/wapiti-3.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='xml'
+
+inherit distutils-r1
+
+MY_P=${PN}3-${PV}
+DESCRIPTION="Web-application vulnerability scanner"
+HOMEPAGE="http://wapiti.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Requires httpx-ntlm (to package)
+#IUSE="ntlm"
+
+# httpx requires brotli and socks, so depending on
+# dev-python/socksio and dev-python/brotlicffi
+RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
+	dev-python/socksio[${PYTHON_USEDEP}]
+	dev-python/tld[${PYTHON_USEDEP}]
+	dev-python/yaswfp[${PYTHON_USEDEP}]"
+
+distutils_enable_tests --install pytest
+# Tests also require unpackaged respx
+BDEPEND+=" test? (
+				dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+				dev-python/pytest-cov[${PYTHON_USEDEP}]
+				dev-python/responses[${PYTHON_USEDEP}]
+				)"
+# Many tests require execution of local test php server
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	sed -e 's/"pytest-runner"//' \
+		-e "/DOC_DIR =/s/wapiti/${PF}/" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
index 95c1263aa07a..e9d25d0eedfd 100644
--- a/net-analyzer/wapiti/wapiti-9999.ebuild
+++ b/net-analyzer/wapiti/wapiti-9999.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=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE='xml'
 
 inherit distutils-r1 git-r3
@@ -15,25 +15,33 @@ EGIT_REPO_URI="https://git.code.sf.net/p/wapiti/git wapiti-git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="kerberos ntlm"
+# Requires httpx-ntlm (to package)
+#IUSE="ntlm"
 
+# httpx requires brotli and socks, so depending on
+# dev-python/socksio and dev-python/brotlicffi
 RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
+	dev-python/socksio[${PYTHON_USEDEP}]
 	dev-python/tld[${PYTHON_USEDEP}]
-	dev-python/yaswfp[${PYTHON_USEDEP}]
-	kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
-	ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )"
+	dev-python/yaswfp[${PYTHON_USEDEP}]"
 
 distutils_enable_tests --install pytest
-BDEPEND+=" test? ( dev-python/responses[${PYTHON_USEDEP}] )"
+# Tests also require unpackaged respx
+BDEPEND+=" test? (
+				dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+				dev-python/pytest-cov[${PYTHON_USEDEP}]
+				dev-python/responses[${PYTHON_USEDEP}]
+				)"
 # Many tests require execution of local test php server
 RESTRICT="test"
 
 python_prepare_all() {
 	sed -e 's/"pytest-runner"//' \
-		-e "/find_packages/s/()/(exclude=['tests*'])/" \
 		-e "/DOC_DIR =/s/wapiti/${PF}/" \
 		-i setup.py || die
 	distutils-r1_python_prepare_all
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 4b3a2911f48b..2d10ae11370a 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -10,6 +10,6 @@ EBUILD wireshark-3.4.11.ebuild 7457 BLAKE2B 05a0c93f8b8137ecb865ad4cc5f409685c79
 EBUILD wireshark-3.6.2.ebuild 7258 BLAKE2B 32c295bd798526fa0c406e1662e8dc941e402c322696c7d9be524e21a4066b2671d94ffb9e1fe1df854869eab2e9c32c25cf2f43c3a512f2c25fa57af7a1fac7 SHA512 59fdf0864bf220784ced5496adc1bd15a6e0a6a992fedd1e3138e38221734b0a97c704b7dd750477990c3a81153878c7275c9486cae5b0fd2a38d06243119431
 EBUILD wireshark-3.6.3.ebuild 7088 BLAKE2B 739c59ec85023365cd17a6ed7e77f1d9a50a541bb19c53d2df6848895c0f7e21c9d76d72f2246dd1ca1df8a4fb32cda36349417140e054bd3064a62eb2b673c4 SHA512 c47811d1cb475de60906b2bff0f6423c0eb9a955dba9d4e7cf378022b028665c3d8e7c315ca5afc886f581a5f6dd450e65b976942e57d3d602f31e1863196d4f
 EBUILD wireshark-3.6.5.ebuild 7290 BLAKE2B 9488d17dfd2e7bb6b9664b75ef4f9cc35f3f8faba148701f9a376f43f7f5a01dba5dd145b8a3e822e85d2a2eecb6919b8906f7dca3268a61d85b5d1f204f3c0c SHA512 c97d5d8b388441536cd27ec737312cc0278f05947efb28a9d8a304350b84c103bf642b7668cadb476e599284ecb80c8bd80ade64af57e960cae3d0dde9458bed
-EBUILD wireshark-3.6.6.ebuild 7290 BLAKE2B 9488d17dfd2e7bb6b9664b75ef4f9cc35f3f8faba148701f9a376f43f7f5a01dba5dd145b8a3e822e85d2a2eecb6919b8906f7dca3268a61d85b5d1f204f3c0c SHA512 c97d5d8b388441536cd27ec737312cc0278f05947efb28a9d8a304350b84c103bf642b7668cadb476e599284ecb80c8bd80ade64af57e960cae3d0dde9458bed
+EBUILD wireshark-3.6.6.ebuild 7287 BLAKE2B 06d94054d433adda14fbe61d63d6cd9230f0a126fae7352586b5ce300cf54542877815aba55dd2473f7f21f1ec3b6feeaabd781325dddb1582848d8ed1bcf3a7 SHA512 3232f3c97ca079d50e787f1717be89e7f665eee086d9e27dceaf1cc9a1f0321a244f57ac3b5b6ca2ef135a3958d7694c0ecc0f90399480c63783b472b254bf4a
 EBUILD wireshark-9999.ebuild 7270 BLAKE2B 16cfb9618d7c251a1131ff1a1b8ceda2ff7975e8e4b8416e6835143e1387ed3d089287df9200416c1ed686eecfe7076564336d47b0d0dff671729782b74214cb SHA512 9d0d259670da93e2e0ecb15e8dc8d318a1d12093c948b86cbb9d51e96631b91841e807c4a8dec9111929c9b84e8c274730d7e3ddcacc2bd8e4eeb6fd7044b972
 MISC metadata.xml 5328 BLAKE2B a030872929b89f0ead3794d8bbff20354b3a1b7a35aa7c3ce37baf5170ced9d39bdc665bd23e03e70d94550085a88224ec6cd260679b2d01501b272c595442d0 SHA512 cbadc90c858ef008b763253ef548e3634643b98bf90069b3fa34bd4f947d93ee8d4a2f3c6d9c7fe4c93b4169e34681e00905b28e64f8edcff02f23867d75b265
diff --git a/net-analyzer/wireshark/wireshark-3.6.6.ebuild b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
index fffca9343012..38bd8ecc25ad 100644
--- a/net-analyzer/wireshark/wireshark-3.6.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.6.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"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index d6264b3ef728..32d5a71d3bce 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -16,20 +16,23 @@ AUX zabbix-proxy.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5ce
 AUX zabbix-server-r1.init 598 BLAKE2B 53026be133378595e83de14f939eda655d871f8caa524bf3c6496da77dcf4582a287e4365737317d710e8488ad93164eaffc5e5eca4d78f05cde820cc519d8c7 SHA512 c18e454b8944572af737052156c5985ebfa35504be43aad0465b4fa48108e9e60cf3a1326480762b89263df0d495fc793a45faea24de62f337ad2bcf57eb75a4
 AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2ef61de4715c25b0e0c97a627e6735a67c4114484950f0334fffa344d94f9192ada63887a21b617122eaf0d SHA512 d20fa4aa3a545d2f36388d7cac78c70c5610f5e7529348447e6fa6bacc33f42dd6e1c37c50b1c2711900a3f29bbbbb0ebc7c54f04d3de717aadad48e18c46e28
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
-DIST zabbix-4.0.38.tar.gz 17558387 BLAKE2B 1ddf27d76734128ddd197eb9dffeb59018282464a7322973dc4102992c0ade003d4d0291194f5b5a487d83a702917d6f0036636e56acc424bd7a7d6beb3f787c SHA512 0d38a74336c9e46b3f9985aca3508312dd5b15affeadee3497ebf8d5e59b4fa7b99ff28819b01878cbc5c9c304c1992a6a91d73f35bf1a333ae2ee561e0d7e1f
 DIST zabbix-4.0.41.tar.gz 17641873 BLAKE2B f3bb40e78662c68f0752233a72ad71d2a7ffae03a0e334736c0b9037fe3566d1b3c4c09fd3183456ae3266ac84f2cbc57c73d5e0e1853f86ebd8eafc42e0b4bb SHA512 7df356c6e99a94876abd05e708eb350448593018017eb2e3434403505a48651ddd6b40b69d84bb49b8eed5cb945c2b974fd44b85dc27fc5c3141d1cdad1b371f
-DIST zabbix-5.0.22-go-deps.tar.xz 34395200 BLAKE2B 3065878d5d61617f52ec48381a248ea13a603c13bb1cc18b6fde4e81f47bfd9dc4bafe34303e4bb46f1d7e9809d0b17acf48b782c11162fdcf04f0de89402f2b SHA512 fc30d33066248fe7c9049fec7538e1d1880d9c23d10516032027ea90e90a7531288990a33a48cbab2722a6ca67f49f79507cce7351d2c026317fc58843d4868e
-DIST zabbix-5.0.22.tar.gz 21245241 BLAKE2B d2343fc5dbc4112ef77c75bd00b8344a363a8e2acc6623a009ebd24d7116377a66d2ca94f22dee386fbee1fa9822ce7e08287cb1336fe939bd2b621fe57b5b1f SHA512 d326ed5dd81b44adf80e8cc01d32b3b7ebed0b8ffddc2870e76ffcd010513f2b2bbe4586681e5c5ab5202f88c7861078efad537bb852ee52d5c00b7712cc2aab
+DIST zabbix-4.0.42.tar.gz 17644927 BLAKE2B 1cc80aafa2a8a556c14e5675a550307b532c01433eb3892889964b9de90e1bd05456c20da6854f149e297c88ffc7f8e165ff593652759e00836418482458f014 SHA512 80993c0cc2b0235407f3b11089a1700e90db892a732194297d893caf951f360cd4777a7e2146fed8e314b71f170c49ed2c4c271e3c3e888e55998bbf7308f0c7
 DIST zabbix-5.0.24-go-deps.tar.xz 34371892 BLAKE2B 273978d3a4dd46e4d41d892f3217ae2ee0d2bfe9bed753283b5fdf3a13e6cb8f912a4726b92cc2637cb8103c63141f24d3c49c884f54598a9c4d99bed3830552 SHA512 bfafb96c6d69ad2c775add9392117c384a633b334ad447e1ec61cf6f01bd72ded0870d778650ff18a912f6ca3bc98f581052464353b22350eaf724bddc29f8d8
 DIST zabbix-5.0.24.tar.gz 21296805 BLAKE2B 16c3fe6ef0732d627c70555b80961308ba9049978efc51c44162e5ceb940369ce36f87f33e6725de789c97d29edb2d0b4c2b2e58ac56a95e1b644cff13d2f64b SHA512 5ad70fdd189ce2630c019df6edad70fbfa7d2b0f72b42ae1950fb844f3edadf87c3108eefa7f3d343d4c3464d8aa58036dfbcab4109682d40b455788019dd62b
-DIST zabbix-6.0.3-go-deps.tar.xz 35806596 BLAKE2B bf86722b1ee26237e42b4b3b5558415e0eb29dbe675b70585c8bb06c0b1e469ed9887e425778503c1d42ee2bd938b085f544d0696d080e04957dcb5794b7afa4 SHA512 0a5a051561dee2f3e42f18fff9127e3c8a0b5a7cae3a828a880866feac81a21ef71ba83c53f9e5a37fb3eee78475974b2f30ba5398012aeca6adf8d3cea74399
-DIST zabbix-6.0.3.tar.gz 33135282 BLAKE2B d2cb50678710e96737e72ddb4b0b02d4695f872df6cab2edfd50d343ffc0103eec3191bfa02d8421e29c583f6d478598effc22a0f8d3f76b57a9ac3b4e4369fe SHA512 f93a7b4b19d2a1561e42ef67378bfb94a5edaae5b9bba8f2214de3bad1bf9d7efcb32da9f1b3ee820cc6bdc68308286606c4ceb7e1ba0ab42e24045c56f8ce47
+DIST zabbix-5.0.25-go-deps.tar.xz 34381664 BLAKE2B 2da35cac59efe069587ad8217385cd276be340e9f0c37483c1a3aa500b03e0139122ca75437a1646fdb3d26ff7a824160d663cff758cf0a91fb08252606640ac SHA512 625f0cdde87cff17bfb2e348a03ffab5374a5d7657c1510abeda5e0a313658625eda946474bc7b7bf7a778d8cf0b498215f9e26ee2c72c6456e87065071ec0ac
+DIST zabbix-5.0.25.tar.gz 21300141 BLAKE2B 271d10a051b08d5d172d312b48a077e600856cef954201b0c11b1b4e96c70681ebe82e382893689199f6567922ed2e08b3bb534b77ccf1eed099049ccf45002e SHA512 b66776f2ceaaef7c3b74cb47b99d96dcdb614cdae2f54d096046c2aeeb82c8c9c65ca17c95773551bfa867113ca36b29acb72a9102f0ccef930c16f0a4997774
 DIST zabbix-6.0.5-go-deps.tar.xz 36045828 BLAKE2B 71827dfb5313b986ed23c5c1d7a99a020feabe81b6ee8c7c13d7fda40ce8f5f6d7de26a05daba5fa2e589fc2577f2bcc0961d4f8f0881faaaa986f13e4ae0a16 SHA512 6c8f6731cc29df4d5870cfab71c809e5c844ebc88649b9d25fb6ef7c3671e2a247aad1a24dcaa4cbb35039cce57cfabfa7ac56473bd5b9317bb5ecaa0cbd2d53
 DIST zabbix-6.0.5.tar.gz 33778804 BLAKE2B 5bc2c370895c4744b6deb9d7c0501d890ffb2c343992ca2cee25872e29f0465e808905bf1a9c86749a2bfe56fa05aac521c1cff0549686426e7bd412dbd9ce58 SHA512 c4a431ba9c22ccb59c6eaac4147e40390e5e9a1f7a13638f2daa3dab3a75145104e711585b374eed0e663a3dc495d4b3b74c78b7676baafbfcca983f645054e8
-EBUILD zabbix-4.0.38-r2.ebuild 9414 BLAKE2B b0abe7853c37cd78b5c2176eaafb891407b2a0cd9e7dea933d313a6f0f71188f59d1c86951bed73c445c954215bdec48fce47373d842d5e1cc6268e0e1b678c5 SHA512 509a7802245e0605ebc5424806594fa8ff9d73af492761f65a70985a86236f367358d40c67f1ca644647d5c4930b48f3351b4daae53cc2a39b89a79decac925e
-EBUILD zabbix-4.0.41.ebuild 9416 BLAKE2B c594ca9fb069ef5dc5ef2dfa4f5136e0a66257dd171b056a9073391451b4742e04d4bb38da379f0c0998a30d3a1c0ca8138f62909bba57ba06cb4130521f9b0b SHA512 a650f9c0496c8e2ffd76bd2e1b37071c097aba69f6bb71612570fca5c71049b8f51e3865152205e73c1889a2b1fbdaca192c36109ab1ebd111698f0f90b1eebd
-EBUILD zabbix-5.0.22.ebuild 9984 BLAKE2B b226c3369896e9b37304e62564598745def257e964ee126dd15201f0848b128ff8e49586cdf5242b0f4c680eb0eb3708a2679faf308c317033aa70d645287114 SHA512 595a07aff09e6743a52717e01e78a0963cd1fd647171a50d76d5d6b248aa9e59d5fc9f10c0b378384cecd9125575cef87103ecabb076fbe2942c5c683772cbdf
-EBUILD zabbix-5.0.24.ebuild 10144 BLAKE2B 8654a84618f3e5ab22ca790bebc7db5badb60c0bea942027b74e50422be47f39380a873a2e01deadd58b9aa978b30392811fb6de88291416f15073d291163d85 SHA512 0a67f7c92f94eddd9be23aef921ad3306b2093f77a26a9cc9234cc0ce764e24ea292f221ba0f751148eea557974dd0f9a35c87ef748040d84dd2b4dc66740d14
-EBUILD zabbix-6.0.3.ebuild 10576 BLAKE2B c9b2bd52b451da1b8cc19c1d816f0bc40dc3fdf05a7aa3dbc00bb2d74ba172e0b7f340daacba0db1e1ec15ce40eb888e86ac4ca765294218217357aae2bfbe34 SHA512 7389732ed4f6e1e58bf4e7424329d8034f1f859e7a77db6ca234b9eb06e05f2966dbf2eb68e74222f4969b9cb830f6b37e7bbbd432d154bdd67634a1e964bd10
-EBUILD zabbix-6.0.5.ebuild 10736 BLAKE2B 48df3088111b7f76838b064a9bc239577b0d7526b3dd9daa82fbf2dbb8d39dbbe41e629e45342ca70538f26cf47dd7ca856cdae97d20a8bcd892f52b6746d50f SHA512 08ea68bb9224bb5eeea1e138952ebc63c6f25152f7386c3b8ed79d2c2f74b8d0626c485e139b31a9508563e212e51030d1348ef62935695946dde6e113cf64ed
+DIST zabbix-6.0.6-go-deps.tar.xz 35349508 BLAKE2B 14aa70142d19d1ad146d5fab6208b1133a35796a67c6dd709df2fa7a00b013229ff852e58384ca01ed3c5feeb7f697da91d7096839e2434f3b5fe89b6f315cbb SHA512 5864e268e7432cd04f389c4e6be6c871f0de402ccc0c846900daa1d77389e2839bbe1d225fcf2ac50d6052014e1efe3c8da8b02d83f46a411210edde39ed372c
+DIST zabbix-6.0.6.tar.gz 34013189 BLAKE2B f9d07ca8938ae4e5e47048c32872644caeda0ecdef17513c63c63d1ce2aaa4ac0c92e6c70932bc598ff908419dae05bab32924f5973a5528b5668f7c7c2c5a17 SHA512 4fc21f54cdfc09b5627a8e8dbe77ac645be7f3d3a0f18fc940cf136d05410ade755c3b4869254a47e9e316dba2b5da6b709a20a023b9cd765ad16094efcded43
+DIST zabbix-6.2.0-go-deps.tar.xz 35398044 BLAKE2B 8f7a7ec5b806a22f2f1a6b652c7cb25af3fd503ac7e6ea16e2ab565716bf94f5dc4a290aaf17642bd9da937828ec984e582e876e871f8012eb44700c4ded1089 SHA512 4324b40c28b12b1032d76ff79da95220a47f3adea5f79e1d02ca85043234eaed91c33e309f5be49728054af19cf668df6b24f6fa4d715b67821e8c3a61eb62a8
+DIST zabbix-6.2.0.tar.gz 34472773 BLAKE2B 2b90937f453825ba240d776a279d9bb4958c15da6cbef68c4c62bf4312c7967d8b7e0b3561d022c663ba8b42545bfd5757241c4ef13cc53b78c8135306e71e70 SHA512 4492dbd7c7acb55827ee17e7eee579d1cfdcf5fd499505c6e24f50ea361641a0813672149a87f076b2287896d56d8d0215d8c5e78b32b684386414024624d322
+EBUILD zabbix-4.0.41.ebuild 9414 BLAKE2B b0abe7853c37cd78b5c2176eaafb891407b2a0cd9e7dea933d313a6f0f71188f59d1c86951bed73c445c954215bdec48fce47373d842d5e1cc6268e0e1b678c5 SHA512 509a7802245e0605ebc5424806594fa8ff9d73af492761f65a70985a86236f367358d40c67f1ca644647d5c4930b48f3351b4daae53cc2a39b89a79decac925e
+EBUILD zabbix-4.0.42.ebuild 9416 BLAKE2B c594ca9fb069ef5dc5ef2dfa4f5136e0a66257dd171b056a9073391451b4742e04d4bb38da379f0c0998a30d3a1c0ca8138f62909bba57ba06cb4130521f9b0b SHA512 a650f9c0496c8e2ffd76bd2e1b37071c097aba69f6bb71612570fca5c71049b8f51e3865152205e73c1889a2b1fbdaca192c36109ab1ebd111698f0f90b1eebd
+EBUILD zabbix-5.0.24.ebuild 10142 BLAKE2B a71d8c7d65a4fdf930662b476416c416f519aaedd1489ede7da5b442d5aa2788625385bc8f0af28202f1261d10ebaa0b6dab3d449a7391df036b09a8646791cd SHA512 8053a8a2445a8aee9f029fb5ef61478b4e6beb4dbd0181c3054f34a59d8c6ef7f07c094588ede931371e02faf672c8d89f6e2f2baa1e5fee0e9866f34ed426a4
+EBUILD zabbix-5.0.25.ebuild 10144 BLAKE2B 8654a84618f3e5ab22ca790bebc7db5badb60c0bea942027b74e50422be47f39380a873a2e01deadd58b9aa978b30392811fb6de88291416f15073d291163d85 SHA512 0a67f7c92f94eddd9be23aef921ad3306b2093f77a26a9cc9234cc0ce764e24ea292f221ba0f751148eea557974dd0f9a35c87ef748040d84dd2b4dc66740d14
+EBUILD zabbix-6.0.5-r1.ebuild 10737 BLAKE2B e249cd00548e05fa986df84d4d53c5277195b60a6aa433c8f6cc0d6824e950efc00b644b7f6b7af638431d57f26149b0848139fdaaa295d282497b8aa56cdfe0 SHA512 a94a896619edb99e9ab841c63516a4a6fd673ea21a1b6276d65a9dff5e55f93825b88396defdb164c59f550e3537c18e5a59698aa98e6c50919dc9f1bc3f75fc
+EBUILD zabbix-6.0.6-r1.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
+EBUILD zabbix-6.2.0-r1.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
 MISC metadata.xml 1713 BLAKE2B d0c1fe7a3627dca5b11601ac5bc360f43476d4a14aefaa7eae021faa636cdd5b5054a4556c8c81933ad6d3638781942e51c01a550463e7b14946004fa8be3366 SHA512 8e5be31d41c1f749cda5b889ec7a1185428d88e21201c02d7066b4416ba3c6d4a9ddc23812e7caeb313dbc2b3ad7c9fd39eae141498ed137b8048fd41d6520d8
diff --git a/net-analyzer/zabbix/zabbix-4.0.41.ebuild b/net-analyzer/zabbix/zabbix-4.0.41.ebuild
index 1e0af68937f8..b6f830af64d9 100644
--- a/net-analyzer/zabbix/zabbix-4.0.41.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.41.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 static xmpp"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	?? ( gnutls mbedtls openssl )
diff --git a/net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild b/net-analyzer/zabbix/zabbix-4.0.42.ebuild
index b6f830af64d9..1e0af68937f8 100644
--- a/net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.42.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 static xmpp"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	?? ( gnutls mbedtls openssl )
diff --git a/net-analyzer/zabbix/zabbix-5.0.24.ebuild b/net-analyzer/zabbix/zabbix-5.0.24.ebuild
index d3c97bb80618..901c486faa9c 100644
--- a/net-analyzer/zabbix/zabbix-5.0.24.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.24.ebuild
@@ -24,7 +24,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 static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-5.0.22.ebuild b/net-analyzer/zabbix/zabbix-5.0.25.ebuild
index 8af8fafcd005..d3c97bb80618 100644
--- a/net-analyzer/zabbix/zabbix-5.0.22.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.25.ebuild
@@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
 EAPI=8
 
 GO_OPTIONAL="yes"
@@ -19,7 +24,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 static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-6.0.3.ebuild b/net-analyzer/zabbix/zabbix-6.0.5-r1.ebuild
index 2c899addb40c..0a0d755be321 100644
--- a/net-analyzer/zabbix/zabbix-6.0.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.5-r1.ebuild
@@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
 EAPI=8
 
 GO_OPTIONAL="yes"
@@ -140,10 +145,6 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
-	default
-}
-
 src_configure() {
 	local econf_args=(
 		"$(use_enable agent)"
@@ -196,7 +197,6 @@ src_install() {
 	)
 
 	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
 		keepdir "${dir}"
 	done
 
@@ -255,6 +255,7 @@ src_install() {
 		doins "${S}"/src/go/conf/zabbix_agent2.conf
 		fperms 0640 /etc/zabbix/zabbix_agent2.conf
 		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
 
 		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
 
diff --git a/net-analyzer/zabbix/zabbix-6.0.5.ebuild b/net-analyzer/zabbix/zabbix-6.0.6-r1.ebuild
index c3f2fa649574..4b12b01e37ea 100644
--- a/net-analyzer/zabbix/zabbix-6.0.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.6-r1.ebuild
@@ -145,10 +145,6 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
-	default
-}
-
 src_configure() {
 	local econf_args=(
 		"$(use_enable agent)"
@@ -201,7 +197,6 @@ src_install() {
 	)
 
 	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
 		keepdir "${dir}"
 	done
 
@@ -260,6 +255,7 @@ src_install() {
 		doins "${S}"/src/go/conf/zabbix_agent2.conf
 		fperms 0640 /etc/zabbix/zabbix_agent2.conf
 		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
 
 		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
 
diff --git a/net-analyzer/zabbix/zabbix-6.2.0-r1.ebuild b/net-analyzer/zabbix/zabbix-6.2.0-r1.ebuild
new file mode 100644
index 000000000000..4b12b01e37ea
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.2.0-r1.ebuild
@@ -0,0 +1,411 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		!pcre2? ( dev-libs/libpcre )
+		pcre2? ( dev-libs/libpcre2:= )
+		net-analyzer/fping[suid]
+	)
+	server? (
+		app-admin/webapp-config
+		!pcre2? ( dev-libs/libpcre )
+		pcre2? ( dev-libs/libpcre2:= )
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_configure() {
+	local econf_args=(
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	if use pcre2; then
+		econf_args+=( --with-libpcre2 )
+	else
+		# If pcre2 is not enabled, then use the old pcre library.
+		econf_args+=( --with-libpcre )
+	fi
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			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.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+
+		if ! use pcre2; then
+			ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
+			ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
+			ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
+		fi
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
commit	2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree	8c816148bcbd22757d892089c989ae614eae4f5a /net-analyzer
parent	0f558761aa2dee1017b4751e4017205e015a9560 (diff)