gentoo auto-resync : 18:12:2022 - 09:41:22

5 files changed, 20 insertions, 76 deletions

diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 26421f1687e0..550b5332072b 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -37,9 +37,9 @@ EBUILD zabbix-4.0.44.ebuild 9425 BLAKE2B 99915e322601540a008f2672090b0b9aaa56514
 EBUILD zabbix-5.0.29.ebuild 10142 BLAKE2B a71d8c7d65a4fdf930662b476416c416f519aaedd1489ede7da5b442d5aa2788625385bc8f0af28202f1261d10ebaa0b6dab3d449a7391df036b09a8646791cd SHA512 8053a8a2445a8aee9f029fb5ef61478b4e6beb4dbd0181c3054f34a59d8c6ef7f07c094588ede931371e02faf672c8d89f6e2f2baa1e5fee0e9866f34ed426a4
 EBUILD zabbix-5.0.30.ebuild 10144 BLAKE2B 8654a84618f3e5ab22ca790bebc7db5badb60c0bea942027b74e50422be47f39380a873a2e01deadd58b9aa978b30392811fb6de88291416f15073d291163d85 SHA512 0a67f7c92f94eddd9be23aef921ad3306b2093f77a26a9cc9234cc0ce764e24ea292f221ba0f751148eea557974dd0f9a35c87ef748040d84dd2b4dc66740d14
 EBUILD zabbix-6.0.10.ebuild 10737 BLAKE2B e249cd00548e05fa986df84d4d53c5277195b60a6aa433c8f6cc0d6824e950efc00b644b7f6b7af638431d57f26149b0848139fdaaa295d282497b8aa56cdfe0 SHA512 a94a896619edb99e9ab841c63516a4a6fd673ea21a1b6276d65a9dff5e55f93825b88396defdb164c59f550e3537c18e5a59698aa98e6c50919dc9f1bc3f75fc
-EBUILD zabbix-6.0.11.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
-EBUILD zabbix-6.0.12.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
+EBUILD zabbix-6.0.11.ebuild 10209 BLAKE2B d90d115f137fd778b5051728e6cb5def545b506c7887e634be9f7d503043d53cd24f5b99c0e4905f2ed17fb2a62739a8c79d3cdd8a754396d9fef0e28e88b4f6 SHA512 05e026492443e19c068fb786cc6976afb192b2104035f1c9a38d7c72251541f596b03973aaad16c85e11bfb31dcbd2acdb4e920413c1a1b633f2382edffb5a2d
+EBUILD zabbix-6.0.12.ebuild 10209 BLAKE2B d90d115f137fd778b5051728e6cb5def545b506c7887e634be9f7d503043d53cd24f5b99c0e4905f2ed17fb2a62739a8c79d3cdd8a754396d9fef0e28e88b4f6 SHA512 05e026492443e19c068fb786cc6976afb192b2104035f1c9a38d7c72251541f596b03973aaad16c85e11bfb31dcbd2acdb4e920413c1a1b633f2382edffb5a2d
 EBUILD zabbix-6.2.4.ebuild 10737 BLAKE2B e249cd00548e05fa986df84d4d53c5277195b60a6aa433c8f6cc0d6824e950efc00b644b7f6b7af638431d57f26149b0848139fdaaa295d282497b8aa56cdfe0 SHA512 a94a896619edb99e9ab841c63516a4a6fd673ea21a1b6276d65a9dff5e55f93825b88396defdb164c59f550e3537c18e5a59698aa98e6c50919dc9f1bc3f75fc
-EBUILD zabbix-6.2.5.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
-EBUILD zabbix-6.2.6.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
+EBUILD zabbix-6.2.5.ebuild 10209 BLAKE2B d90d115f137fd778b5051728e6cb5def545b506c7887e634be9f7d503043d53cd24f5b99c0e4905f2ed17fb2a62739a8c79d3cdd8a754396d9fef0e28e88b4f6 SHA512 05e026492443e19c068fb786cc6976afb192b2104035f1c9a38d7c72251541f596b03973aaad16c85e11bfb31dcbd2acdb4e920413c1a1b633f2382edffb5a2d
+EBUILD zabbix-6.2.6.ebuild 10209 BLAKE2B d90d115f137fd778b5051728e6cb5def545b506c7887e634be9f7d503043d53cd24f5b99c0e4905f2ed17fb2a62739a8c79d3cdd8a754396d9fef0e28e88b4f6 SHA512 05e026492443e19c068fb786cc6976afb192b2104035f1c9a38d7c72251541f596b03973aaad16c85e11bfb31dcbd2acdb4e920413c1a1b633f2382edffb5a2d
 MISC metadata.xml 1757 BLAKE2B 4c44773ec6767f5d7edf927347cfae3f45ba1afb0ac1399c5fd31a9ce8c493647b16d22b891d803a820cac76ab2b3a3966ac33704e6e1d728cb23c18f30e02d4 SHA512 e953034478edb317a3657e44725e5e18d0033d70f53a10a3e8d317f0cc2a014a3c5485135999435cf222fa63748d093888054d6556b8ca78b00e39a699d98968
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