gentoo auto-resync : 27:09:2023 - 11:30:42

12 files changed, 1239 insertions, 7 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 72cd715ebee7..a680577488d9 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/gsa/Manifest b/net-analyzer/gsa/Manifest
index d513ae1e545a..259df3ce565b 100644
--- a/net-analyzer/gsa/Manifest
+++ b/net-analyzer/gsa/Manifest
@@ -4,7 +4,10 @@ DIST gsa-22.5.0-node_modules.tar.xz 26394052 BLAKE2B 77e74ccacecd681e846884af463
 DIST gsa-22.5.0.tar.gz 3586703 BLAKE2B 33d9f5e32ccc33e4c1d24665bd7ba0819dc22281772c7ebba24d8c82f93bcc21e8b90f3e0666b9ed8846e2a88417f8bf5999619577c15c307485a7ce3243d104 SHA512 2f119f3d8b213cb10abc7b2a25052e943518f8a2c5950f6eb6e5227bf30f7467ddbcf78bbed5f499b96a0bb517c5033f38477f332a14f449b7b04e7b7902843b
 DIST gsa-22.5.3-node_modules.tar.xz 23161212 BLAKE2B 4bd48e37034cbe8b142392247f7c3231d97bea3d2327833f5d9fbe6b964b5a8f0f61a7d8db0750291fd750fb24bf401e0a6691123e876d76da68810662779df6 SHA512 2863e937bdfad8207a57d03d67f0fb573435845823ce2533fab4002ac25e37903ab21d6e53f272d39bfb900d4793c907d33d56dfe1b88469ad5a4ffcd3201613
 DIST gsa-22.5.3.tar.gz 3620562 BLAKE2B 1b2104bea4d5cb39d9faab05e0e6b1ac0b15c6d342f2066808b3b00fb9e4a07efd8d792eeb2ec1507172e3188770ba428ff5d2a913d00db40d28f899bea23d9f SHA512 fb7ee8b65cfac67789fe392c5734ef2267f80a9f6ac42272e02f21b266f7933c06d5aef33bfa1bedf2782016e26ca849a764f7150ecc8cc6fa8d206c6dd1ae71
+DIST gsa-22.7.0.tar.gz 3593214 BLAKE2B 9a9b4969735c8c05c67f490c98a008816ad6602c6a7a7cceaa611783087da63bde5fbeebe42f171e917820f5c7a79b1a486b41f0c945749c737aa3f4f47ec94c SHA512 e9832666c6218b5d8af9e7af5e088f3dc1e12eac0cbc06c1ccaf268e34a377a5892761dc6a41278c5342a30b008a58c10a36a5b10ee955a77bd55d9dfecfbd44
+DIST gsa-node-modules-22.7.0.tar.xz 27964004 BLAKE2B cbc7120763124deb79ddbcb12037ad8a031ef4de972086866a8393fef39c109a30e90d5f6d7948a55aca518c1ebc3ae46c12ad5440bc89002254bec64f5253e7 SHA512 594f0ffce70514bae8334d749f4e690cdb040b81c8a91238e5bbac18088a0866fe8a78be8a323b813cb5c751e69419c80da611ba7f619797dd9b502c320529b4
 EBUILD gsa-21.4.4.ebuild 1036 BLAKE2B 9b929e395348dd2ab4eb93a377d23feb32689be41a95df04bde261860081f981349f122256e9f1133e277ed5b9c2e995100ee2e8c5cb4e692f4333877bb3b6d7 SHA512 9fe0def0a89ad904eeb9fe729e4a260ce186e6de1ef1f8cba36700b14bad32c2d37bb8f0f6d857146700dd84dce15747033cec93649b7bbdb3582e7da5be796e
 EBUILD gsa-22.5.0.ebuild 1228 BLAKE2B be936887cbe2723c0c89003595507cb75db951b116acffc41998ae11b5052b0053ba021ad5390df9e9835dd7341947b1f0895c5f94bbb77e372d592cdf3b94e9 SHA512 d88984e01cb9446d1e202cadedbd679c9741c89326d63997942e2646885373d7b2ceb0c9bd5e3576fae87d684c455cc3ed96d6ba7bc91c07e612deecfe94f436
 EBUILD gsa-22.5.3.ebuild 1228 BLAKE2B be936887cbe2723c0c89003595507cb75db951b116acffc41998ae11b5052b0053ba021ad5390df9e9835dd7341947b1f0895c5f94bbb77e372d592cdf3b94e9 SHA512 d88984e01cb9446d1e202cadedbd679c9741c89326d63997942e2646885373d7b2ceb0c9bd5e3576fae87d684c455cc3ed96d6ba7bc91c07e612deecfe94f436
+EBUILD gsa-22.7.0.ebuild 1275 BLAKE2B 6c1d9d0ee047059ec1aa4d25d1acec8473905dd88d7f7e55eb06259cd0df857a2676be3cc31f892dd5b3169e99b3f600d961bb8dd454827475ecd0e6861ca0c5 SHA512 63dd71d381c4650ce2ee4b62ae5d6cfbf793731ca5c397df7261a6ed6c80ea63f912a1d49dc3b5bd238d963eb5a7fce9b75e839624b0d27d280c153e6bf3b923
 MISC metadata.xml 971 BLAKE2B 92a5deb08a91782bb2de586d1aa5dde2365748bfab065b310c369cbdab1e468d6ea4ab57df8e0a97a02f8b96613302cd8ec9c878c2ddacdf922fd5973f759643 SHA512 623adaaee62c9c2e27be7a6741edab7a770ab49902eb094bc71711fc822e3108d851fe0420c6744ed9ef91c8da7c57e518c884381e6f3952387c6e2636e46f5e
diff --git a/net-analyzer/gsa/gsa-22.7.0.ebuild b/net-analyzer/gsa/gsa-22.7.0.ebuild
new file mode 100644
index 000000000000..a45132ee3340
--- /dev/null
+++ b/net-analyzer/gsa/gsa-22.7.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_NODE_N="node-modules"
+MY_NODE_D="node_modules"
+MY_NODE_PV="${PV}"
+
+DESCRIPTION="Greenbone Security Assistant"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsa"
+SRC_URI="
+	https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/greenbone/${PN}/releases/download/v${PV}/${PN}-${MY_NODE_N}-${PV}.tar.xz
+"
+
+SLOT="0"
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	>=net-libs/nodejs-14.0.0[ssl]
+	>=sys-apps/yarn-1.15.2
+"
+
+MY_NODE_DIR="${S}/${MY_NODE_D}/"
+
+src_prepare() {
+	default
+	# We will use pre-generated npm stuff.
+	mv "${WORKDIR}/${MY_NODE_D}" "${MY_NODE_DIR}" || die "couldn't move node_modules"
+
+	# Make SVGR not traverse the path up to / looking for a
+	# configuration file. Fixes
+	# Error: EACCES: permission denied, open '/.config/svgrrc'
+	# in case a directory /.config exists, see https://bugs.gentoo.org/909731
+	echo "runtimeConfig: false" > .svgrrc.yml || die
+}
+
+src_compile() {
+	# setting correct PATH for finding react-js
+	NODE_ENV=production PATH="${PATH}:${MY_NODE_DIR}/.bin/" \
+			yarn --offline build || die
+}
+
+src_install() {
+	insinto "usr/share/gvm/gsad/web"
+	doins -r build/*
+}
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index ca3538bf3b39..19de9f8834cd 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -25,6 +25,6 @@ DIST munin-remove-Date-Manip-DM5.patch 3587 BLAKE2B fab1fb61607e83aac5cbd699c930
 EBUILD munin-2.0.69-r1.ebuild 12568 BLAKE2B af5b2c07a81c6c1cf733fb3200aa69a81f1c7ec4b7dbdee6b1665d1070c18e9983d7a6adbd01c84c21cfa5f978fc34cec3aff1eb0b394da994e72b02e3c683e9 SHA512 66efe60daf5edfcb2d3198e0f398a01d5a68f31143b5b9723d43cf00ccf8256aa12c9e29ee57bb8fc742ee53332c1a671cd470c655d505b4e5bae16c2d0a86a2
 EBUILD munin-2.0.73-r1.ebuild 12274 BLAKE2B 2002080dad8728b31ddb3c32dea575bb7a7d04b60b6a736d77ee196b35de318aa6f7e13c925abfc083d8e2db10993e4fe6966a8ef8c1aa9282654252f625b071 SHA512 6d1f6c3932790ca1020fd0fbc573cdef3a0c9797e90ea5e714e384b06c5a758f263235a3981559f07b84445cb6c98a4f1f17fd5b10c20fdd2fa7fb574a5cbf52
 EBUILD munin-2.0.73-r2.ebuild 12161 BLAKE2B b0cd6e479b426ff82f6e4779c506c31c89b4ff71348d81d2ace3ae1d54f55bfbfb3bd6d8dae600bc2afeb941e51f191c1be87ccf929edb56c69561f344c76721 SHA512 61792e53d0c7ffef0a9d5a3dc5576d88e6e112d99a29ce0672cf4006acec290cda17a86b8a01d6167c4c3197572dbedef0d7bb056e844bafa2f63fdcc976a5cf
-EBUILD munin-2.0.73-r3.ebuild 12158 BLAKE2B fc845addd794ce049d92fb2f3df57122843c037c7ecddf63a48cc9cb1682505c1a723ae917bc75b3e15de83aea5f0bc81d4ff5ba8ae871cba0d3f3d98eaaa649 SHA512 0b9b98bc3dde07b0e221d5ce600943e43a37c66f1dbc540329234a3da7120d760df3e1398c46f160394bd17da37ae4ce07160b5bb10330738cce60653fdb923e
+EBUILD munin-2.0.73-r3.ebuild 12157 BLAKE2B 1c8b115a166987bf31415de71b1cb50c4dfacf23deebdb56e8b56ad9522dc760fcd9f0274261b0bf122b10f8a2a0fa1a2d9dc0bc7b68ebba2a506a401a6ccac0 SHA512 e300b7ad8b8b9579b9b194bc4350d9191a3f93f286cbb4fdc55671f21c3bcf9ce3548ab0646434ad171cd61ba3691e4bc4c5302eded300413bcf4e442bcfd400
 EBUILD munin-2.0.73.ebuild 12147 BLAKE2B f6ca54234cec7e66ca0faac3e9f299827b16b613ec30010fd464a837e057d68e7256d7958e9f44437f7aebb3b0a35ec9730c07385cb451b29d8d6cf5f2e96ab0 SHA512 c5ab32698a3d10c52e9232c90042b0797e2cf43b34dff5a6f98de4fec3282b43db9422de54fb570f645cbe54a077601eb2bce2f1edf5d9d3c5f13c0ee66b3d5b
 MISC metadata.xml 3933 BLAKE2B e13958d477a85e5f2327ffb529567dc129e6531a114b304d930399fe9cb81e6581f1df9d884860294984580c5b3e4335dfb623fca85e18e1de818430476eacfb SHA512 f824ef7f1a950ab81c4e3f2e81f44c6b3a49dc56a4aab977fad14e5d757875f8cb4900d8cd528c16449fafc8d08ab3792be8dc5a2a820932add7ce03ca35102c
diff --git a/net-analyzer/munin/munin-2.0.73-r3.ebuild b/net-analyzer/munin/munin-2.0.73-r3.ebuild
index 23f75b6db654..b59dbca8500d 100644
--- a/net-analyzer/munin/munin-2.0.73-r3.ebuild
+++ b/net-analyzer/munin/munin-2.0.73-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
 REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
 RESTRICT="!test? ( test )"
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f1a6421851c0..b0c6c8d098cc 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,7 +8,7 @@ DIST wireshark-4.1.0-signatures.txt 2706 BLAKE2B bcc55c14a68aead0061041e39114a04
 DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627 SHA512 d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0
 EBUILD wireshark-4.0.6.ebuild 7998 BLAKE2B 5cfa933262dd90a34f80eabe4712e1ef56a17c95458eb1739397e872cd35d95374aa54fdba164121a912163b335691623a52d6d5ea164d6074567ec6c655154e SHA512 5996d39b034060fe9cebc3b13f2e9becfbcf640e68d9039e5e48a4da97c8a4d5f6d00973fd64db3e2d514872afa4317813b296b33d53bf630e58ac9a4d5e9a30
 EBUILD wireshark-4.0.7.ebuild 7998 BLAKE2B 5cfa933262dd90a34f80eabe4712e1ef56a17c95458eb1739397e872cd35d95374aa54fdba164121a912163b335691623a52d6d5ea164d6074567ec6c655154e SHA512 5996d39b034060fe9cebc3b13f2e9becfbcf640e68d9039e5e48a4da97c8a4d5f6d00973fd64db3e2d514872afa4317813b296b33d53bf630e58ac9a4d5e9a30
-EBUILD wireshark-4.0.8.ebuild 8003 BLAKE2B cec3a00dbb3721848360e0bb62b411dc6162cbfb07c47120cb7c486c34e3bbc42bb6700cb28d0a13619c604b9128677b2ceac001949da8dd6ee5ecaf5befccc7 SHA512 3d16e2a4529b8ee885e139a2a582f250e738bb8a7873f459cc0e2409525e5663c8a4ccc237c13825880025ae469e017ce4e6eb6a64ef705d4b7fc2f06edc41cf
+EBUILD wireshark-4.0.8.ebuild 7998 BLAKE2B 5cfa933262dd90a34f80eabe4712e1ef56a17c95458eb1739397e872cd35d95374aa54fdba164121a912163b335691623a52d6d5ea164d6074567ec6c655154e SHA512 5996d39b034060fe9cebc3b13f2e9becfbcf640e68d9039e5e48a4da97c8a4d5f6d00973fd64db3e2d514872afa4317813b296b33d53bf630e58ac9a4d5e9a30
 EBUILD wireshark-4.1.0.ebuild 8654 BLAKE2B 6754327a2167144d0b62daa259686bd24163f9ee28adcfcbf75c03938595c3b95ed3202700a11c4978e5a02f439deb5b42e0937a3a91aca1e2ace211898a473c SHA512 80c91b955949f2143282614b7514662d58a23add7706d86329fc3a63424d65a2f288cd0e2b53f17c70508b3e94fa793d3780c3c4a4f84d5a1303b004625d50ca
 EBUILD wireshark-9999.ebuild 8654 BLAKE2B 6754327a2167144d0b62daa259686bd24163f9ee28adcfcbf75c03938595c3b95ed3202700a11c4978e5a02f439deb5b42e0937a3a91aca1e2ace211898a473c SHA512 80c91b955949f2143282614b7514662d58a23add7706d86329fc3a63424d65a2f288cd0e2b53f17c70508b3e94fa793d3780c3c4a4f84d5a1303b004625d50ca
 MISC metadata.xml 5422 BLAKE2B 92a191ef763a5ce4079f75b06ec7514c1f052b96e3ed2ff1e6d60e426b60d3bdebe373fc23b11625e5de2b8dc495924787e14ab6be6ec9e9f5216686a3c7dd3b SHA512 574ab162b8634bd66d1d93ac3e845328958cab66982aac5ea5aba3bbecd2c510c66a7f7584eb1192c1ca0c157522ade2dbaf0780c4d92601ff416a81a6b1239f
diff --git a/net-analyzer/wireshark/wireshark-4.0.8.ebuild b/net-analyzer/wireshark/wireshark-4.0.8.ebuild
index 7aec333de3c4..2a642376f5e0 100644
--- a/net-analyzer/wireshark/wireshark-4.0.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.8.ebuild
@@ -19,7 +19,7 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+		KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
 	fi
 fi
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 34e96c7ecccb..e661549d8e83 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -20,25 +20,33 @@ AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST zabbix-4.0.47.tar.gz 17903257 BLAKE2B c245f1eb9b63cc0e03025958cddc31a790bbf8ed2c000ce787e2d3e9a108d0a177a61b22353d419fe21f0caf6750df273d236a1610c8907ad3527ad360915b76 SHA512 9f7f4fb03b1b9caa52bd5e3a7246e9f2ba844a5f292abc0a9ed3941c6493ee2a771f816ab83cdf571e10a3d32a48294e3755b9aa9d351116bdef32ab1b6d0632
 DIST zabbix-4.0.48.tar.gz 17895197 BLAKE2B 0a0b43084ab2babf305330d46f0841f741d1d7df3581602ee35e9be11c07210cd2d3e3779fb05c77ccaee0734f78217fbe8a5fc7c52246d3fbca00cf1c56487f SHA512 6dc403bcd9ec1747473f64f82e919aa196f35a2f2b8006ed9dcf114e10c4f542ae61cd86cd80c1c6a043b32281e1263c9a67acc2909265391777ab71358a7e5a
+DIST zabbix-4.0.49.tar.gz 17902486 BLAKE2B 01338b31507b70d053a0b8254d7a5249c8e42f40a4b67d4368160e4815eb9d5fa3cd23e5495805ca51e9135b95110824abaafd9d58a6b3fcb0622a1a0c14ec2c SHA512 630480875d4b0bf2666cc8717ad59001d6f01940488e7cd0c1e0cf44ca6bf9fa7d73dfcf80a3a0158d445c0118c1c3f09fb69bb4bfb471118f9d87b1f8743ba1
 DIST zabbix-5.0.36-go-deps.tar.xz 34549228 BLAKE2B 60852e6d66b2bc70fb2624aa06498cb6013637b08011cdf1d30c1e2490f3f50d9fed22f0aa17712e11a05b4b4f4cc198917724eee4ed9ab30cadf667b9f28b5d SHA512 18e0dbe6128e905b6323cb9f65b32a49489b5d5685c615e92efcc9ac3ddcca0d46d5e3392366f395d8f3ff15549d9e90e5087243ec920e4955f35facf06bfe25
 DIST zabbix-5.0.36.tar.gz 21817105 BLAKE2B bcea94ed7caf089a100b9e64274b0c34db5ae3fbcbc4bad5bd8abd814718cd08eb1215e56af9c027af37ea386cabf1b8c7c658261077061652eddad99ab18b0f SHA512 c439748b590c5d37a93d9fad6218435df52089e04873d6d4b9a37dd9151a49f29c887f3b669751207b242c8af9080868ffa0032c259044610e973622b916742e
 DIST zabbix-5.0.37-go-deps.tar.xz 27507708 BLAKE2B 3f682c8cd377c47e5c812a5d9cd0ed75c06dd29df4bd75b75d4fd67812de9bba11d17150fe3fdde3569f36519d204d0864e450cea9eebbc8d791148fd3d70deb SHA512 4794e5ff4a37ed3771788add433222b05e2477106a914909358af6ef8bbcb1b0b55c5fb1afdf0e572ca361edb3dbe7f041a11f8adf493b3ac22b5e9252f63fb8
 DIST zabbix-5.0.37.tar.gz 21815459 BLAKE2B c357ce0f3c3a90e80f9ddd939d8295356c4d2d7f27391a0a67c8e08f7d559a8fa40d9d4ccd81cb7fc7f6d0d9a250573ab53cb33c367e69d9813c39fe38a202e9 SHA512 5e9a8351a2e34864629ee47458275c0921da461a9c2a320574c763476f15c1399fb6dd21eb578d94a7ea9055dc8750f54cf1aa9ecf5e438bae997fc59ce1637f
+DIST zabbix-5.0.38-go-deps.tar.xz 27498720 BLAKE2B 2ce7066ea6738a8153c44df79298a18eb4bacc0c3b59c3fb571f07e6d9069afc1d591b8e4b2e4a8ec6e087412082732926620b76f898fed31bff4e39468a03c4 SHA512 d04db567ab307d66328041ea24e20ec2147213cbac7e26701a3c6c55d778015da941fb43027077d9d1b3908b01409da28a9f0d4e17febb5e885c334e87c676ad
+DIST zabbix-5.0.38.tar.gz 21820861 BLAKE2B 08bb13254eeba65ec5f93c593d50b75a9afdbc7a4d42c9684744e527d73174e485c56bd2004a366dfd430376d39c101e20ee93bf3a258217b1a324d97f2e36fa SHA512 17297ddedc58577b8cb2c0b5fda9383bd2a78afc2fbbf210b3c0224fb230e8b2e2bfba7f78853737dd2e768bb4dc3db31975a0274380c6984fa7962f8a2c6474
 DIST zabbix-6.0.19-go-deps.tar.xz 18942932 BLAKE2B f53a00b89c024f0e52941f9a1dd1abfadbbf79c7b2da884379505edb762c9e1b93542b1e68b572c7d0e99a80b759f44015dddf49968ef42c4b7eb4e0017b7e67 SHA512 04073b6e30a8bb9284ce7780d3149f774dfcd94ea4d4e5c64bf06f6b7e0d41a8536aa461ad435cad6954c5cc9210382af60eb95791bc0100f1ff80d9abd7b7e3
 DIST zabbix-6.0.19.tar.gz 41953882 BLAKE2B b454a3622d3fdeda886ce4722e24116c44c74768bc5dcfe1cd6aa7c90a245121532d24842cfd47538349d08ca5b6577b6f0e75eec165f304a050512eafe608ba SHA512 9738d30a21bd237e68ad4cf037e3d997fcd8b8a6781f3f4f22c6ef0de4bf555d96c41322ea5dda7b0a2a546b9a2ecd42e1761ff8ec43ddd2eca672a174ce1e8e
-DIST zabbix-6.0.20-go-deps.tar.xz 18980960 BLAKE2B 447cdbf656d5b5fdad08be8ffec4bf0ba8bda351b48dcee4a67ce296e228e8d7e5c78b939c7211d2aa68b020ec0b41e4f5de638fe9abef98bb7b1936481e00fe SHA512 c806b052bf28cbe4802f31b1e717c61918a1b15d11a107eb0a758343e387d9761f93bd10bd65016f81a467002689cea74525a9812ec50ee29fc967b9a6e91e76
-DIST zabbix-6.0.20.tar.gz 42016423 BLAKE2B 5155ddb608432beddf72e35ad5b8f3723ca883f9c0c22adfd9bc668ba223335d67db76ad6211417d93a71ed20eb74f2c1b0370378755c5c0d988ab5ed4b46e30 SHA512 8f4fa955eb20ba4c4539bb3b6744c942e89db61dc50c998e61c4cf065cf07fddddfacce3992b8402851dc2f55e41fbff40e814d86b8c4ed9802931b8fe4a172b
 DIST zabbix-6.0.21-go-deps.tar.xz 17966972 BLAKE2B 829fa0054e17972c8b128f8f87a3136e8933be3bdd920992d72f09fd7e4c0282e036d81850c7fcfff2979e8ddb656b8d158601e3955204100be782ed6ed972f3 SHA512 27c7c2c06a02190bd04a3d541ec9c08cc7287bd7c090c6cec59e9faaa8f8dc81c4ed2d3375275195a987584079424903bbfb3b4304852174ac08fd03d06b7cdd
 DIST zabbix-6.0.21.tar.gz 42294969 BLAKE2B 0928695a5f2729765a5b1fa31df410d585b50ef40a9d8379d6243c256c88234ac916bfaf13f62a8e28bb8fb4be48e83c1aecfd01f66dc45d4e25a20761d8ef82 SHA512 3fe667a68ecf86de479facdd373557425bd3734debd58113fface810171583fc05adb24662e5fe3b0b447492b2b79654196313acb2950bbd0686a86e4c2d59b1
+DIST zabbix-6.0.22-go-deps.tar.xz 17998956 BLAKE2B 119760405c8ca9d2ccd35d18ec76b32d87109dcf24abbd64e56ad63faea0491a2ef433e84468c91a9b9f11bbdd0dfcc15b5590de64c3259c028da1e5c97f1f48 SHA512 0bb50ca3a6c8d21356a963572189fc55565dc061638067eb4ae6986d68de32989d48fb63dc3165f6b965f80c296da5d082b61383229a5003c7232387011cabed
+DIST zabbix-6.0.22.tar.gz 42590907 BLAKE2B bba7911a24b00827c58d84938b5786d07f1eb44cbcad94cddf68b484ac9a2f514beb60225d006b8cefc5bbf92e51da27f26d9f6681e10f6322ed0841394e8d9d SHA512 d26903d6272e22dd960d3bac5d93857de09a9f64a91e542a43fe1169ed1a7d7fbcf69975d152a227028ebbeb250cd0dd96501d15cbd7c8f7bdd7222a0b97a2a2
 DIST zabbix-6.4.6-go-deps.tar.xz 20617588 BLAKE2B e58a3e119753b60710077179161bc2796a8d775042ff14a8b2b4f1dc9f6da06e9839e8680fdb0e380bde59807f17bc1110a5593b9c56d906a212278dbbcdb382 SHA512 289e1e268ba49ca5ab027b15a5fa1e0c3d43ae14238ed793224f3a7a51a8558501455490a18d2a05dea00ffc5e8946039a1da5ba64da8f36df7fbc88585f2389
 DIST zabbix-6.4.6.tar.gz 43744978 BLAKE2B e9c315425365380f6206e508aeb8f48070e830aed4f9d8506f8d8e696fdef673d3242d0e50763933cab604e9d82663f8efc94e54ba3fb237843578be998a7895 SHA512 f343441fb301d05165945ce355e752ce3638d4b12d99dc0eaaed8f70122cddb37a638e274ce999fcee0e1afc9e656ec771d0a208c08d1898999ea24338d8325d
+DIST zabbix-6.4.7-go-deps.tar.xz 20645004 BLAKE2B 49902be533dcf0ccc283f208e5edccf5b5e0afaf501f2a1fe2ae19c60bc603bba4a812a676080044b26eea9f72886c44444fcd4f4471074ad8f726fc4b854f94 SHA512 1e9b89f1c83361c2ef83d589560c64428e62628330ac3e224f8e80f24fc47a38df05d60eca448fa8d5d1ba0c9ce5d93348be858d4e03d7f205b75b6bbf7ef11a
+DIST zabbix-6.4.7.tar.gz 44036704 BLAKE2B 0ebd9e4393746469d44a0c4e6eddb2721a3a82b9df5a6388a0eed6d6f685ff983d9949eb41fa71e8982cad9f2c61da141beac55bd2fe18c0a55227a5ddcd0fd8 SHA512 6296ac5873ec4d6c92ff4a89e429ee28645b61c181e1cf5d98612b8d4536a4196baa52c8aaaa7a9ba02f98301f73b3d982a15692a9750f61326968c01a02f7a2
 EBUILD zabbix-4.0.47.ebuild 9473 BLAKE2B 64dc377510b3c302c2dbff46e91fee4703f5160818b60d4b65c9210b9ded6a70b8e464385f6f57b431b3b2dcb3134faac6f922b847aca576c9ba5d7afa26cbbd SHA512 f8370f98efdf8132604747672756e9bdaf2dd9492d433528ee764e5dc345ef2a48a816867567981489f744ade8175d8d16498d7d814efc374b76143753d78181
 EBUILD zabbix-4.0.48.ebuild 9475 BLAKE2B bb4ae6c9f45ef2ed0aef21ae811f616f5291ffd50beb14c691fa113483123e391024e490b88fafa538adf93aa595e3e9126c92c666dabb4fd1ad4566e16ab556 SHA512 822bc6e3309999df1b68cae6e572563b621352ad4a70f683ab28876ec5384fd56721fad612ce411f6d25c270b7ca228857b7894efd1c49a48131f7bb68b0d3ed
+EBUILD zabbix-4.0.49.ebuild 9475 BLAKE2B bb4ae6c9f45ef2ed0aef21ae811f616f5291ffd50beb14c691fa113483123e391024e490b88fafa538adf93aa595e3e9126c92c666dabb4fd1ad4566e16ab556 SHA512 822bc6e3309999df1b68cae6e572563b621352ad4a70f683ab28876ec5384fd56721fad612ce411f6d25c270b7ca228857b7894efd1c49a48131f7bb68b0d3ed
 EBUILD zabbix-5.0.36.ebuild 10211 BLAKE2B b3d83063fd0eede55297bbf1f8abf508552c8ddeedec6258059535f25e0d3782a0c71cceb41927b940955f280aa62a0199384e5809fe545fdc2dcf11f3198fd8 SHA512 65be7901db65457233cd531f5f9c70a4c790af35d943cb3c19a17066a4e70fddfbcab6daa8129b8ef87cda067ec79fd1998e63b5ee1855d6e1ad025fc4d16d86
 EBUILD zabbix-5.0.37.ebuild 10213 BLAKE2B ae48266f797d9cd21b1755736e18f8f989fc8f8aed716bb9f0c07004e9b0d09ced4c6aa8eab1085e735908908d97a458796719e99cbfb64c00574557aa31c91c SHA512 c010a156388b85a8ffe39a96664a050ca8254a7d6c1135c66283efa92ea6c9b05a36306c7a37bc3c36d804b6c160c17de5889d3050a64715c6d0d656a174ed23
+EBUILD zabbix-5.0.38.ebuild 10213 BLAKE2B ae48266f797d9cd21b1755736e18f8f989fc8f8aed716bb9f0c07004e9b0d09ced4c6aa8eab1085e735908908d97a458796719e99cbfb64c00574557aa31c91c SHA512 c010a156388b85a8ffe39a96664a050ca8254a7d6c1135c66283efa92ea6c9b05a36306c7a37bc3c36d804b6c160c17de5889d3050a64715c6d0d656a174ed23
 EBUILD zabbix-6.0.19.ebuild 10304 BLAKE2B e1d97c6370841c2c5e5e398f14b554b8dc52fe6b9e300815c4beaf431ce3cc7f2a0e907bd97bb660a906a02fdc0249c22840bbf689f51a9497e4e8001fe3f76c SHA512 0ace52bdf3dc46d86989de727f7861d272a43b6d7dfda3958e5ae1c60e7847081cd6e6f92a76f32eb60b4d22634f211531fc92ca843b2d135b488c562bb2ecb8
-EBUILD zabbix-6.0.20.ebuild 10306 BLAKE2B 154a523e599b49e096108a039167055406c49b3e105db12b9b2f8ca642e8c700ad8ca350eae501c78fdfbc44ec84fab1ca86cc88d76670c1e45e35e1580bfaf4 SHA512 b9cc74be94b36c1be64c9a9b286a6c48e465ebdb29f449e9db9f64ebb1498e722addd841137bd108f0905cc556a646777987859826a14732bd5a3221cf78f788
 EBUILD zabbix-6.0.21.ebuild 10306 BLAKE2B 154a523e599b49e096108a039167055406c49b3e105db12b9b2f8ca642e8c700ad8ca350eae501c78fdfbc44ec84fab1ca86cc88d76670c1e45e35e1580bfaf4 SHA512 b9cc74be94b36c1be64c9a9b286a6c48e465ebdb29f449e9db9f64ebb1498e722addd841137bd108f0905cc556a646777987859826a14732bd5a3221cf78f788
+EBUILD zabbix-6.0.22.ebuild 10306 BLAKE2B 154a523e599b49e096108a039167055406c49b3e105db12b9b2f8ca642e8c700ad8ca350eae501c78fdfbc44ec84fab1ca86cc88d76670c1e45e35e1580bfaf4 SHA512 b9cc74be94b36c1be64c9a9b286a6c48e465ebdb29f449e9db9f64ebb1498e722addd841137bd108f0905cc556a646777987859826a14732bd5a3221cf78f788
 EBUILD zabbix-6.4.6-r1.ebuild 10355 BLAKE2B 067a8d0f9c6bd868055ccb73b7e38ca6f1de505c59423be025de7c15a6aa26a2d6e8df4f9d52a68440dba0bfe2501f40a11fbed6f34679284ed9c27a6d90750b SHA512 ce64072648c55fe071728350a60f95b451acf99f95141219776337e59ed7e23a00f9d2fe43da11130a9f21f17b488f0c8cd972114ce2da6550b33ece48384944
 EBUILD zabbix-6.4.6.ebuild 10302 BLAKE2B d50a42379d68ebc24961c882fdba705e063cb9dd501f977e47f0563db22958b40e4e74e13e2cc5adab8840ed6f2988e7291380a77960464401e1d958589792b1 SHA512 02c5f0b3cc8ddc76dbfea09a74e9c8afeee76d0e3b088c9032b4663ce362396a35804e36db3894502da9114be7b03eaf8497a08c6744fcffd54f038b03483981
+EBUILD zabbix-6.4.7.ebuild 10355 BLAKE2B 067a8d0f9c6bd868055ccb73b7e38ca6f1de505c59423be025de7c15a6aa26a2d6e8df4f9d52a68440dba0bfe2501f40a11fbed6f34679284ed9c27a6d90750b SHA512 ce64072648c55fe071728350a60f95b451acf99f95141219776337e59ed7e23a00f9d2fe43da11130a9f21f17b488f0c8cd972114ce2da6550b33ece48384944
 MISC metadata.xml 1655 BLAKE2B 46ab1f5adaff6069890380b23a6edaf8f0f7380ffc4a320f17df52f2e59867bdcf09633d9c6e242434919d3512d557c2f623d2826b1453424c43dc0b0ee0a262 SHA512 62e5a8853c13dac034360bd1a7b61987b548641b76860f05a8f75181b8d8029e06bc9cbf136d42836e714cf0c193b04a589d214a7864d607bf93dd97066f1a70
diff --git a/net-analyzer/zabbix/zabbix-4.0.49.ebuild b/net-analyzer/zabbix/zabbix-4.0.49.ebuild
new file mode 100644
index 000000000000..249e6dc9f35f
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.49.ebuild
@@ -0,0 +1,368 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd toolchain-funcs tmpfiles user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static xmpp"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	?? ( gnutls mbedtls 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 )
+	mbedtls? ( net-libs/mbedtls:0= )
+	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 )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	selinux? ( sec-policy/selinux-zabbix )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with gnutls) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mbedtls) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with xmpp jabber)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-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
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-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 (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		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
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-5.0.38.ebuild b/net-analyzer/zabbix/zabbix-5.0.38.ebuild
new file mode 100644
index 000000000000..391cccd87bd4
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.38.ebuild
@@ -0,0 +1,400 @@
+# Copyright 1999-2023 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 +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/libpcre
+		net-analyzer/fping[suid]
+	)
+	selinux? ( sec-policy/selinux-zabbix )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	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}-5.0.22-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_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable agent2) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with gnutls) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-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
+
+		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
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-6.0.20.ebuild b/net-analyzer/zabbix/zabbix-6.0.22.ebuild
index fe2ed884f7c1..fe2ed884f7c1 100644
--- a/net-analyzer/zabbix/zabbix-6.0.20.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.22.ebuild
diff --git a/net-analyzer/zabbix/zabbix-6.4.7.ebuild b/net-analyzer/zabbix/zabbix-6.4.7.ebuild
new file mode 100644
index 000000000000..30c139d2d3c5
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.4.7.ebuild
@@ -0,0 +1,404 @@
+# Copyright 1999-2023 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 +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] )
+		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.4.0-configure-sscanf.patch"
+	"${FILESDIR}/${PN}-6.4.6-clang16-build-fix.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_prepare() {
+	default
+}
+
+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 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
+}