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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3AD7B158020 for ; Sun, 18 Dec 2022 07:45:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79CF1E0877; Sun, 18 Dec 2022 07:45:55 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5AAEDE0877 for ; Sun, 18 Dec 2022 07:45:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 740A7340815 for ; Sun, 18 Dec 2022 07:45:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD5C5477 for ; Sun, 18 Dec 2022 07:45:52 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1671349550.d02e97dfbdd28bd2ed253c685bb7b4a1e665f1f6.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/zabbix/zabbix-6.0.11.ebuild net-analyzer/zabbix/zabbix-6.0.12.ebuild net-analyzer/zabbix/zabbix-6.2.5.ebuild net-analyzer/zabbix/zabbix-6.2.6.ebuild X-VCS-Directories: net-analyzer/zabbix/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: d02e97dfbdd28bd2ed253c685bb7b4a1e665f1f6 X-VCS-Branch: master Date: Sun, 18 Dec 2022 07:45:52 +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: ade8166f-fc10-4001-8e1a-bd1ccc36872d X-Archives-Hash: f3684c0b985138f52e6711e1a3b34108 commit: d02e97dfbdd28bd2ed253c685bb7b4a1e665f1f6 Author: Miroslav Šulc gentoo org> AuthorDate: Sun Dec 18 07:45:38 2022 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sun Dec 18 07:45:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d02e97df net-analyzer/zabbix: dropped pcre2 use flag from unstable 6.0.x and 6.2.x Closes: https://bugs.gentoo.org/886535 Signed-off-by: Miroslav Šulc gentoo.org> net-analyzer/zabbix/zabbix-6.0.11.ebuild | 22 ++++------------------ net-analyzer/zabbix/zabbix-6.0.12.ebuild | 22 ++++------------------ net-analyzer/zabbix/zabbix-6.2.5.ebuild | 22 ++++------------------ net-analyzer/zabbix/zabbix-6.2.6.ebuild | 22 ++++------------------ 4 files changed, 16 insertions(+), 72 deletions(-) diff --git a/net-analyzer/zabbix/zabbix-6.0.11.ebuild b/net-analyzer/zabbix/zabbix-6.0.11.ebuild index 4b12b01e37ea..961445bff7c3 100644 --- a/net-analyzer/zabbix/zabbix-6.0.11.ebuild +++ b/net-analyzer/zabbix/zabbix-6.0.11.ebuild @@ -25,7 +25,7 @@ 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 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 ) ) @@ -67,14 +67,12 @@ RDEPEND="${COMMON_DEPEND} java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( - !pcre2? ( dev-libs/libpcre ) - pcre2? ( dev-libs/libpcre2:= ) + dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config - !pcre2? ( dev-libs/libpcre ) - pcre2? ( dev-libs/libpcre2:= ) + dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( @@ -147,6 +145,7 @@ pkg_setup() { src_configure() { local econf_args=( + --with-libpcre2 "$(use_enable agent)" "$(use_enable agent2)" "$(use_enable ipv6)" @@ -169,13 +168,6 @@ src_configure() { "$(use_with ssh ssh2)" ) - if use pcre2; then - econf_args+=( --with-libpcre2 ) - else - # If pcre2 is not enabled, then use the old pcre library. - econf_args+=( --with-libpcre ) - fi - econf ${econf_args[@]} } @@ -354,12 +346,6 @@ pkg_postinst() { elog "This will convert database data for use with Node ID" elog "and also adds a local node." elog - - if ! use pcre2; then - ewarn "You are using zabbix with dev-libs/libpcre which is deprecated." - ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible." - ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support" - fi fi if use proxy; then diff --git a/net-analyzer/zabbix/zabbix-6.0.12.ebuild b/net-analyzer/zabbix/zabbix-6.0.12.ebuild index 4b12b01e37ea..961445bff7c3 100644 --- a/net-analyzer/zabbix/zabbix-6.0.12.ebuild +++ b/net-analyzer/zabbix/zabbix-6.0.12.ebuild @@ -25,7 +25,7 @@ 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 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 ) ) @@ -67,14 +67,12 @@ RDEPEND="${COMMON_DEPEND} java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( - !pcre2? ( dev-libs/libpcre ) - pcre2? ( dev-libs/libpcre2:= ) + dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config - !pcre2? ( dev-libs/libpcre ) - pcre2? ( dev-libs/libpcre2:= ) + dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( @@ -147,6 +145,7 @@ pkg_setup() { src_configure() { local econf_args=( + --with-libpcre2 "$(use_enable agent)" "$(use_enable agent2)" "$(use_enable ipv6)" @@ -169,13 +168,6 @@ src_configure() { "$(use_with ssh ssh2)" ) - if use pcre2; then - econf_args+=( --with-libpcre2 ) - else - # If pcre2 is not enabled, then use the old pcre library. - econf_args+=( --with-libpcre ) - fi - econf ${econf_args[@]} } @@ -354,12 +346,6 @@ pkg_postinst() { elog "This will convert database data for use with Node ID" elog "and also adds a local node." elog - - if ! use pcre2; then - ewarn "You are using zabbix with dev-libs/libpcre which is deprecated." - ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible." - ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support" - fi fi if use proxy; then diff --git a/net-analyzer/zabbix/zabbix-6.2.5.ebuild b/net-analyzer/zabbix/zabbix-6.2.5.ebuild index 4b12b01e37ea..961445bff7c3 100644 --- a/net-analyzer/zabbix/zabbix-6.2.5.ebuild +++ b/net-analyzer/zabbix/zabbix-6.2.5.ebuild @@ -25,7 +25,7 @@ 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 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 ) ) @@ -67,14 +67,12 @@ RDEPEND="${COMMON_DEPEND} java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( - !pcre2? ( dev-libs/libpcre ) - pcre2? ( dev-libs/libpcre2:= ) + dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config - !pcre2? ( dev-libs/libpcre ) - pcre2? ( dev-libs/libpcre2:= ) + dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( @@ -147,6 +145,7 @@ pkg_setup() { src_configure() { local econf_args=( + --with-libpcre2 "$(use_enable agent)" "$(use_enable agent2)" "$(use_enable ipv6)" @@ -169,13 +168,6 @@ src_configure() { "$(use_with ssh ssh2)" ) - if use pcre2; then - econf_args+=( --with-libpcre2 ) - else - # If pcre2 is not enabled, then use the old pcre library. - econf_args+=( --with-libpcre ) - fi - econf ${econf_args[@]} } @@ -354,12 +346,6 @@ pkg_postinst() { elog "This will convert database data for use with Node ID" elog "and also adds a local node." elog - - if ! use pcre2; then - ewarn "You are using zabbix with dev-libs/libpcre which is deprecated." - ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible." - ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support" - fi fi if use proxy; then diff --git a/net-analyzer/zabbix/zabbix-6.2.6.ebuild b/net-analyzer/zabbix/zabbix-6.2.6.ebuild index 4b12b01e37ea..961445bff7c3 100644 --- a/net-analyzer/zabbix/zabbix-6.2.6.ebuild +++ b/net-analyzer/zabbix/zabbix-6.2.6.ebuild @@ -25,7 +25,7 @@ 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 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 ) ) @@ -67,14 +67,12 @@ RDEPEND="${COMMON_DEPEND} java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( - !pcre2? ( dev-libs/libpcre ) - pcre2? ( dev-libs/libpcre2:= ) + dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config - !pcre2? ( dev-libs/libpcre ) - pcre2? ( dev-libs/libpcre2:= ) + dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( @@ -147,6 +145,7 @@ pkg_setup() { src_configure() { local econf_args=( + --with-libpcre2 "$(use_enable agent)" "$(use_enable agent2)" "$(use_enable ipv6)" @@ -169,13 +168,6 @@ src_configure() { "$(use_with ssh ssh2)" ) - if use pcre2; then - econf_args+=( --with-libpcre2 ) - else - # If pcre2 is not enabled, then use the old pcre library. - econf_args+=( --with-libpcre ) - fi - econf ${econf_args[@]} } @@ -354,12 +346,6 @@ pkg_postinst() { elog "This will convert database data for use with Node ID" elog "and also adds a local node." elog - - if ! use pcre2; then - ewarn "You are using zabbix with dev-libs/libpcre which is deprecated." - ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible." - ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support" - fi fi if use proxy; then