gentoo auto-resync : 20:08:2024 - 12:25:59

8 files changed, 780 insertions, 338 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6353cc57d25a..30ad62296b91 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index 721b117392bd..4e2621e59340 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -7,12 +7,8 @@ AUX redis-openvas.confd 527 BLAKE2B 84bc4461630b19b02c724f72d22b0b4d04dd63a22575
 AUX redis-openvas.initd 809 BLAKE2B bed6e09975c82fa190fa9caa833a49632085686c5d2b57e229b1fbede98676fe451010de08ef4f2a338f6878685982905bb8edb4ec467988e0c36a746e07dcc9 SHA512 aef62b465f0adc2958fcad81a579a8af337d2fac55e1c4efc1e82ccb1f609f96c0582e18f447c8272e2684fd2498f7bd9beee5cac6d19337afd42a1634d3c93b
 AUX redis-openvas.service 280 BLAKE2B 9a11408cec88a57ae71fc4a4fced63dc3d35157c979409f4db5037a9cca1c386b0521d30064a741fe5d6e8891c84bf561fcf609ef35082c6ca34ce98f4a1ee31 SHA512 3afd6b57efcbc9bd90fc88a9021094a0fc7f27bd0805077e71df1ba94de8d1687a209ac730f0014f9c3af5ddbd8a77b85ac07dd09bd98551a24f10a0791b24d1
 AUX redis-openvas.tmpfiles 63 BLAKE2B 8e3d29cef1ae0f815f7ef4da76b14168168675be4174ed1435521c26633a1f76088ab3cba5283e0c03d9f1e03abb085fdcfdb83d741f9132096df317f7f19c11 SHA512 936613951d7249c5536b4b20128bc4aef66fc05de95bece6cf2436117ed95d5dfba81cc7e16db9f765708b618a74ad83fcc52c7ccb8ccf480dd3cb4ce64cc986
-DIST openvas-scanner-22.7.9.tar.gz 1069904 BLAKE2B 908810997880d1267f41df59905acc2ac2d491ab8453001ae8e2cc6881958150e8866b07b4e335888e8e574b5a347b33880bd24c9b8d140edd6c384e498e5dc9 SHA512 279a781fe698496fb88efd28c0ee6ede66a0180237b60c4d7b083fe10c7b7ac054ec04b08c9b33e6dd142f60529faedfef4441421cc04e95eaa08865e47b58dd
-DIST openvas-scanner-23.0.1.tar.gz 1387550 BLAKE2B 22f0b7f10fbb8be7d0897ce1895035ec9e330adee2a56d7c724e9e9fd54808ed10de5f05b3bb02918e44e45a7f85035e7d63fdd89345dcdb09d5180740823c74 SHA512 e2107ca762abcbb20d4506d2cc4479d5fbf5efd744a598ec63ea3c66ae6a6f1743deeb4b7aa9863b78c186c8a4d4b5f2212d241cef51b91c6c5bcd0879c45dc7
-DIST openvas-scanner-23.3.0.tar.gz 1416508 BLAKE2B de5864183b19df7b825bb74a5c38493b484494c5ef0f871f83e77efd6f6ce9934fd0a2365c5e7fe2b53e0c3f0c6a0eccd57528571dcd8586cbe5ef575aa5ec4f SHA512 cebe73f376a0b7731ffcb3eb9eb6e223ad490d8c0b708f07f508c562f2cfea956fa61e2bfb9141d2bf826c727be901ef2f455b74c055032f72cd52b7591bd171
 DIST openvas-scanner-23.3.2.tar.gz 1416687 BLAKE2B 6d8b0ba5b0a6f503ef27962fc9007f5538ecc6747aa713baec402acb20c5f7da01743a055173ed736ea90beb6d62f54ad8db8bffc915ce946416553f953b9842 SHA512 045a0811b5480170e52a218c8005d01acf064658aa0c3999ec9c07df9a0da47c53ad3de17565c1542c6f13521153e0477e9fdf92dee5f05e6723e29915cebc15
-EBUILD openvas-scanner-22.7.9.ebuild 3657 BLAKE2B 38af296726719db9d3c3727aa271475ae255296ac8a36151022cb25dcb8c8066e34c2dff6bdc00e8c8777163f4262dd38fda3b4887a08de3ad8113eb4777e7c8 SHA512 55a156026a45e02d50e4684c93d9284de88cbd1da725f6b1a17453f472c6dcc19e99dffc6b2780a23804a26db3743331c3e486e3290073e267a389620fdb3d04
-EBUILD openvas-scanner-23.0.1.ebuild 3780 BLAKE2B bfefffbd95c2be01ae02aabc773ebc231ce372543199ff90d3baf2e0df6002692e5e4e99db38b0a2d5f2b3226e9756f1551a947e0c28f78f79c2124a3d94a7e2 SHA512 932807fc8f505db39f376dd9897c895bd9ccdc18870ca94a84036a30714a919e366da06f20bc24eb9b67ca7562f4075b287d8c70177e7524a403d9ad937b52ad
-EBUILD openvas-scanner-23.3.0.ebuild 3779 BLAKE2B 72df699aeb35d24116a4393ea9859800f2cd254a2056f95cf4424d6c9c0b87a311104f03e48ef4c9687217113d09c2165e8e144dc465f7af1151c73b03272e93 SHA512 63feacfddbcb042f57960457fc390fea1892564a0cd2111746fb2869e15dad818655b7e663849673faaeaa6128c2efffc2b7336a488e10afc4d17b501034747c
+DIST openvas-scanner-23.8.4.tar.gz 1448233 BLAKE2B 6ee681ebae29cecfdb237ac9e60959bc8cdaa5acf04af7e4d8b3de587a72f827101a6609e7434a34459b12842d555da2ecaf30c571609bdf7359e7d9c406b7c1 SHA512 63a5301610f16d046b709849dfe4c8a3cc57f551de0c8c30ae701cb278ba4ade964b1007efd14d74eedf1077537ae05b4fd6f84dd62a730240ee12fc85397a9b
 EBUILD openvas-scanner-23.3.2.ebuild 3651 BLAKE2B 8d2855780cb2d3fdff53c18c0a87c696e1f66de535bcc05cafebed489d8877726ec4814781121e4df4b96ad7be5a23dadab1d533c4ccc04f3391d4a383ac681d SHA512 44fed7d6e1c8aadaff21b220e0a2eb333de8c53ceea05beaa3c36f2ca191cb1add884d9ae6015e094429c9480f7547fa517618b72dc686ecdd670e6030ef7eeb
+EBUILD openvas-scanner-23.8.4.ebuild 3652 BLAKE2B ac47a105e1970e5cf20c3e19322c44af5e5e8d9e42be927fe983e059bc00498a66467f10edc48bf17bc7727ae15e09c2038585114ce57a08d456445be8620935 SHA512 6ac5234552af6186b05cb8bc231e0f3d7c2442207c85e039038b63751781156076e968f3686092f3e6faeb039a0b77be2ca2fc55abb39e50772e552e8c5fc4bf
 MISC metadata.xml 1082 BLAKE2B a428b18c1fba3380a42e1120fc58c8c950900723f5cb11febdff5d86cd16bce0a17fcdb4c48867435a7c39243a7fa7e5c15ebb3fb0d6d44fc23ef56197530b6a SHA512 e41f348b1ae728e27efb71e5ebb9e468ac5d0b31526a4db922f1bc2d3f3029a5b75be2db6cbac14754107326c4af570e6673b2e66f44317677e319116daadaf6
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild
deleted file mode 100644
index 8e66176a615b..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd tmpfiles toolchain-funcs readme.gentoo-r1 optfeature
-
-MY_DN="openvas"
-
-DESCRIPTION="Open Vulnerability Assessment Scanner"
-HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/"
-SRC_URI="
-	https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-SLOT="0"
-LICENSE="GPL-2 GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc snmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-user/gvm
-	app-crypt/gpgme:=
-	>=dev-db/redis-5.0.3
-	>=dev-libs/glib-2.42:2
-	>=dev-libs/libgcrypt-1.6:=
-	dev-libs/libgpg-error
-	>=dev-libs/libksba-1.0.7
-	dev-libs/libbsd
-	>=net-libs/libssh-0.6.0:=
-	>=dev-libs/json-glib-1.4.4
-	>=net-analyzer/gvm-libs-22.4
-	>=net-libs/gnutls-3.6.4:=
-	net-libs/libpcap
-	>=net-misc/curl-7.74.0[ssl]
-	snmp? ( net-analyzer/net-snmp:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=sys-devel/bison-2.5
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen[dot]
-		app-text/xmltoman
-		app-text/htmldoc
-		dev-perl/CGI
-		dev-perl/SQL-Translator
-		virtual/pandoc
-	)
-	test? ( dev-libs/cgreen )
-"
-PATCHES=(
-	# See https://github.com/greenbone/openvas-scanner/pull/1611
-	"${FILESDIR}"/openvas-scanner-23.0.1-link-pcap.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# QA-Fix | Remove -Werror compiler flag
-	sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die #909560
-	# QA-Fix | Remove !CLANG doxygen warnings for 7.0.0
-	if use doc; then
-		if ! tc-is-clang; then
-		   local f
-		   for f in doc/*.in
-		   do
-			sed -i \
-				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
-				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
-				"${f}" || die "couldn't disable CLANG parsing"
-		   done
-		fi
-	fi
-
-	#Remove tests that doesn't work in the network sandbox
-	if use test; then
-		sed -i 's/add_test (pcap-test pcap-test)/ /g' misc/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		"-DSBINDIR=${EPREFIX}/usr/bin"
-		"-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock"
-		"-DOPENVAS_RUN_DIR=/run/ospd"
-		"-DBUILD_WITH_NETSNMP=$(usex snmp)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_build -C "${BUILD_DIR}" doxygen-full manual
-	fi
-	cmake_build rebuild_cache
-	if use test; then
-		cmake_build tests
-	fi
-}
-
-src_install() {
-	if use doc; then
-		mv "${BUILD_DIR}"/doc/html "${BUILD_DIR}"/doc/html-manual || die
-		local HTML_DOCS=(
-			"${BUILD_DIR}"/doc/generated/html/.
-			"${BUILD_DIR}"/doc/html-manual
-		)
-	fi
-	cmake_src_install
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/log/gvm
-	if ! use prefix; then
-		fowners gvm:gvm /var/log/gvm
-	fi
-
-	keepdir /var/lib/openvas/{gnupg,plugins}
-	if ! use prefix; then
-		fowners -R gvm:gvm /var/lib/openvas
-	fi
-
-	insinto /etc/openvas
-	newins "${FILESDIR}/openvas.conf-22" openvas.conf
-
-	systemd_newunit "${FILESDIR}/redis-openvas.service" redis-openvas.service
-	newtmpfiles "${FILESDIR}/redis-openvas.tmpfiles" redis-openvas.conf
-
-	insinto /etc/gvm
-	doins config/redis-openvas.conf
-	if ! use prefix; then
-		fowners -R gvm:gvm /etc/gvm /etc/gvm/redis-openvas.conf
-	fi
-
-	fperms 0750 /etc/gvm
-	fperms 0640 /etc/gvm/redis-openvas.conf
-
-	newconfd "${FILESDIR}/redis-openvas.confd" redis-openvas
-	newinitd "${FILESDIR}/redis-openvas.initd" redis-openvas
-
-	if use prefix; then
-		diropts -m0750
-	else
-		diropts -m0750 -o gvm -g gvm
-	fi
-	keepdir /var/lib/openvas/redis
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	tmpfiles_process redis-openvas.conf
-	optfeature "port scanner" net-analyzer/nmap
-	readme.gentoo_print_elog
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-23.3.0.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.3.0.ebuild
deleted file mode 100644
index b26024cee8d1..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-23.3.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd tmpfiles toolchain-funcs readme.gentoo-r1 optfeature
-
-MY_DN="openvas"
-
-DESCRIPTION="Open Vulnerability Assessment Scanner"
-HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/"
-SRC_URI="
-	https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc snmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-user/gvm
-	app-crypt/gpgme:=
-	>=dev-db/redis-5.0.3
-	>=dev-libs/glib-2.42:2
-	>=dev-libs/libgcrypt-1.6:=
-	dev-libs/libgpg-error
-	>=dev-libs/libksba-1.0.7
-	dev-libs/libbsd
-	>=net-libs/libssh-0.6.0:=
-	>=dev-libs/json-glib-1.4.4
-	>=net-analyzer/gvm-libs-22.4
-	>=net-libs/gnutls-3.6.4:=
-	net-libs/libpcap
-	>=net-misc/curl-7.74.0[ssl]
-	snmp? ( net-analyzer/net-snmp:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=sys-devel/bison-2.5
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen[dot]
-		app-text/xmltoman
-		app-text/htmldoc
-		dev-perl/CGI
-		dev-perl/SQL-Translator
-		virtual/pandoc
-	)
-	test? ( dev-libs/cgreen )
-"
-PATCHES=(
-	# See https://github.com/greenbone/openvas-scanner/pull/1647
-	"${FILESDIR}"/openvas-scanner-23.3.0-link-curl.patch
-)
-src_prepare() {
-	cmake_src_prepare
-	# QA-Fix | Remove -Werror compiler flag
-	sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die #909560
-	# QA-Fix | Remove !CLANG doxygen warnings for 7.0.0
-	if use doc; then
-		if ! tc-is-clang; then
-		   local f
-		   for f in doc/*.in
-		   do
-			sed -i \
-				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
-				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
-				"${f}" || die "couldn't disable CLANG parsing"
-		   done
-		fi
-	fi
-
-	#Remove tests that doesn't work in the network sandbox
-	if use test; then
-		sed -i 's/add_test (pcap-test pcap-test)/ /g' misc/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		"-DSBINDIR=${EPREFIX}/usr/bin"
-		"-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock"
-		"-DOPENVAS_RUN_DIR=/run/ospd"
-		"-DBUILD_WITH_NETSNMP=$(usex snmp)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_build -C "${BUILD_DIR}" doxygen-full manual
-	fi
-	cmake_build rebuild_cache
-	if use test; then
-		cmake_build tests
-	fi
-}
-
-src_install() {
-	if use doc; then
-		mv "${BUILD_DIR}"/doc/html "${BUILD_DIR}"/doc/html-manual || die
-		local HTML_DOCS=(
-			"${BUILD_DIR}"/doc/generated/html/.
-			"${BUILD_DIR}"/doc/html-manual
-		)
-	fi
-	cmake_src_install
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/log/gvm
-	if ! use prefix; then
-		fowners gvm:gvm /var/log/gvm
-	fi
-
-	keepdir /var/lib/openvas/{gnupg,plugins}
-	if ! use prefix; then
-		fowners -R gvm:gvm /var/lib/openvas
-	fi
-
-	insinto /etc/openvas
-	newins "${FILESDIR}/openvas.conf-22" openvas.conf
-
-	systemd_newunit "${FILESDIR}/redis-openvas.service" redis-openvas.service
-	newtmpfiles "${FILESDIR}/redis-openvas.tmpfiles" redis-openvas.conf
-
-	insinto /etc/gvm
-	doins config/redis-openvas.conf
-	if ! use prefix; then
-		fowners -R gvm:gvm /etc/gvm /etc/gvm/redis-openvas.conf
-	fi
-
-	fperms 0750 /etc/gvm
-	fperms 0640 /etc/gvm/redis-openvas.conf
-
-	newconfd "${FILESDIR}/redis-openvas.confd" redis-openvas
-	newinitd "${FILESDIR}/redis-openvas.initd" redis-openvas
-
-	if use prefix; then
-		diropts -m0750
-	else
-		diropts -m0750 -o gvm -g gvm
-	fi
-	keepdir /var/lib/openvas/redis
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	tmpfiles_process redis-openvas.conf
-	optfeature "port scanner" net-analyzer/nmap
-	readme.gentoo_print_elog
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-22.7.9.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.8.4.ebuild
index 5c8c16dce1d2..4437e7dc21b4 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-22.7.9.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-23.8.4.ebuild
@@ -13,26 +13,27 @@ SRC_URI="
 	https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz
 "
 
-SLOT="0"
 LICENSE="GPL-2 GPL-2+"
-KEYWORDS="amd64 ~x86"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc snmp test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	acct-user/gvm
+	app-crypt/gpgme:=
 	>=dev-db/redis-5.0.3
 	>=dev-libs/glib-2.42:2
-	>=dev-libs/json-glib-1.4.4
-	>=net-libs/gnutls-3.2.15:=
-	>=net-analyzer/gvm-libs-22.4
-	net-libs/libpcap
-	app-crypt/gpgme:=
 	>=dev-libs/libgcrypt-1.6:=
 	dev-libs/libgpg-error
 	>=dev-libs/libksba-1.0.7
-	>=net-libs/libssh-0.6.0:=
 	dev-libs/libbsd
+	>=net-libs/libssh-0.6.0:=
+	>=dev-libs/json-glib-1.4.4
+	>=net-analyzer/gvm-libs-22.4
+	>=net-libs/gnutls-3.6.4:=
+	net-libs/libpcap
+	>=net-misc/curl-7.74.0[ssl]
 	snmp? ( net-analyzer/net-snmp:= )
 "
 RDEPEND="${DEPEND}"
@@ -82,7 +83,6 @@ src_configure() {
 		"-DSBINDIR=${EPREFIX}/usr/bin"
 		"-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock"
 		"-DOPENVAS_RUN_DIR=/run/ospd"
-		"-DINSTALL_OLD_SYNC_SCRIPT=OFF"
 		"-DBUILD_WITH_NETSNMP=$(usex snmp)"
 	)
 	cmake_src_configure
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 99d97c2894ee..361ff84301b0 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -36,10 +36,14 @@ DIST zabbix-6.4.16-go-deps.tar.xz 33766756 BLAKE2B 24ce0f3febbdeaf16f54eb351861b
 DIST zabbix-6.4.16.tar.gz 46717893 BLAKE2B 69212ba902195cabc38a14c9c0865d3f613662b58c5d21b654f030e888d9a33eec8c2149478b1e28af2bcfae07c9f34d5bc2531d17fd15f095916dfb64d76e64 SHA512 1688ac2fa6f3361f866f93e39b38c898e2460c510b982301b67899bcf42fb3949c843918fd0b566c5c1126ef8cb39407d5b73d22c6a0fd7a8404506df0544e33
 DIST zabbix-6.4.17-go-deps.tar.xz 34014892 BLAKE2B d3e4710fb1cb86a8842cef4fb66a9d68df6738cf6cf4c9a9d219f6af16e4829627c668fefca79d7face897b529b76182f0068629f4278ed68af8c97e49a204a7 SHA512 96b58aba2b14b5f9c89aeb65efbc30304fab1e276d2cb2b23cac90510b71ab6ce7dec4520ebe5c1dc244e95475dfa259e320390078b10aaaf8042d8039342bdb
 DIST zabbix-6.4.17.tar.gz 46879401 BLAKE2B 957ae298e09debeb962d6b902569eb083cd3b6f93371984c7adb4464e4c1547292bf9df6ced5440c775b81e7b3276d8ec124f844de7d3bc68639a7bab1e41c2a SHA512 ef0840427c1814c6292debbabaa0754f377d1b4ad8c36474acabfd5d474cc3d0ceef36daccf2aa545ccda66e42b674ca3fe038eea9569127adc08cbfacf87b55
+DIST zabbix-6.4.18-go-deps.tar.xz 33714692 BLAKE2B abb5899e8ce233fe20a84e167b3615e46c578901df6786cb7e7781f355b108a44bb06ba68426483d5c5eb11fd5c0984efa945224d53f0ebd4a358e9a35c48b26 SHA512 8032fca6dff2f48f16e6c7e37d3df06336276c7f242654996b80f7c5eb083d289f5e6d65c8df79e22b956d28ba498e68eb2fe42adeedac97942bb73a23122d1e
+DIST zabbix-6.4.18.tar.gz 46907603 BLAKE2B 978c51a40995687537c453feac1232d39490fa4f49973f3a7febe6e7a0d5424b056b26f7f2509cb7e8fca8c9c648e7fe16208e7f72850fb3a73d92d09e0115c0 SHA512 b7a6b7bd5321bd7921a9ecb5fb205a872dc5db06a82cb307a26233cf5ee644f8a6d8087b03396bdef4a86095839e5c79cc269b19b27adefb13aa387bc5607cbd
 DIST zabbix-7.0.0-go-deps.tar.xz 33347940 BLAKE2B 7da8c3ff2bb74c31c551d61fa3d5ffc6d6a330361eea178dffc5379412da2fce9330acfe35bef2ae1c515a47ecef3ff24f54f17692cb32226d928b4f1d2072e8 SHA512 a365da2fb5dc3ecdaa2a4c4ee53aa022b298ded16e150814cc0cbd3b9dbaa12d5f163130724ba2ac6a129acc99386b7fd81ca3834d69fb856bdc805d90c0d3c2
 DIST zabbix-7.0.0.tar.gz 47919968 BLAKE2B dc6736a1e433b5f0d742ec9e908b47a0094da77f69103d566b7476379a28819e46d9327d53e388b9ccfeb7b3b4d976fb47ba94a02057ab62ef8294e19af00188 SHA512 3302f6f7b8731e25c87d1582f897d25b8e9b5eeeddb3632aea57e39bb7a47acbaa5e74e175e83166ea3476e7e932f3282b6cc353104cdfc87dea3d4976fbc703
 DIST zabbix-7.0.2-go-deps.tar.xz 33723108 BLAKE2B a1a726e81d92c536ac1398c0573912477ec8fc88b95672da2dc972f68399cd4364438a8e4d0c8ea10666a0861d2ba652fa32921ce5bada990627f256858e0c6e SHA512 76949158cc8281b35a2ddfb1c2c9b36f1a4dbaea05fb6add0b20f31a59f32ace641de789a1f819eb73a56353f7e456785a69763cea960aaa46ef9d6ba9b34d7c
 DIST zabbix-7.0.2.tar.gz 48162883 BLAKE2B a6323e2e8960e9df0127f1f688cfb3ff4cdde7edcfce189176aa1fa3cfed847beb67d35415df18a18ed1da674496e1f60a2c45269ee6dff34fd83cbb424c9221 SHA512 3f5aca53d767630b5bb48a1075ddbb841b2052eb63a775e8aae8eed749f521b397f648c5dca918e3c56680f280aef99280c129c2ab1073794257ff074afadfd8
+DIST zabbix-7.0.3-go-deps.tar.xz 33769108 BLAKE2B 45d9bc317b74a8f1cdc80058ec3828d31ec5190afa85a29955a37a91921bd36565e092d97b051512e48321bfeaaa9a92db6f3bd7d11e4ccdf2825867f644c87e SHA512 6b7c90b72e02e6de6243c4f89af3303ab7da66b91981f9c2a0334a1fac436dc3ebdff64b1d09a1151606ff838d16dcf13e6003cf9c0db1148f3a814b02e28085
+DIST zabbix-7.0.3.tar.gz 48193982 BLAKE2B dceebf9ecf1957f507626cc33a86ee31ef3a2180046f744fc878a99258de8509115a67f2ccf4d56e9cfc84e14ae8ea897353692a151c3317934437869644b28e SHA512 22149415712017c2fb504972c9673623ea710842611644a934a9f555685a73e516ecbad566048b5ec05ba6404000687feee0815e7b2c8a04fb8fd154c9539671
 EBUILD zabbix-5.0.42-r1.ebuild 9819 BLAKE2B 7be0b02fa0842b250033f883c48f41963d6a0998054fa443ef26c910ffb77c1c1e40e54628fd90de8a8a24c20f45783d7570408a40e6eef727a1fd0ecaabfc3b SHA512 793e988e130abde40652ef3e9d594c46918332aa11da855b68196f23ffd206d237a21d031b21a836ab2ec19b1bdd860b21f8733631f9b2874b51787dc9b681d3
 EBUILD zabbix-5.0.43.ebuild 9820 BLAKE2B 2dd36519889153b919fde6e9d10459ca36628a6dee8fd69234c39db7962cdc9286e21811ae8f6d1298fe382028b629cb632ec5a47bd8daad01c62b41ce55940c SHA512 122716188711a194d8ebf11cdb5500f1a3375a4316ee55934e07cb7d396482f77a72c5ec80251636e8bb980898d4988d11b9e95a781d927187c4d7ca9b21ac65
 EBUILD zabbix-6.0.30.ebuild 9934 BLAKE2B 82ced7b4693f61272cd933c319188ee41934b7be0494c1ff81312e1426f54180bd32dd267fd8073cd10f054b17dbb4204924f379c9b3b5a77eb82a8109002895 SHA512 fb1cebac60d5f86d5073f09ca85b48de0e42639eb622a49e8be4774edc4d6f25c7c4150c98611945eebff92a09dd5058329a7506386a178cc8e3d905ff2bf9cf
@@ -49,6 +53,8 @@ EBUILD zabbix-6.0.33.ebuild 9935 BLAKE2B 709f063488c60e870ca41ae8e4fad65d56745d0
 EBUILD zabbix-6.4.15.ebuild 10086 BLAKE2B 4d6704bafa8c9370856f7980be82929fdc45906af1b66b4f51934abc88c635847728a5a8680e6db88cf38883dedbcd64e28f4b70eb2b82e7f58fdbd75e6edaaa SHA512 dc9a6c4d50b64a9298889f1acedeba11c4e3a5d4292d8e796d17643deb79c860fe30b927a760adf14b447537875a02e5c8e9532a8470430625a367e0e0043773
 EBUILD zabbix-6.4.16.ebuild 10087 BLAKE2B 3de8cedfa2081795d888bd0d922457bb35decbdd4fbae7b276e3f16208893405e9449b66ae6fc3a12b99eb00ed21b6add86b6f4229402d88db3ef75d3c207343 SHA512 5148088dca96b51e8fc2ab86d129dbb3d3d76f0b898aa53d43be1be2e5cb859bd435c31f538d6cd81c56b30ed65c02beae0824ac1b0a5d4f4d71f085abbecf93
 EBUILD zabbix-6.4.17.ebuild 10036 BLAKE2B c38223752b0afba1c5398215a842bec17ec8c96b0dbb5c60542578a71ad76d60a9b788b706577aa1915ed4a6569a33ca4c3f11619db141a1d9a0fd6f934c81a8 SHA512 e587a9af5800306ede457d139860ccbbe38214ed26007fbc60d2fe7cbfb288f562a225c04dca05655c1f3ccbf1c3f97b1347e86cd4a4e32269ef950f0a51a772
+EBUILD zabbix-6.4.18.ebuild 10036 BLAKE2B c38223752b0afba1c5398215a842bec17ec8c96b0dbb5c60542578a71ad76d60a9b788b706577aa1915ed4a6569a33ca4c3f11619db141a1d9a0fd6f934c81a8 SHA512 e587a9af5800306ede457d139860ccbbe38214ed26007fbc60d2fe7cbfb288f562a225c04dca05655c1f3ccbf1c3f97b1347e86cd4a4e32269ef950f0a51a772
 EBUILD zabbix-7.0.0.ebuild 9420 BLAKE2B be62ab9eb32ac89befbdf7013693618ab92f59be3b45c2224b0ffef09e8c72eab4e500c4f5aab183dc4cdfff941277cf08bfb12cce3a5704a96234b408266573 SHA512 df875c9c34db86b64570d3d7f624bf9b4da3e8e076ca1e6272cd5b99b1bbafc91c665b1d376b04ab0a1974286ea9695239b0f586c85638c286afcad2b779aafc
 EBUILD zabbix-7.0.2.ebuild 9370 BLAKE2B 079db2c877ab72c17e6aa1794bf489f71c6a2cbd0eb7db7451ae0e14509d31e2e7acff543f39805f667a4d5c56e03f2209921c9de54520f588616bf89c4b8375 SHA512 147268f1938367a5aa6a7fdf42a0237e1d4dcdc122ad03da7898d728f41fef2120d2abb3ecd98ded16bdbad3536a658e76481f1e75d327e5c6ae26ff18de83a8
+EBUILD zabbix-7.0.3.ebuild 9370 BLAKE2B 079db2c877ab72c17e6aa1794bf489f71c6a2cbd0eb7db7451ae0e14509d31e2e7acff543f39805f667a4d5c56e03f2209921c9de54520f588616bf89c4b8375 SHA512 147268f1938367a5aa6a7fdf42a0237e1d4dcdc122ad03da7898d728f41fef2120d2abb3ecd98ded16bdbad3536a658e76481f1e75d327e5c6ae26ff18de83a8
 MISC metadata.xml 1576 BLAKE2B 877e83a97b492fe256f3459332dacb4680b2ddeaaab34c077f1ead5eb387d8f5ef6f7cca85435eedc85cdb0db7243a805a8b49c5ef7b1b7dce39a9213b401eae SHA512 77d805096f0bcf2f3650216c69cb33c7dbbcdfc8b7c56066463ce5436af30dd0e9b8c6d124b59bfdbdac4c18aa628c92f78722920284622065af0ddb6448cd3d
diff --git a/net-analyzer/zabbix/zabbix-6.4.18.ebuild b/net-analyzer/zabbix/zabbix-6.4.18.ebuild
new file mode 100644
index 000000000000..1cf14aab3662
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.4.18.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2024 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 $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit autotools 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 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+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 +postgres proxy selinux server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	agent2? ( !gnutls )
+	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? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	selinux? ( sec-policy/selinux-zabbix )
+	server? (
+		app-admin/webapp-config
+		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] )
+		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.4.0-configure-sscanf.patch"
+)
+
+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_prepare() {
+	default
+
+	# Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch".
+	eautoreconf
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(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)"
+	)
+
+	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
+	fi
+
+	if use oracle; then
+		ewarn
+		ewarn "Support for Oracle database has been dropped from PHP"
+		ewarn "so to make the web frontend work, you need to install"
+		ewarn "PECL extension for Oracle database."
+		ewarn "For details see https://bugs.gentoo.org/928386"
+	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
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-7.0.3.ebuild b/net-analyzer/zabbix/zabbix-7.0.3.ebuild
new file mode 100644
index 000000000000..f90e2783580f
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-7.0.3.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2024 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 $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit autotools 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 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="AGPL-3"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	agent2? ( !gnutls )
+	proxy? ( ^^ ( mysql postgres sqlite ) )
+	server? ( ^^ ( mysql postgres ) !sqlite )
+	static? ( !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(-)] )
+	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? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	selinux? ( sec-policy/selinux-zabbix )
+	server? (
+		app-admin/webapp-config
+		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] )
+		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.4.0-configure-sscanf.patch"
+)
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch".
+	eautoreconf
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(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 postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	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
+	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
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}