net-analyzer/zabbix: fixed and improved deps

Closes: https://bugs.gentoo.org/850613
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

6 files changed, 50 insertions, 18 deletions

diff --git a/net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild b/net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild
index 235e44ac1c32..b6f830af64d9 100644
--- a/net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild
@@ -40,7 +40,10 @@ COMMON_DEPEND="
 	openssl? ( dev-libs/openssl:=[-bindist(-)] )
 	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
 	server? (
 		dev-libs/libevent:=
 		sys-libs/zlib
@@ -56,10 +59,12 @@ RDEPEND="${COMMON_DEPEND}
 	acct-user/zabbix
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
+	proxy? (
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
 	server? (
 		app-admin/webapp-config
-		dev-libs/libevent
 		dev-libs/libpcre
 		net-analyzer/fping[suid]
 	)
diff --git a/net-analyzer/zabbix/zabbix-4.0.41.ebuild b/net-analyzer/zabbix/zabbix-4.0.41.ebuild
index 8d22622da3be..1e0af68937f8 100644
--- a/net-analyzer/zabbix/zabbix-4.0.41.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.41.ebuild
@@ -40,7 +40,10 @@ COMMON_DEPEND="
 	openssl? ( dev-libs/openssl:=[-bindist(-)] )
 	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
 	server? (
 		dev-libs/libevent:=
 		sys-libs/zlib
@@ -56,10 +59,12 @@ RDEPEND="${COMMON_DEPEND}
 	acct-user/zabbix
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
+	proxy? (
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
 	server? (
 		app-admin/webapp-config
-		dev-libs/libevent
 		dev-libs/libpcre
 		net-analyzer/fping[suid]
 	)
diff --git a/net-analyzer/zabbix/zabbix-5.0.22.ebuild b/net-analyzer/zabbix/zabbix-5.0.22.ebuild
index f3fd1ee264b3..8af8fafcd005 100644
--- a/net-analyzer/zabbix/zabbix-5.0.22.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.22.ebuild
@@ -43,7 +43,10 @@ COMMON_DEPEND="
 	openssl? ( dev-libs/openssl:=[-bindist(-)] )
 	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
 	server? (
 		dev-libs/libevent:=
 		sys-libs/zlib
@@ -58,10 +61,12 @@ RDEPEND="${COMMON_DEPEND}
 	acct-user/zabbix
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
+	proxy? (
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
 	server? (
 		app-admin/webapp-config
-		dev-libs/libevent
 		dev-libs/libpcre
 		net-analyzer/fping[suid]
 	)
diff --git a/net-analyzer/zabbix/zabbix-5.0.24.ebuild b/net-analyzer/zabbix/zabbix-5.0.24.ebuild
index 941ae8016cfc..d3c97bb80618 100644
--- a/net-analyzer/zabbix/zabbix-5.0.24.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.24.ebuild
@@ -48,7 +48,10 @@ COMMON_DEPEND="
 	openssl? ( dev-libs/openssl:=[-bindist(-)] )
 	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
 	server? (
 		dev-libs/libevent:=
 		sys-libs/zlib
@@ -63,10 +66,12 @@ RDEPEND="${COMMON_DEPEND}
 	acct-user/zabbix
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
+	proxy? (
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
 	server? (
 		app-admin/webapp-config
-		dev-libs/libevent
 		dev-libs/libpcre
 		net-analyzer/fping[suid]
 	)
diff --git a/net-analyzer/zabbix/zabbix-6.0.3.ebuild b/net-analyzer/zabbix/zabbix-6.0.3.ebuild
index c739d2e69d10..2c899addb40c 100644
--- a/net-analyzer/zabbix/zabbix-6.0.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.3.ebuild
@@ -43,7 +43,10 @@ COMMON_DEPEND="
 	openssl? ( dev-libs/openssl:=[-bindist(-)] )
 	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
 	server? (
 		dev-libs/libevent:=
 		sys-libs/zlib
@@ -58,10 +61,13 @@ RDEPEND="${COMMON_DEPEND}
 	acct-user/zabbix
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
+	proxy? (
+		!pcre2? ( dev-libs/libpcre )
+		pcre2? ( dev-libs/libpcre2:= )
+		net-analyzer/fping[suid]
+	)
 	server? (
 		app-admin/webapp-config
-		dev-libs/libevent
 		!pcre2? ( dev-libs/libpcre )
 		pcre2? ( dev-libs/libpcre2:= )
 		net-analyzer/fping[suid]
diff --git a/net-analyzer/zabbix/zabbix-6.0.5.ebuild b/net-analyzer/zabbix/zabbix-6.0.5.ebuild
index 2c3763fb8d9c..c3f2fa649574 100644
--- a/net-analyzer/zabbix/zabbix-6.0.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.5.ebuild
@@ -48,7 +48,10 @@ COMMON_DEPEND="
 	openssl? ( dev-libs/openssl:=[-bindist(-)] )
 	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
 	server? (
 		dev-libs/libevent:=
 		sys-libs/zlib
@@ -63,10 +66,13 @@ RDEPEND="${COMMON_DEPEND}
 	acct-user/zabbix
 	java? ( >=virtual/jre-1.8:* )
 	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
+	proxy? (
+		!pcre2? ( dev-libs/libpcre )
+		pcre2? ( dev-libs/libpcre2:= )
+		net-analyzer/fping[suid]
+	)
 	server? (
 		app-admin/webapp-config
-		dev-libs/libevent
 		!pcre2? ( dev-libs/libpcre )
 		pcre2? ( dev-libs/libpcre2:= )
 		net-analyzer/fping[suid]