gentoo auto-resync : 14:12:2023 - 05:46:30

4 files changed, 154 insertions, 82 deletions

diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 52e8d8da51e0..25111e3fd28d 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -18,8 +18,6 @@ AUX zabbix-proxy.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5ce
 AUX zabbix-server-r1.init 598 BLAKE2B 53026be133378595e83de14f939eda655d871f8caa524bf3c6496da77dcf4582a287e4365737317d710e8488ad93164eaffc5e5eca4d78f05cde820cc519d8c7 SHA512 c18e454b8944572af737052156c5985ebfa35504be43aad0465b4fa48108e9e60cf3a1326480762b89263df0d495fc793a45faea24de62f337ad2bcf57eb75a4
 AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2ef61de4715c25b0e0c97a627e6735a67c4114484950f0334fffa344d94f9192ada63887a21b617122eaf0d SHA512 d20fa4aa3a545d2f36388d7cac78c70c5610f5e7529348447e6fa6bacc33f42dd6e1c37c50b1c2711900a3f29bbbbb0ebc7c54f04d3de717aadad48e18c46e28
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
-DIST zabbix-4.0.49.tar.gz 17902486 BLAKE2B 01338b31507b70d053a0b8254d7a5249c8e42f40a4b67d4368160e4815eb9d5fa3cd23e5495805ca51e9135b95110824abaafd9d58a6b3fcb0622a1a0c14ec2c SHA512 630480875d4b0bf2666cc8717ad59001d6f01940488e7cd0c1e0cf44ca6bf9fa7d73dfcf80a3a0158d445c0118c1c3f09fb69bb4bfb471118f9d87b1f8743ba1
-DIST zabbix-4.0.50.tar.gz 17902204 BLAKE2B d03a1703fe9cdaff6c50479f1ad9d55d3978aaaa5819dee5561bd3a06e9e03e8ed446fdc816a5a4eaa1f67a58a1cd08a4edf38df184086d97f7f9af16aff0ffc SHA512 df744280be35ccc895e48e292c0358fafd5218ee4a205fd03c75887513203839b5ae36755700e957443752970b12f8981e04e8d5c391728af4f9759969765f45
 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-5.0.39-go-deps.tar.xz 27798636 BLAKE2B ba01a443170fef0a1a1014c2921fa8158fd107dd6bd797c09dfc916143da64c91c3251a1e900b25286a6d6828981a1b6fe025f720b94cb65f323811c307508ae SHA512 26536fbfbe9dc9a5ff5fd6923e6fe2750624b32f5bbfd308d05ac2f4fd03600eb529b5b72836f596176e2e7ffaa56c51df9f2a3259658b63e033585234623bbd
@@ -32,21 +30,25 @@ DIST zabbix-6.0.23-go-deps.tar.xz 18007028 BLAKE2B 8be3e80dd1ac8cdb9f534adb38337
 DIST zabbix-6.0.23.tar.gz 42896964 BLAKE2B 7b2529b16c706fed07d630965b9da833acb605315c178e48d2fcc7bd52dc6df71777e15f6fda805e1e65c5806a7c6dcbdd6ef4c71acb7a089df39279236711e1 SHA512 baaa65ef8715182f5e2b499ff15e0fa158f6202280b52190b7ef9454251292fdd41ad0cf11cf2658e1ca6fbf08d41295c97eb7bace8baef3f86fc50f7961623b
 DIST zabbix-6.0.24-go-deps.tar.xz 30680652 BLAKE2B 0a8614f6f467e74fb744994e0e9c120577a0c39e8ad108bfa197b57f2b6db051cdf8d50bd3b25b4d9d8d365aec5c5e374219d2053229bbb7688ff5f8c798c9df SHA512 27c171cc65ff5e052fd1e0ec7c8a993e84062fd133d06071ca758013aec9519f7adbc5873e51e41a80829dd2b24310866d8c3187cf6a1f6b8903bb3e589dc6e0
 DIST zabbix-6.0.24.tar.gz 44075268 BLAKE2B 039b87eeb178c117c68a37b6af998c0f8705a8dee980d2c273b8cb10b98cede59a4dc0292c5b053c60ae6775db0980eafc3ff3f8a0dafa30874b6e5d47cd6246 SHA512 21f930da510c682d032cc58237e0df134abcbd149f7f0b27a6d399ffe9c8738ee1394501fa376a1de158173c357d1942797519718b72db54654371375d2f1248
+DIST zabbix-6.0.25-go-deps.tar.xz 30379344 BLAKE2B 7ea8fbcfa0fa0476f06fa7dcf847412027345750195148e4604c3e065f774bd0554d14a04444e4dc447d4ed8280e36e19ce4e0fbf181de80a65bc56dcc22dc05 SHA512 d291cbd7ffc281aa4f265317b35898f7ea2aaefc1d13553bba1ec2b941312d8deaa87d5eb8d5a9db1b52e7ed5ca58ff2c4e8e3b32f3a2846f605702f78590153
+DIST zabbix-6.0.25.tar.gz 44109483 BLAKE2B 1b433d119838b33d449a9c9088355e3fe703ab120e1a606daf405c9ac8926c9b24a97f7a95b30c27e11f1673564ed32271b4117ca12822fb1b1edc0e4d70e06f SHA512 0be1ce76754788e05ff73a02f370c2b6b4bc2f69a463a47304ac9504a8cd9da2697c54d897a95b39841ceb38ded0c985f4772e453a393526aca6475c78eb7a1e
+DIST zabbix-6.4.10-go-deps.tar.xz 33075148 BLAKE2B 42462f881d78cfd926066ca3f181c4a0f10e643fd87e703d87edbfcf21a3fa418335b2b0bf7a8beba41782ded4b672fd0b9cb04566db9b886941ea31eab0950d SHA512 e2ea655e28983af5dc144b19067d28aa022c3824ad77ac247e1503451fe49073870f453dfefb288b74951246acc2994150c257133f9e22029052e4b70e03f3a6
+DIST zabbix-6.4.10.tar.gz 45608366 BLAKE2B 5cabb552e6930062b53bde43da83475fd982eedcc9344dcd5c690bd8749631fa0e781d0784105734520e470451377518c9e63cba110bbe52a437d0cf2cdc82ec SHA512 bd8460da2cca3b8a0b4e0adbf5a7a30e74c30667bd95f161ca6159798f788748f5de6a512a3b36f2b47d695daf3e810abcf68b3016af6fd06602075a76cb4ef6
 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
 DIST zabbix-6.4.8-go-deps.tar.xz 20645996 BLAKE2B 59e7349fd18ffa76dbb7207b649aad8ebf767423085b603b2a677ad680b1dce4c7474e4892d11df0aa38a7c0b63e3f3944bf612dbbc3eebef6e995220dea4a60 SHA512 a8860440010f85c12325048a3590a0a594af151566b40d88a02656469e2f46a9988fa4c21c6582bcaf37aa096dab9b06d08a45cbba52736732905744c4996d97
 DIST zabbix-6.4.8.tar.gz 44165922 BLAKE2B ac01f9fc1546a936bc57d2c97da2ec95bdf6b467d24a4ce6f08d34a40a94725a7f64c62253c1386e58ea601f0d739d8276713a16d0f35a4d9746d68cda21d0af SHA512 712e9f3fdb772475137c7238e8ca26f510180c147b7aa74b29567033f62d4beb00275b96aaf05c978fec341b08c82102ecf1976a5e8af257e848ae3974a6fec9
 DIST zabbix-6.4.9-go-deps.tar.xz 33364556 BLAKE2B 8785cea54a5ae3993cfd71499a2cae4af725912928a2f02d5195217ca340a5004cbc61fc58ba747c61749f01e4b67eac77c5bff22b095d4b87d86a6348e6fc7d SHA512 24cd8350c4e5993b4da9ebbf9480841619e13957809720fbc8822e874c4138744492265cafef2838737104fb07698959a3802edbfeb64f5e8de71b7b5a3f5d18
 DIST zabbix-6.4.9.tar.gz 45589960 BLAKE2B 7a7c0ace08fec2eae8d0f6d6b27eb22269922cb04f8eba4b84f02677228224c34c9a2c038fab18451cb71aea67a500c5f460b754872ff7d22bb86aa15049b912 SHA512 3caa35ddc5abb6bcdfb2d7e24cb20d27caf2974dbc8897ac8d44b8f4935576bbf00a7a5f962229dd6c7a439f826e292b02d777276264eaaccf870e2dc5440813
-EBUILD zabbix-4.0.49.ebuild 8863 BLAKE2B e93700d4834d218068e8ca8532cb1a36454649b4a041bd083a9b36ff5c668d1c6d62863bc30b850a6d25ce65a7ed8746c76a26ecb297ec1e7167100d86464ef5 SHA512 6a6773bdfa9a059a352c609ee6b96afc9c466495665206d8f6dfcff5e96ebe570d5a7958429601c2f9f19fb21b8f249a407a7727e779251106a93c7879f07343
-EBUILD zabbix-4.0.50.ebuild 8864 BLAKE2B 3e871f762384c27afaea3daf3cc8089dc3857f2ee0d169f398e443445ef1d548d52dd84261d2ab91a331e20eff86b32d4587b2cae984bc55623e8da2203db560 SHA512 83f0d8170524279392004a9947b6efcf529a1e66f95f6c68333f2004f284551e0f7158634d6c557e15014a9d43c76c6916219a331984c9070823bb9d71e16a00
 EBUILD zabbix-5.0.38.ebuild 9601 BLAKE2B 1962b4e56ececde58d08a37eaad7779a9e8dba5cd68c09345d87d4be35a855aea573cdb5d67a6d4d88b6909592124ea22d9280123ea9bfb9a3e26df4efd9a02e SHA512 7fe2c61a0bc4b483c28731f5099b46baed4d7ba701c46ac782fdde1a264f12ab2a8b1287a33111334289bfce97cb46683f4c2b4dd850832f38a7e1f390b884bd
 EBUILD zabbix-5.0.39.ebuild 9602 BLAKE2B 47b55db6d8d6ccddb0d51ea4125b08afc8496058b9fd23e48b90664c41d6052d22964f31ed5940d9c215f05ca1ba7e662d5d90ff4aade4a3adb5b8992aad1e33 SHA512 a26dc4997a81b3ea9ca38bc6af2a73c123f731c3580d616c332c8ef7b145bbacfd33ce20d877ed11f6a3a6a5db43e90b1add9b3edac2c537dd1f9a622cb37fa7
 EBUILD zabbix-5.0.40.ebuild 9603 BLAKE2B b0095aaac0463d293195826e08378f8a01f69af09b0b2f5ade582b95799f98ae350e0574f41d0fd45dcc745835e9e96b7e62f3378e00d8e208850c82501109b0 SHA512 4a51aef8decd462f88281f6d271c64433cc3a4e23e700068281876b4d1a07397fddfe402050b9c229188d7a13e3d0ccd81f1f0373935194f96b40e40ce355b45
 EBUILD zabbix-6.0.22.ebuild 9694 BLAKE2B aee3819c747864c2c36af2518c70e7658c70a31cf4d5a0f3246a9c7ac46655ff475b05a2fe0290e2b5f88d6845c304a4f78307b4d2871c0a3b5553ca84547d7a SHA512 4fdb06f68f76f052742487dc15bb8cd199a9a63ab9a7db7d758e799de6ee4d442606859a30bbaf8bbcc8bf234cd0cfc78c0038a24b09f20d45ff5cde5ecb8fd3
 EBUILD zabbix-6.0.23.ebuild 9695 BLAKE2B 3ae220c9be90efe1c9f50b33a0a8fc477bb6fdeef5e1280bdc6470721012c21eba996a54bbdeef07d38c019bcd19f47773e805c258f0a4aa196fe1e7f3d1aba7 SHA512 dc18344e01f63b9e3b9cf92b3bbb599bd6a9e3d049b4aa3c109ce040cf1c1260ea9ff0c911f0ed250cc1332975b7c16c4ea34359bc4e76eed0b69a0c3839edaa
 EBUILD zabbix-6.0.24.ebuild 9696 BLAKE2B a8929cc54c50ba6a1f5a489824d6850a21afbd4a9ac33b019eaa3b03de4c007faf36a32ce1c8ce29ed1b8c14e450edc23ac67fe38ae29c21cd14e989ef1deb9b SHA512 e9eecc67b99bc92a17ea5208e175ae4cba3611ff685bd302b23b3b92f300263d5e2a2414d910f16b68eee1d14a5f7f27c5bcc3fe26501a9ee5fdd7583c1155e2
+EBUILD zabbix-6.0.25.ebuild 9696 BLAKE2B a8929cc54c50ba6a1f5a489824d6850a21afbd4a9ac33b019eaa3b03de4c007faf36a32ce1c8ce29ed1b8c14e450edc23ac67fe38ae29c21cd14e989ef1deb9b SHA512 e9eecc67b99bc92a17ea5208e175ae4cba3611ff685bd302b23b3b92f300263d5e2a2414d910f16b68eee1d14a5f7f27c5bcc3fe26501a9ee5fdd7583c1155e2
+EBUILD zabbix-6.4.10.ebuild 9745 BLAKE2B 376dd88695725ee631b38c238cd3b0bc537d807644f5f57105d62c8d1470014bd255bacc21e619f51d0550f7a6fa1453ebb0e6eae77407f0bd9404b13ae3d9e4 SHA512 78764d4e09b32e58335b34c1a613ffbf1c70e659ecace4aaad914b257438f67d7a36e3ac4dbed37ea5b28d95c452b44f05a7553e66c7ba659a0b33f9af7e0eca
 EBUILD zabbix-6.4.7.ebuild 9743 BLAKE2B 11e5b4ddc5cc5337e34d947a6b6a1677a6c5ee8a137565c0a98e4b840a5f0bbba0f5f60408f25faeb6e69f2b3f6dd0a9eabdfc2f3ce127085e42c73209509cfc SHA512 0b361a6ef4aae98c579b900b9f12c66b73d0eaf17b859e3be66cac1ea8a17ff043b9a7d95ac89d136c029a1906ef2830db451ee910d3e0c506de3caa65ab3aa1
 EBUILD zabbix-6.4.8.ebuild 9744 BLAKE2B 3301bb0527af4b6b1476e80a2d14d525f0a8900f6b73eb52924d1fcb9e3cf1aee22c0dc30cbe69421bee238a92adfcb7fff4905739571c34e9f0f8783a4bb227 SHA512 8a0bf9ba88b9f0f7e8b25c1faf7eb692e0d29c0f8e6d52420153e591cedd2d8553c49e307e329066591f394ca1f775a78fa6a81ca497de721fb31f66d511b5f8
 EBUILD zabbix-6.4.9.ebuild 9745 BLAKE2B 376dd88695725ee631b38c238cd3b0bc537d807644f5f57105d62c8d1470014bd255bacc21e619f51d0550f7a6fa1453ebb0e6eae77407f0bd9404b13ae3d9e4 SHA512 78764d4e09b32e58335b34c1a613ffbf1c70e659ecace4aaad914b257438f67d7a36e3ac4dbed37ea5b28d95c452b44f05a7553e66c7ba659a0b33f9af7e0eca
-MISC metadata.xml 1655 BLAKE2B 46ab1f5adaff6069890380b23a6edaf8f0f7380ffc4a320f17df52f2e59867bdcf09633d9c6e242434919d3512d557c2f623d2826b1453424c43dc0b0ee0a262 SHA512 62e5a8853c13dac034360bd1a7b61987b548641b76860f05a8f75181b8d8029e06bc9cbf136d42836e714cf0c193b04a589d214a7864d607bf93dd97066f1a70
+MISC metadata.xml 1576 BLAKE2B 877e83a97b492fe256f3459332dacb4680b2ddeaaab34c077f1ead5eb387d8f5ef6f7cca85435eedc85cdb0db7243a805a8b49c5ef7b1b7dce39a9213b401eae SHA512 77d805096f0bcf2f3650216c69cb33c7dbbcdfc8b7c56066463ce5436af30dd0e9b8c6d124b59bfdbdac4c18aa628c92f78722920284622065af0ddb6448cd3d
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index 5a8b28dde8b8..d6088f15ce3c 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -22,7 +22,6 @@ configure different types of notifications for pre-defined events.
     <flag name="ipv6">Turn on support of IPv6</flag>
     <flag name="java">Enable Zabbix Java JMX Management Gateway</flag>
     <flag name="libxml2">Use libxml2 client library</flag>
-    <flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS backend</flag>
     <flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag>
     <flag name="openipmi">Enable openipmi things</flag>
     <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as TLS backend</flag>
diff --git a/net-analyzer/zabbix/zabbix-4.0.49.ebuild b/net-analyzer/zabbix/zabbix-6.0.25.ebuild
index 4f3236d0fe78..3f8ff4ea9877 100644
--- a/net-analyzer/zabbix/zabbix-4.0.49.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.25.ebuild
@@ -1,24 +1,34 @@
 # 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 toolchain-funcs tmpfiles user-info
+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"
+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 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 )
+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 )"
@@ -33,7 +43,6 @@ COMMON_DEPEND="
 		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 )
@@ -51,7 +60,6 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp:= )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	xmpp? ( dev-libs/iksemel )
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -60,13 +68,13 @@ RDEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
 	proxy? (
-		dev-libs/libpcre
+		dev-libs/libpcre2:=
 		net-analyzer/fping[suid]
 	)
 	selinux? ( sec-policy/selinux-zabbix )
 	server? (
 		app-admin/webapp-config
-		dev-libs/libpcre
+		dev-libs/libpcre2:=
 		net-analyzer/fping[suid]
 	)
 	frontend? (
@@ -99,11 +107,19 @@ DEPEND="${COMMON_DEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
 "
 
+# upstream tests fail for agent2
+RESTRICT="test"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
 )
 
 S=${WORKDIR}/${MY_P}
@@ -134,28 +150,31 @@ src_prepare() {
 }
 
 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)
+	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() {
@@ -176,7 +195,6 @@ src_install() {
 	)
 
 	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
 		keepdir "${dir}"
 	done
 
@@ -230,6 +248,20 @@ src_install() {
 		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 \
@@ -257,7 +289,7 @@ src_install() {
 
 	if use frontend; then
 		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
 		webapp_configfile \
 			"${MY_HTDOCSDIR}"/include/db.inc.php \
 			"${MY_HTDOCSDIR}"/include/config.inc.php
@@ -271,7 +303,7 @@ src_install() {
 			/${ZABBIXJAVA_BASE}/lib
 		keepdir /${ZABBIXJAVA_BASE}
 		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		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 \
@@ -294,15 +326,14 @@ pkg_postinst() {
 
 		zabbix_homedir=$(egethome zabbix)
 		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			[ "${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 "for custom alert scripts."
 			ewarn
 			ewarn "To change the homedir use:"
 			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
@@ -331,6 +362,10 @@ pkg_postinst() {
 		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:"
diff --git a/net-analyzer/zabbix/zabbix-4.0.50.ebuild b/net-analyzer/zabbix/zabbix-6.4.10.ebuild
index 127516244499..5fe722d26411 100644
--- a/net-analyzer/zabbix/zabbix-4.0.50.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.10.ebuild
@@ -1,24 +1,34 @@
 # 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 toolchain-funcs tmpfiles user-info
+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"
+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 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 )
+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 )"
@@ -33,7 +43,6 @@ COMMON_DEPEND="
 		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 )
@@ -51,7 +60,6 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp:= )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	xmpp? ( dev-libs/iksemel )
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -60,13 +68,13 @@ RDEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
 	proxy? (
-		dev-libs/libpcre
+		dev-libs/libpcre2:=
 		net-analyzer/fping[suid]
 	)
 	selinux? ( sec-policy/selinux-zabbix )
 	server? (
 		app-admin/webapp-config
-		dev-libs/libpcre
+		dev-libs/libpcre2:=
 		net-analyzer/fping[suid]
 	)
 	frontend? (
@@ -99,11 +107,20 @@ DEPEND="${COMMON_DEPEND}
 "
 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}
@@ -134,28 +151,31 @@ src_prepare() {
 }
 
 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)
+	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() {
@@ -176,7 +196,6 @@ src_install() {
 	)
 
 	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
 		keepdir "${dir}"
 	done
 
@@ -230,6 +249,20 @@ src_install() {
 		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 \
@@ -257,7 +290,7 @@ src_install() {
 
 	if use frontend; then
 		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
 		webapp_configfile \
 			"${MY_HTDOCSDIR}"/include/db.inc.php \
 			"${MY_HTDOCSDIR}"/include/config.inc.php
@@ -271,7 +304,7 @@ src_install() {
 			/${ZABBIXJAVA_BASE}/lib
 		keepdir /${ZABBIXJAVA_BASE}
 		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		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 \
@@ -294,15 +327,14 @@ pkg_postinst() {
 
 		zabbix_homedir=$(egethome zabbix)
 		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			[ "${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 "for custom alert scripts."
 			ewarn
 			ewarn "To change the homedir use:"
 			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
@@ -331,6 +363,10 @@ pkg_postinst() {
 		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:"