From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2D594158088 for ; Sat, 15 Jan 2022 21:51:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69E6F2BC032; Sat, 15 Jan 2022 21:51:23 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46A242BC032 for ; Sat, 15 Jan 2022 21:51:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE859340D8E for ; Sat, 15 Jan 2022 21:51:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BF5829A for ; Sat, 15 Jan 2022 21:51:19 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642283420.894c2e3a842644670de5375368a59c82a5340cb2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/zabbix/zabbix-4.0.36-r1.ebuild net-analyzer/zabbix/zabbix-4.0.36.ebuild net-analyzer/zabbix/zabbix-4.0.37-r1.ebuild net-analyzer/zabbix/zabbix-4.0.37.ebuild net-analyzer/zabbix/zabbix-5.0.18-r1.ebuild net-analyzer/zabbix/zabbix-5.0.18-r2.ebuild net-analyzer/zabbix/zabbix-5.0.19-r1.ebuild net-analyzer/zabbix/zabbix-5.0.19.ebuild net-analyzer/zabbix/zabbix-5.4.8-r1.ebuild net-analyzer/zabbix/zabbix-5.4.8-r2.ebuild net-analyzer/zabbix/zabbix-5.4.9-r1.ebuild net-analyzer/zabbix/zabbix-5.4.9.ebuild X-VCS-Directories: net-analyzer/zabbix/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 894c2e3a842644670de5375368a59c82a5340cb2 X-VCS-Branch: master Date: Sat, 15 Jan 2022 21:51:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a17c4d28-28af-42d1-9c24-d7a0a68787e8 X-Archives-Hash: e5bd4ef25517c2cdd33d05081454d83e commit: 894c2e3a842644670de5375368a59c82a5340cb2 Author: Marco Genasci gmail com> AuthorDate: Fri Jan 7 12:50:25 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jan 15 21:50:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=894c2e3a net-analyzer/zabbix: changed old oracle-instantclient-basic dependency Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Marco Genasci gmail.com> Signed-off-by: Sam James gentoo.org> .../zabbix/{zabbix-4.0.36.ebuild => zabbix-4.0.36-r1.ebuild} | 8 +------- .../zabbix/{zabbix-4.0.37.ebuild => zabbix-4.0.37-r1.ebuild} | 8 +------- .../zabbix/{zabbix-5.0.18-r1.ebuild => zabbix-5.0.18-r2.ebuild} | 8 +------- .../zabbix/{zabbix-5.0.19.ebuild => zabbix-5.0.19-r1.ebuild} | 8 +------- .../zabbix/{zabbix-5.4.8-r1.ebuild => zabbix-5.4.8-r2.ebuild} | 8 +------- .../zabbix/{zabbix-5.4.9.ebuild => zabbix-5.4.9-r1.ebuild} | 8 +------- 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 similarity index 97% rename from net-analyzer/zabbix/zabbix-4.0.36.ebuild rename to 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 similarity index 97% rename from net-analyzer/zabbix/zabbix-4.0.37.ebuild rename to 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 similarity index 99% rename from net-analyzer/zabbix/zabbix-5.0.18-r1.ebuild rename to 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 similarity index 99% rename from net-analyzer/zabbix/zabbix-5.0.19.ebuild rename to 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 similarity index 99% rename from net-analyzer/zabbix/zabbix-5.4.8-r1.ebuild rename to 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 similarity index 99% rename from net-analyzer/zabbix/zabbix-5.4.9.ebuild rename to 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