commit: d7755d6bb89e55f139dd3122eabf1852ea957293 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Wed Apr 6 08:37:55 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Apr 6 08:38:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7755d6b
net-analyzer/zabbix: fixed collission of ssl implementations dropped ssl use flag to simplify the implementation of selection of ssl library to use. now at most one of the ssl implementations can be used, so it's implemented the same way as upstream does it. also fixes related bug. Closes: https://bugs.gentoo.org/827128 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild | 12 +++++------- net-analyzer/zabbix/zabbix-5.0.20-r2.ebuild | 10 ++++------ net-analyzer/zabbix/zabbix-5.4.10-r2.ebuild | 10 ++++------ net-analyzer/zabbix/zabbix-6.0.2-r1.ebuild | 10 ++++------ 4 files changed, 17 insertions(+), 25 deletions(-) diff --git a/net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild b/net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild index ca071b57775d..235e44ac1c32 100644 --- a/net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild +++ b/net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild @@ -16,15 +16,16 @@ 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 server snmp sqlite ssh ssl static xmpp" +IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static xmpp" REQUIRED_USE="|| ( agent frontend proxy server ) - ssl? ( ^^ ( gnutls mbedtls openssl ) ) + ?? ( 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* @@ -32,9 +33,11 @@ COMMON_DEPEND=" 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? ( sys-libs/zlib ) @@ -45,11 +48,6 @@ COMMON_DEPEND=" snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) - ssl? ( - gnutls? ( net-libs/gnutls:0= ) - mbedtls? ( net-libs/mbedtls:0= ) - openssl? ( dev-libs/openssl:=[-bindist(-)] ) - ) xmpp? ( dev-libs/iksemel ) " diff --git a/net-analyzer/zabbix/zabbix-5.0.20-r2.ebuild b/net-analyzer/zabbix/zabbix-5.0.20-r2.ebuild index 3889c0523dca..246d9c914b38 100644 --- a/net-analyzer/zabbix/zabbix-5.0.20-r2.ebuild +++ b/net-analyzer/zabbix/zabbix-5.0.20-r2.ebuild @@ -236,15 +236,16 @@ 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 server snmp sqlite ssh ssl static" +IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static" REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) - ssl? ( ^^ ( gnutls openssl ) ) 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* @@ -255,6 +256,7 @@ COMMON_DEPEND=" 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? ( sys-libs/zlib ) @@ -265,10 +267,6 @@ COMMON_DEPEND=" snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) - ssl? ( - gnutls? ( net-libs/gnutls:0= ) - openssl? ( dev-libs/openssl:=[-bindist(-)] ) - ) " RDEPEND="${COMMON_DEPEND} diff --git a/net-analyzer/zabbix/zabbix-5.4.10-r2.ebuild b/net-analyzer/zabbix/zabbix-5.4.10-r2.ebuild index f3cbcfae8bc4..6ff943aa06b6 100644 --- a/net-analyzer/zabbix/zabbix-5.4.10-r2.ebuild +++ b/net-analyzer/zabbix/zabbix-5.4.10-r2.ebuild @@ -261,15 +261,16 @@ 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 server snmp sqlite ssh ssl static" +IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static" REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) - ssl? ( ^^ ( gnutls openssl ) ) 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* @@ -280,6 +281,7 @@ COMMON_DEPEND=" 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? ( sys-libs/zlib ) @@ -290,10 +292,6 @@ COMMON_DEPEND=" snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) - ssl? ( - gnutls? ( net-libs/gnutls:0= ) - openssl? ( dev-libs/openssl:=[-bindist(-)] ) - ) " RDEPEND="${COMMON_DEPEND} diff --git a/net-analyzer/zabbix/zabbix-6.0.2-r1.ebuild b/net-analyzer/zabbix/zabbix-6.0.2-r1.ebuild index 86873018cb18..cbc8364059c0 100644 --- a/net-analyzer/zabbix/zabbix-6.0.2-r1.ebuild +++ b/net-analyzer/zabbix/zabbix-6.0.2-r1.ebuild @@ -272,15 +272,16 @@ 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 +pcre2 +postgres proxy server snmp sqlite ssh ssl static" +IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static" REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) - ssl? ( ^^ ( gnutls openssl ) ) 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* @@ -291,6 +292,7 @@ COMMON_DEPEND=" 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? ( sys-libs/zlib ) @@ -301,10 +303,6 @@ COMMON_DEPEND=" snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) - ssl? ( - gnutls? ( net-libs/gnutls:0= ) - openssl? ( dev-libs/openssl:=[-bindist(-)] ) - ) " RDEPEND="${COMMON_DEPEND}
