net-analyzer/zabbix: changed old oracle-instantclient-basic dependency

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Marco Genasci <fedeliallalinea@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>

6 files changed, 6 insertions, 42 deletions

diff --git a/net-analyzer/zabbix/zabbix-4.0.36.ebuild b/net-analyzer/zabbix/zabbix-4.0.36-r1.ebuild
index ea768e73c470..2e40b615546d 100644
--- a/net-analyzer/zabbix/zabbix-4.0.36.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.36-r1.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
 	server? (
@@ -116,12 +116,6 @@ pkg_setup() {
 			eerror
 			die "Environment variable ORACLE_HOME is not set"
 		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
 	fi
 
 	if use frontend; then
diff --git a/net-analyzer/zabbix/zabbix-4.0.37.ebuild b/net-analyzer/zabbix/zabbix-4.0.37-r1.ebuild
index 19a490bb3472..81ee2d775f2b 100644
--- a/net-analyzer/zabbix/zabbix-4.0.37.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.37-r1.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
 	server? (
@@ -116,12 +116,6 @@ pkg_setup() {
 			eerror
 			die "Environment variable ORACLE_HOME is not set"
 		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
 	fi
 
 	if use frontend; then
diff --git a/net-analyzer/zabbix/zabbix-5.0.18-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.18-r2.ebuild
index 2f8473c0658e..4342e5657f57 100644
--- a/net-analyzer/zabbix/zabbix-5.0.18-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.18-r2.ebuild
@@ -255,7 +255,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
 	server? (
@@ -341,12 +341,6 @@ pkg_setup() {
 			eerror
 			die "Environment variable ORACLE_HOME is not set"
 		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
 	fi
 
 	if use frontend; then
diff --git a/net-analyzer/zabbix/zabbix-5.0.19.ebuild b/net-analyzer/zabbix/zabbix-5.0.19-r1.ebuild
index 4a1e590d70a1..c943193d86ca 100644
--- a/net-analyzer/zabbix/zabbix-5.0.19.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.19-r1.ebuild
@@ -255,7 +255,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
 	server? (
@@ -341,12 +341,6 @@ pkg_setup() {
 			eerror
 			die "Environment variable ORACLE_HOME is not set"
 		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
 	fi
 
 	if use frontend; then
diff --git a/net-analyzer/zabbix/zabbix-5.4.8-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.8-r2.ebuild
index 4ce856f85891..d9e19c691037 100644
--- a/net-analyzer/zabbix/zabbix-5.4.8-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.8-r2.ebuild
@@ -280,7 +280,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
 	server? (
@@ -366,12 +366,6 @@ pkg_setup() {
 			eerror
 			die "Environment variable ORACLE_HOME is not set"
 		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
 	fi
 
 	if use frontend; then
diff --git a/net-analyzer/zabbix/zabbix-5.4.9.ebuild b/net-analyzer/zabbix/zabbix-5.4.9-r1.ebuild
index 6087a9ee9dab..b39cdf2cd65c 100644
--- a/net-analyzer/zabbix/zabbix-5.4.9.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.9-r1.ebuild
@@ -280,7 +280,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
 	server? (
@@ -366,12 +366,6 @@ pkg_setup() {
 			eerror
 			die "Environment variable ORACLE_HOME is not set"
 		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
 	fi
 
 	if use frontend; then