gentoo auto-resync : 23:08:2023 - 21:49:58

13 files changed, 1601 insertions, 8 deletions

diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 37ef3f01e789..7227585b8fc8 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -19,30 +19,41 @@ AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST zabbix-4.0.46.tar.gz 17902473 BLAKE2B c791af22719cfd83a9d1350abd3b7d29cd441537580c7a3f2bbfd7fcda690526a7a1c5725ae1848ab8f8a232d10c8e7bcc8c16dffe09409965f4d42e55ba394f SHA512 6d6df0a9ba1b0673d4a9474f3eb841cfa8b7c49d39413a39b7cb84713fb9986243ae83d1cb23b8cdd4e312de8c67a366ea020a989d2dc1da74eed93d094e4688
 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-5.0.35-go-deps.tar.xz 34454684 BLAKE2B 98489131a696f7606daa29bcb5de8f420eacf4f6bd89a9bb88e451f61b2ccf5cdf61a77a1de3e486763317e4a3c9dded9fddf400a5e545921ce823a17fc77a66 SHA512 2b6de506318c9656cb8dd8c2ec5f6443be64b9af2a94ed410acba7152d613b07222cbf042d2e490e0f94f82d03f8507d6a53fca36584739b6de8d23010b725bc
 DIST zabbix-5.0.35.tar.gz 21839368 BLAKE2B 8db4fa5ffbd7374e2bc060817a0854625ca99b4b20cbe5dd3f9d264e933c0ebef21efdef68b13d797edf60c388ba1d84a3fa9951ba138176513d120de09a3d28 SHA512 a76e94f2292a5990319e7a154b295aaf4c7421ca40ed9d1b3ea529979151407d3e65bf43b93b36234e84c800dd604cbe7a7154fbe44c1b5316b1d4b00b2e42d4
 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-6.0.18-go-deps.tar.xz 18727444 BLAKE2B 2a8e9a929857574104c7af6b423bbfcd1b306aa485a657ec1e163498727684f364a7bc10011661bdc9a4edc862af748f3e80e3de83859c8660f378ec539b47a5 SHA512 dff99d9404ee8f8fe868db8498cc7f8c30783bb09e38913a25222be91045b77e8f4aa02fc8e9afcbc2af0c52c95ce717710151af30e3d662a93dad290c73909e
 DIST zabbix-6.0.18.tar.gz 41926243 BLAKE2B db7c5556896ad6cea107791f4bf5c5128862b941a3dedab74a44d5f3f0770f36122338c5e493c26c4ac07f43091291a9f4c1916b742e97bdf8f70cc9cb07d280 SHA512 775da1d47e095c233c6fdaab0c94dd4eee356825401ac885a8f000681caccda54f0ef508bcf8cb7d1f6def0178cb0aa17b37ec15ae9db032aaaa7faec7542e3d
 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.4.3-go-deps.tar.xz 21580912 BLAKE2B a8d67ca707ebc0b7c873ebc9210643c8409975931e316556ceb47fd8e89eb998a13b7581643f4031de3d1d167e860752edb4589ea4d89037f18b2c14423d954c SHA512 277271b2a15e3fb04a1e30dcfe4b499f874d93e2509283b5acf2b6380f1ad4fb2627d8021c401076277d84f1a2031f6bfae285cbd4e6f2f45ec7daa42294bc59
 DIST zabbix-6.4.3.tar.gz 43369742 BLAKE2B a19cc8fa1fec26b152f84427394d1e1dd947aae62bce69eeb0f7cb3326d84a9eae9e79f17e7583cef36fbb7c6f39560ee0c495cfa61eaf9983238618bb33c406 SHA512 ddb90a0a7699a7cf007ee2efcbc807e573221b92bf4fb104b8dfb07355d79235b5bbd1aae8c70a7edcc42555b5f182230057162cf2bd899ba4b62ed433711f69
 DIST zabbix-6.4.4-go-deps.tar.xz 21588740 BLAKE2B 4f02c2c6fbfc44ec65bd697a1494dae26d528ce18bc060939e8a86bfcee1bf513dfe51440338c0ca0209ac260abff429da6ba0f9e6c381c96ac96cd8cc7f0d9f SHA512 ce0c2f4df1c42c45db7b3f42c75973f01b83996eb1f04b7d456ee6e5b7fab99a4ed224d7bab7ac4d9ed37fd35fbbee4f40ba826849a9c4007044384310c50b09
 DIST zabbix-6.4.4.tar.gz 43403307 BLAKE2B c6616045da913aa681543d038348f5273853621ee698e21fbf196935d4ef16f6c18052ca5f9b00526d0fb0710e833a24b7fac8987affb19f2e836a5c3426f366 SHA512 f01fb33707e16a2784fbc4102222418277eb4abf4d83d01f7981b0bf085c2db8510362366c4f2bbd69790a3da5a8e563415d6b3dd36a70c1cf94f8b57ee9e283
 DIST zabbix-6.4.5-go-deps.tar.xz 21631800 BLAKE2B 5f4e819f1fb3e4646ef26f1ce270de7a8ada9d69b0aabc1e9a2e1639620fa959f9071be57de188fe83fa150de4c09cffff0177373eff6688fea3acd33fc08946 SHA512 f2faa9a8a3450df7d8e2b4c0ab103d7a6863a7e7fdb851be460f4866839cc974e71144a17a9a5719d26c789a5d552a85e63c5015f520bb4c250eaa5cc95fd67b
 DIST zabbix-6.4.5.tar.gz 43464868 BLAKE2B 39a2bedc2b9fdfc046a984595377a5cf5375db5992ea01775c351ba906996b2f4bc71a8c38a542cb859c9e7fd7711bf21086995c1426ffc2a00fabe0427831f0 SHA512 cab201a68f5c580e102516f7de27a0009258e358abed161a3b3e4ae9d531e8d6a93b8aed1239a0244bff8bcafcbdb6f262e21fa500772dc8fccd20e3345089fd
+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
 EBUILD zabbix-4.0.46.ebuild 9473 BLAKE2B 64dc377510b3c302c2dbff46e91fee4703f5160818b60d4b65c9210b9ded6a70b8e464385f6f57b431b3b2dcb3134faac6f922b847aca576c9ba5d7afa26cbbd SHA512 f8370f98efdf8132604747672756e9bdaf2dd9492d433528ee764e5dc345ef2a48a816867567981489f744ade8175d8d16498d7d814efc374b76143753d78181
 EBUILD zabbix-4.0.47.ebuild 9475 BLAKE2B bb4ae6c9f45ef2ed0aef21ae811f616f5291ffd50beb14c691fa113483123e391024e490b88fafa538adf93aa595e3e9126c92c666dabb4fd1ad4566e16ab556 SHA512 822bc6e3309999df1b68cae6e572563b621352ad4a70f683ab28876ec5384fd56721fad612ce411f6d25c270b7ca228857b7894efd1c49a48131f7bb68b0d3ed
-EBUILD zabbix-5.0.35.ebuild 10190 BLAKE2B ba6e6a4ea61665f700f51f5a150c8790d6a3ca8b9835081f321654deadb63de41ed3c26115903cba8381979b404ad4de30625de16510343f32628445dc09503a SHA512 40e20743f3d312803d2a6a691725f23ddf693c174ca2576a731cf43391aba6badab7df10bdcf3b4fbceef7e6b2c2048c0da1fe55facd9c0a8198ea1807e65675
-EBUILD zabbix-5.0.36.ebuild 10192 BLAKE2B 88498e065c1917b2ce79fb2f7b9283a0c28ada71024582c233edab52596135e567fecc64df6b53f5ddf5bfc68f71f23fed4cbd5a9426786a89e0a786c47bb202 SHA512 68843f8f63dd2c2ca78f5e9a8c46c7056f69f16cbdab34747ed79cfb748b199a9b7f2fa0653dd0ed58c18e73b582076921f190314586e28b418bc67e05cef939
-EBUILD zabbix-6.0.18.ebuild 10283 BLAKE2B f819d2d4519f002b256484eb237dab6fc9edd60d362559dcb0f5a48ecd364877ca80b8750c3bff6b900d55f3bfb5a129c4d019505c5f496388ccd6fd524b81a1 SHA512 e7c0a97439cf0ba026909433914a3c61f3198a2e12c06ba3f023cd831160b56db15b970e3b1c2d817f1f07231ce8f2beb96dd2bb7e46bba975ee90a72b6414f1
-EBUILD zabbix-6.0.19.ebuild 10285 BLAKE2B 3419dc4892b5110c0347a419c605f0e344c99831def1d1e72db6a0f6397a52e55faae6f00b189029be43abf8582c19ba35ae7170796e084dd2758cb7bc229a35 SHA512 2a3870ed7c291823118f9177cdfb3ed13fd68d0c04bca64b2b724244355c72460a4bfc756df2ed5f504a78643cdd95b2b0a6c51970c0376caaaf29402a590279
-EBUILD zabbix-6.0.20.ebuild 10285 BLAKE2B 3419dc4892b5110c0347a419c605f0e344c99831def1d1e72db6a0f6397a52e55faae6f00b189029be43abf8582c19ba35ae7170796e084dd2758cb7bc229a35 SHA512 2a3870ed7c291823118f9177cdfb3ed13fd68d0c04bca64b2b724244355c72460a4bfc756df2ed5f504a78643cdd95b2b0a6c51970c0376caaaf29402a590279
-EBUILD zabbix-6.4.3.ebuild 10281 BLAKE2B 1baad42a3ab68ddbfd1f96958bf1f335e64be66c37882058e44e44c8308dfc7262281d0168c47f83cf3cfae3a112f16b2a6ada9831e5e68a46587f1b6137ab43 SHA512 bb19f18d6667b3b41ca8994c5ec648281ab80048bf2ab29f4acd6b9ea01c502e635295bd7e6ec1d0b06462272d8ea993af9ae0200bad4c5908c1a8026fdafa03
-EBUILD zabbix-6.4.4.ebuild 10283 BLAKE2B 44d4f85febe37026dff5228c58463432ed70a00bb76323f149f0203693c519fe6822b40abd46f26604177a51f8d1591e0fb9a4c86e17416f7c2a486a71c7b5f4 SHA512 3aed0e998df26be546817e18c29d6deb0dfa01d2aad16d66ffeab6a738a39997e70f44ac70c5f82a25c381a6b187b16f2be2cbeae3212deb944025f3f4323f8f
-EBUILD zabbix-6.4.5.ebuild 10283 BLAKE2B 44d4f85febe37026dff5228c58463432ed70a00bb76323f149f0203693c519fe6822b40abd46f26604177a51f8d1591e0fb9a4c86e17416f7c2a486a71c7b5f4 SHA512 3aed0e998df26be546817e18c29d6deb0dfa01d2aad16d66ffeab6a738a39997e70f44ac70c5f82a25c381a6b187b16f2be2cbeae3212deb944025f3f4323f8f
+EBUILD zabbix-4.0.48.ebuild 9475 BLAKE2B bb4ae6c9f45ef2ed0aef21ae811f616f5291ffd50beb14c691fa113483123e391024e490b88fafa538adf93aa595e3e9126c92c666dabb4fd1ad4566e16ab556 SHA512 822bc6e3309999df1b68cae6e572563b621352ad4a70f683ab28876ec5384fd56721fad612ce411f6d25c270b7ca228857b7894efd1c49a48131f7bb68b0d3ed
+EBUILD zabbix-5.0.35.ebuild 10210 BLAKE2B 961fc6890b3b445d2d6c3e0fa18cef2bfe01c65236ab90503a5084e6fe6dcf203c675759e0cca26db52b20407810706e65b3ea6094e5a1e890897d4a401c584d SHA512 a32c12d4d3ac0e1a3db57e5500b27d54bae9184bb89ca79a0016e86f4a2d8b870b8757f05bba85a5ed8bf851dfe7efa889e79d304032d83128a2023f0ddcc089
+EBUILD zabbix-5.0.36.ebuild 10212 BLAKE2B cf3eeac856dd59ab71f381078a4c695425981985a6f988c12c18415187ae5fc70975772938e630c95ce0a664c9f85a8eb925bad0237bc000178e69f08d14455c SHA512 e987f20fcfad177146e58bc18b4dafd1e8225275c76c595c3906e479acc915ce0038856a0120e1ea429b9e95816e79ce584b8c13633e3b4af703c02dc5d78c0a
+EBUILD zabbix-5.0.37.ebuild 10212 BLAKE2B cf3eeac856dd59ab71f381078a4c695425981985a6f988c12c18415187ae5fc70975772938e630c95ce0a664c9f85a8eb925bad0237bc000178e69f08d14455c SHA512 e987f20fcfad177146e58bc18b4dafd1e8225275c76c595c3906e479acc915ce0038856a0120e1ea429b9e95816e79ce584b8c13633e3b4af703c02dc5d78c0a
+EBUILD zabbix-6.0.18.ebuild 10303 BLAKE2B 8b85dceb6f78d7dca22047e237c52a519e3a0608045c31922cc212a2aa9b0f7c2abc8cf6bd5e7d48b7503afb509f929004f3f662b9524eba41605fa3a7fd276b SHA512 4907e64fcecc541099ab3a1d1cde599494408174116290e74d88cbe8352e6dd9efbbcba79027b72aa5dddd22bd0ca9a9cd9d43babaea113e8d335dff8aff1a0b
+EBUILD zabbix-6.0.19.ebuild 10305 BLAKE2B 56d194dc9e8853c2eae5c5e1224798dedd3d2c28e524cf6a534f863785ee13a474c95a28bfdda8a009b562cae2137536f0e6a0ae6366822a1489a5ef724902eb SHA512 403cf301e52fe35bab54cb3bc344a10707987588ec2dc3db11d62a7333b8a11fe416e9978f44d9b47dece4b799d7a4f8773bac944167e149c113fd14b0e28163
+EBUILD zabbix-6.0.20.ebuild 10305 BLAKE2B 56d194dc9e8853c2eae5c5e1224798dedd3d2c28e524cf6a534f863785ee13a474c95a28bfdda8a009b562cae2137536f0e6a0ae6366822a1489a5ef724902eb SHA512 403cf301e52fe35bab54cb3bc344a10707987588ec2dc3db11d62a7333b8a11fe416e9978f44d9b47dece4b799d7a4f8773bac944167e149c113fd14b0e28163
+EBUILD zabbix-6.0.21.ebuild 10305 BLAKE2B 56d194dc9e8853c2eae5c5e1224798dedd3d2c28e524cf6a534f863785ee13a474c95a28bfdda8a009b562cae2137536f0e6a0ae6366822a1489a5ef724902eb SHA512 403cf301e52fe35bab54cb3bc344a10707987588ec2dc3db11d62a7333b8a11fe416e9978f44d9b47dece4b799d7a4f8773bac944167e149c113fd14b0e28163
+EBUILD zabbix-6.4.3.ebuild 10301 BLAKE2B 1e84972d2b9dbc025bc942f2013b9d9f63e2d69ede092dd0acfb4c3fd070606e961c7ebc1ad2974fcf1c279dc4b7ded146783bcda794ada611d8ce5f90f94f22 SHA512 422331dd0e87026b2bd2eeb1305657e777ae883c0413227937a0554b76e23567c6c086e47d3cc95ec95a724104bf20029bab423c39cf3fa8d6388ee3232e38a5
+EBUILD zabbix-6.4.4.ebuild 10303 BLAKE2B 2d3bbbc9adc2dd483e37d59b3a197976ce1bad76f9ac1510c08b301397fe74fcad20680c99d215f3a052e99caceff96d34373a5d27752a4168320a3acf60368d SHA512 ce85b8d1c8affd28693248f34ebcbf9b93f3677bc428461b7d37694ae9dacea7503da0872df64446cb91a7e7cc93fdc9b19960f5040698e468ada7c0f029751b
+EBUILD zabbix-6.4.5.ebuild 10303 BLAKE2B 2d3bbbc9adc2dd483e37d59b3a197976ce1bad76f9ac1510c08b301397fe74fcad20680c99d215f3a052e99caceff96d34373a5d27752a4168320a3acf60368d SHA512 ce85b8d1c8affd28693248f34ebcbf9b93f3677bc428461b7d37694ae9dacea7503da0872df64446cb91a7e7cc93fdc9b19960f5040698e468ada7c0f029751b
+EBUILD zabbix-6.4.6.ebuild 10303 BLAKE2B 2d3bbbc9adc2dd483e37d59b3a197976ce1bad76f9ac1510c08b301397fe74fcad20680c99d215f3a052e99caceff96d34373a5d27752a4168320a3acf60368d SHA512 ce85b8d1c8affd28693248f34ebcbf9b93f3677bc428461b7d37694ae9dacea7503da0872df64446cb91a7e7cc93fdc9b19960f5040698e468ada7c0f029751b
 MISC metadata.xml 1655 BLAKE2B 46ab1f5adaff6069890380b23a6edaf8f0f7380ffc4a320f17df52f2e59867bdcf09633d9c6e242434919d3512d557c2f623d2826b1453424c43dc0b0ee0a262 SHA512 62e5a8853c13dac034360bd1a7b61987b548641b76860f05a8f75181b8d8029e06bc9cbf136d42836e714cf0c193b04a589d214a7864d607bf93dd97066f1a70
diff --git a/net-analyzer/zabbix/zabbix-4.0.48.ebuild b/net-analyzer/zabbix/zabbix-4.0.48.ebuild
new file mode 100644
index 000000000000..249e6dc9f35f
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.48.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.35.ebuild b/net-analyzer/zabbix/zabbix-5.0.35.ebuild
index 8917235a56d0..a71802cf2bf6 100644
--- a/net-analyzer/zabbix/zabbix-5.0.35.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.35.ebuild
@@ -28,6 +28,7 @@ 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 )"
diff --git a/net-analyzer/zabbix/zabbix-5.0.36.ebuild b/net-analyzer/zabbix/zabbix-5.0.36.ebuild
index ec1e25bbcd14..cc4546e6cb45 100644
--- a/net-analyzer/zabbix/zabbix-5.0.36.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.36.ebuild
@@ -28,6 +28,7 @@ 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 )"
diff --git a/net-analyzer/zabbix/zabbix-5.0.37.ebuild b/net-analyzer/zabbix/zabbix-5.0.37.ebuild
new file mode 100644
index 000000000000..cc4546e6cb45
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.37.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.18.ebuild b/net-analyzer/zabbix/zabbix-6.0.18.ebuild
index b48c28cb2ee3..6d18d732cf90 100644
--- a/net-analyzer/zabbix/zabbix-6.0.18.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.18.ebuild
@@ -28,6 +28,7 @@ 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 )"
diff --git a/net-analyzer/zabbix/zabbix-6.0.19.ebuild b/net-analyzer/zabbix/zabbix-6.0.19.ebuild
index e5e5f002a22e..4da32a57da4b 100644
--- a/net-analyzer/zabbix/zabbix-6.0.19.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.19.ebuild
@@ -28,6 +28,7 @@ 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 )"
diff --git a/net-analyzer/zabbix/zabbix-6.0.20.ebuild b/net-analyzer/zabbix/zabbix-6.0.20.ebuild
index e5e5f002a22e..4da32a57da4b 100644
--- a/net-analyzer/zabbix/zabbix-6.0.20.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.20.ebuild
@@ -28,6 +28,7 @@ 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 )"
diff --git a/net-analyzer/zabbix/zabbix-6.0.21.ebuild b/net-analyzer/zabbix/zabbix-6.0.21.ebuild
new file mode 100644
index 000000000000..4da32a57da4b
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.0.21.ebuild
@@ -0,0 +1,403 @@
+# 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.0.3-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_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
+}
diff --git a/net-analyzer/zabbix/zabbix-6.4.3.ebuild b/net-analyzer/zabbix/zabbix-6.4.3.ebuild
index 239652c7407d..4c6a9f5a4fcc 100644
--- a/net-analyzer/zabbix/zabbix-6.4.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.3.ebuild
@@ -28,6 +28,7 @@ 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 )"
diff --git a/net-analyzer/zabbix/zabbix-6.4.4.ebuild b/net-analyzer/zabbix/zabbix-6.4.4.ebuild
index 2423117090ed..38f6609f2faf 100644
--- a/net-analyzer/zabbix/zabbix-6.4.4.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.4.ebuild
@@ -28,6 +28,7 @@ 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 )"
diff --git a/net-analyzer/zabbix/zabbix-6.4.5.ebuild b/net-analyzer/zabbix/zabbix-6.4.5.ebuild
index 2423117090ed..38f6609f2faf 100644
--- a/net-analyzer/zabbix/zabbix-6.4.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.5.ebuild
@@ -28,6 +28,7 @@ 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 )"
diff --git a/net-analyzer/zabbix/zabbix-6.4.6.ebuild b/net-analyzer/zabbix/zabbix-6.4.6.ebuild
new file mode 100644
index 000000000000..38f6609f2faf
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.4.6.ebuild
@@ -0,0 +1,403 @@
+# 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"
+)
+
+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
+}