gentoo resync : 22.12.2021

9 files changed, 30 insertions, 30 deletions

diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index f3b0d29d8d3f..9239d5dbef6c 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -260,11 +260,11 @@ DIST zabbix-5.0.18.tar.gz 21377940 BLAKE2B 4143dd2b5c4b04795e2f1b43637e541e3108a
 DIST zabbix-5.4.6.tar.gz 24371783 BLAKE2B 3be879a9b0452f2ee1b36c94511d6ee1a79214f14f3e9438da0035f258c70b190671e9991b0691209be9440b0103ec10a8c2a6cc4f3304a4638ebce0d8eb58a7 SHA512 4ca755bd715d5ba70cfe99894351cdf8ee82e8e8b2316fa7b95c083b9f13e6b3d986d87a52f157b00271bed7edaede5cdda020ca43015d7cf848f51ed169089b
 DIST zabbix-5.4.7.tar.gz 24424262 BLAKE2B c89bdd91ad8702d1edb60288013447aee910822d5a877a348f8770e4573906569393bb3e12a1b050f8550f8f5ac35308ec35795c2a1334ada5230c6e72b48286 SHA512 f87fd158d74c289765ddc3394bfa1c009d72d2756596c2060d567b5e44123594f00307f4df28a67b38c0e59a9d26f7d064afe73e7a3a0bd4e9bc02529334b1d1
 DIST zabbix-5.4.8.tar.gz 24431613 BLAKE2B 82279ba2a4515603d50083a391ea2c9d230dcc7459d62841cf003eaa092012cb2e5b5ba7c3a5eeabd4df27a8d5b6e97a90824fb119ee078864c6bf06cfec5cad SHA512 1812142cc949a2886cd1edd4d369934022aa5e89ae31b67641b7263dfbc5d3ee6f99a20a51e5b44e4af5719160f728766c5546e74c8bf9b0cf303867d20fba11
-EBUILD zabbix-4.0.35.ebuild 9609 BLAKE2B 3e1a24b044b8b539fc4fcab0359daba90f67c4e4b1b06e22e689d9f9da1d686c193bc578b513c7222863a947b77ad875beaf0435a2beccaac232b61585a49432 SHA512 9199e01bd6758d456726128705e16525ffbd7e24d27d599a5029f79943cbf58027a146e7dc2df920bfab8cfc622dc99e3b7675d5610ddebe6841008a286e67d8
-EBUILD zabbix-4.0.36.ebuild 9614 BLAKE2B 4adfd5b43cce8506461ff9cfcb50bf03fd099af46bed9505ff8acd266b9eef12e511eec2a7f3933002900f5466475f65872f254886e4126160790fb6979acb93 SHA512 5289e0adce0db9c3440e3f1ed2504f0cc82525905bb2482d43295ef98e6294dcc1c2e10ed800ff38e6b37a33cab6b7d917cb9c014b9222d783511087a07ba374
-EBUILD zabbix-5.0.17.ebuild 31374 BLAKE2B d6817579f1aedc51f76ac6d5136f5dfd5da1fb4e7381535d30a4f43e1ddf1359fbfeaeff4f2e34780617a4559a7beaba15d78db84e5d79652437823023fbfa01 SHA512 df80b919f16b1e573ec196e904b9bc05bcf2cf40b89ec9972dd3630d3321a8c7ad01db88f7fd84ce0d772a3b5318317a77eb99c270200067c1f21a54e843f1f5
-EBUILD zabbix-5.0.18.ebuild 31379 BLAKE2B 8cb7952e6bab5af2920d23fc6733643a67ea1aa37cd505259668d124b238e60655c46c7752794cab41010808957a2cf2ec5a3caebd401aeca5ffd2bb533bf7c8 SHA512 dbd620962a5a33b3c65e280140d08872c1b14349e4320efe89b4b721d18d8a9fde5ac945a0c280d4c51a645327609a5aa3eb1d2dca150b7b64a92ec750ac85c8
-EBUILD zabbix-5.4.6.ebuild 33764 BLAKE2B 16ce3fb691447df4d4e70db0e9b060688257ed2a9ac2ebbcc94be0f85b1d073a3c406232f181de3bab4ea3819cfe34d7fe033bb70fecb354bf8c15a2511e54c7 SHA512 87b6fc8c73dc0911bc362088e0722a1211e94f15415f197f4f2f3047eeb80eab16e4e41bbc8121691a71760a04bc77480516eb20fd096b0d5cdbbf89b3f805b3
-EBUILD zabbix-5.4.7-r1.ebuild 33769 BLAKE2B ebddc89c0d2553958e262112ed33029615364f6b207fdd3e1d24fa6a4fa575a41ade33394112cd197ca9b666c6cbf1d1e567188e2b4aa87ced27938bc00c2fb1 SHA512 0ca9a25e2de3a4037b7fdb9f9f6eacea21f2dc7b0a48a3ab8dc79a70300107257d5481d2336f947abbcdc3c590d1446c9ff67bd2ce6f243d2593fd1094f138a6
-EBUILD zabbix-5.4.8.ebuild 33769 BLAKE2B ebddc89c0d2553958e262112ed33029615364f6b207fdd3e1d24fa6a4fa575a41ade33394112cd197ca9b666c6cbf1d1e567188e2b4aa87ced27938bc00c2fb1 SHA512 0ca9a25e2de3a4037b7fdb9f9f6eacea21f2dc7b0a48a3ab8dc79a70300107257d5481d2336f947abbcdc3c590d1446c9ff67bd2ce6f243d2593fd1094f138a6
-MISC metadata.xml 1520 BLAKE2B 4f9851bc026e8d1aaaec68b21be3709972dad92e8b9d6bfa6de5cbac63dc324d74784284fab88227983d77526b21f7b17350f69cff3ef57db3608320b5bc7e7d SHA512 4f60c01cddfa125905c5623e56fed3194fbbc927ba2a5880618bd423f21ce52f910a5dfffdd4204734b0ce8fcb304b1deb77884a0150cbb9c94b386c4db48023
+EBUILD zabbix-4.0.35.ebuild 9581 BLAKE2B 5006cac49a7891198816ffc8a01f7098998adfdb3f182a91ba84414fad67c8dc099e7da1b59b137fb88ecb6c606572335ba98febbaea381c9bff4ef83a28622d SHA512 a9d598499cc71bedd87c610019076e4044b44f841bf8f54433754b5bc42ab83dbd816de978c653668ec0775d43978c82708b4a3e749ad92ed141878db752dc24
+EBUILD zabbix-4.0.36.ebuild 9586 BLAKE2B 96c4fa8408bf03524f507e25315820ccdf03cc72b1143b06365a0e0d7150b30069af2e22a4bb84942f44a4137fd87711b187b92b3c5f1774e9a613039778ce35 SHA512 cf440fe16b38d0ddad9bb5c14501d1fb8b7939d675dc2b73fbed3dc7dfbfc99fdbf7b1e9ca16a0765cfacd5551edffc9645387b3b0eef215494518ed36e186d9
+EBUILD zabbix-5.0.17.ebuild 31346 BLAKE2B dde8e3e6d595f13739af3b835725ff386e5b758ae80950c900102ef89be2640c743ba343369a355954ccd04462c0cf8fe5743ba0a466324f7113504d9bd97c00 SHA512 f8c2d46ae838ab7793e0d85894800226149ca9fc16805602654d73161fbaead3db364a9e5d3699b725a0accc695c5619d859b3d59db301cf67b7a7ce9d162bc9
+EBUILD zabbix-5.0.18-r1.ebuild 31496 BLAKE2B e884f48efa84617fac80e0ac566347711c460694b331136f419a017c7c67f62bb188e4e4b5b9f6f8885a0462f76ddd46d99ad47d4f2c389eb06d0302175fe802 SHA512 30b09fd58bf6ef3c6d59d665b74656c1f9ea8b0d3b50cd9bbca73d6543932949b3ce16f68b816ea24fec17f3e96d65b47f3e538d918a917e1138d00ba271265a
+EBUILD zabbix-5.4.6.ebuild 33736 BLAKE2B f8ef5ad2ffe78c9d6efa728428b93947bb3d976c65c9ed0b1d8776b338a025bc088e7b37af0cd436f2ffb75742734076634ffa877169f7f8e8797583e86db255 SHA512 c8dfc23e37b8f6fae0766cf9f3e01a0669d897997e72a9eefd48ea9fe9be6985aa1b50750b5568434ebbdfc7e3c62bdf6db0761319010785e9a1a486b7bebfa3
+EBUILD zabbix-5.4.7-r1.ebuild 33741 BLAKE2B c3b63e069c5273cb7aba254e89ed816632c47a6ef5a782cd9a56191d5a77e7105aaecfac847a59a6d77e73a83620df374aad5d6a1a6f53a37cb415510bd2e5d5 SHA512 3a39ec83b593b8503ba3f2ea93afb789bbb9bf258d443f5318451944e9675c3911d0f0a39faea99fdf43f01098eacf17dd4bb67df158651e82902a4b59c39299
+EBUILD zabbix-5.4.8-r1.ebuild 33886 BLAKE2B acf48706f509695a817d8330052b3a29984e6e9ce58a175e1d1eba607b76a3b2ce96b3b51333f3f0351d1d0b17acd9b0c08bdadbbbbf9cda0ee80be572c33725 SHA512 1a2fe5933a0305163ea759cbb57d10fc29a895c0255f33bc883f35b07e29cce05aa81e249c94475270e371f1786152bf99ac51f6097b053cd3f3f230929cdeeb
+MISC metadata.xml 1633 BLAKE2B 04e5d43c20e34d9a85139d7ff31e446a4a12cd40730b364ac2cf9cf5d7f913d2bf13711782769670e94e8ac184943a3e58d6392565e2ea9726b0bc0dd179e356 SHA512 2524cf9b092f29e457b39b12a13ce21c9c2e1de912deb147563e5e936991940f26ed93cf0de7213c784196a71b3ea281d7b76e16983fe27c55862fd1d77bbb7d
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index 8cfe48094b16..0e9bba15c9c0 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -5,6 +5,10 @@
     <email>fordfrog@gentoo.org</email>
     <name>Miroslav Šulc</name>
   </maintainer>
+  <maintainer type="person">
+    <name>Florian Schmaus</name>
+    <email>flow@gentoo.org</email>
+  </maintainer>
   <longdescription>
 ZABBIX is software for monitoring of your applications, network and servers.
 ZABBIX supports both polling and trapping techniques to collect data from
diff --git a/net-analyzer/zabbix/zabbix-4.0.35.ebuild b/net-analyzer/zabbix/zabbix-4.0.35.ebuild
index 9b6c9fe12b7b..211d787cfca6 100644
--- a/net-analyzer/zabbix/zabbix-4.0.35.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.35.ebuild
@@ -131,10 +131,6 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
-	default
-}
-
 src_configure() {
 	econf \
 		$(use_enable agent) \
diff --git a/net-analyzer/zabbix/zabbix-4.0.36.ebuild b/net-analyzer/zabbix/zabbix-4.0.36.ebuild
index 6313b45e4a61..d3edede455f2 100644
--- a/net-analyzer/zabbix/zabbix-4.0.36.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.36.ebuild
@@ -131,10 +131,6 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
-	default
-}
-
 src_configure() {
 	econf \
 		$(use_enable agent) \
diff --git a/net-analyzer/zabbix/zabbix-5.0.17.ebuild b/net-analyzer/zabbix/zabbix-5.0.17.ebuild
index b4e2c53f9574..7f66cd058cc7 100644
--- a/net-analyzer/zabbix/zabbix-5.0.17.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.17.ebuild
@@ -351,10 +351,6 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
-	default
-}
-
 src_configure() {
 	econf \
 		$(use_enable agent) \
diff --git a/net-analyzer/zabbix/zabbix-5.0.18.ebuild b/net-analyzer/zabbix/zabbix-5.0.18-r1.ebuild
index 0e9da3be9ad9..49f4cf175e49 100644
--- a/net-analyzer/zabbix/zabbix-5.0.18.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.18-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+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
@@ -312,6 +313,10 @@ DEPEND="${COMMON_DEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
 "
 
 # upstream tests fail for agent2
@@ -351,8 +356,11 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
+src_unpack() {
 	default
+	if use agent2; then
+		go-module_src_unpack
+	fi
 }
 
 src_configure() {
diff --git a/net-analyzer/zabbix/zabbix-5.4.6.ebuild b/net-analyzer/zabbix/zabbix-5.4.6.ebuild
index 72d2b869ff39..aea6cc153d8e 100644
--- a/net-analyzer/zabbix/zabbix-5.4.6.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.6.ebuild
@@ -376,10 +376,6 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
-	default
-}
-
 src_configure() {
 	econf \
 		"$(use_enable agent)" \
diff --git a/net-analyzer/zabbix/zabbix-5.4.7-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.7-r1.ebuild
index 6a0d5e421042..325b72f8c392 100644
--- a/net-analyzer/zabbix/zabbix-5.4.7-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.7-r1.ebuild
@@ -376,10 +376,6 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
-	default
-}
-
 src_configure() {
 	econf \
 		"$(use_enable agent)" \
diff --git a/net-analyzer/zabbix/zabbix-5.4.8.ebuild b/net-analyzer/zabbix/zabbix-5.4.8-r1.ebuild
index 6a0d5e421042..a30e0af267b1 100644
--- a/net-analyzer/zabbix/zabbix-5.4.8.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.8-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+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
@@ -337,6 +338,10 @@ DEPEND="${COMMON_DEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
 "
 
 # upstream tests fail for agent2
@@ -376,8 +381,11 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
+src_unpack() {
 	default
+	if use agent2; then
+		go-module_src_unpack
+	fi
 }
 
 src_configure() {