Merge updates from master

8 files changed, 41 insertions, 6 deletions

diff --git a/dev-lang/R/R-4.2.3.ebuild b/dev-lang/R/R-4.2.3.ebuild
index 5fa0d6b05b51..3f7cb8f4f773 100644
--- a/dev-lang/R/R-4.2.3.ebuild
+++ b/dev-lang/R/R-4.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~loong ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ~loong ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X"
 
 REQUIRED_USE="
diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r1.ebuild b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
index 025d4099fc68..ceae1d19f3e5 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
@@ -208,6 +208,17 @@ pkg_postinst() {
 
 	readme.gentoo_print_elog
 
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		# 2.14.2 and 2.14.2-r1 included the bad 10-sub-pixel-none.conf
+		if ver_test ${ver} -lt 2.14.2-r2 && ver_test ${ver} -ge 2.14.2 ; then
+			if [[ -e "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf ]] ; then
+				einfo "Deleting 10-sub-pixel-none.conf from bad fontconfig-2.14.2 (bug #900681)"
+				rm "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf || die
+			fi
+		fi
+	done
+
 	if [[ -z ${ROOT} ]] ; then
 		multilib_pkg_postinst() {
 			ebegin "Creating global font cache for ${ABI}"
diff --git a/media-libs/liblscp/liblscp-0.9.9.ebuild b/media-libs/liblscp/liblscp-0.9.9.ebuild
index abf96900d91a..f58f229f36be 100644
--- a/media-libs/liblscp/liblscp-0.9.9.ebuild
+++ b/media-libs/liblscp/liblscp-0.9.9.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
 		https://download.linuxsampler.org/packages/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch b/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch
new file mode 100644
index 000000000000..0a95780c4505
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -952,8 +952,9 @@ dnl Check for %qu format (FreeBSD 4.x)
+ dnl FreeBSD 4.x does not support %llu
+ AC_MSG_CHECKING(for long long format)
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
++#include <stdio.h>
+ #include <sys/types.h>
+-int main()
++int main(void)
+ {
+         uint64_t i;
diff --git a/net-analyzer/zabbix/zabbix-6.4.0.ebuild b/net-analyzer/zabbix/zabbix-6.4.0-r1.ebuild
index 21333f63c79d..0c7469cad01a 100644
--- a/net-analyzer/zabbix/zabbix-6.4.0.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.0-r1.ebuild
@@ -117,7 +117,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
 )
 
 S=${WORKDIR}/${MY_P}
@@ -143,6 +143,10 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	local econf_args=(
 		--with-libpcre2
diff --git a/net-analyzer/zabbix/zabbix-6.4.1.ebuild b/net-analyzer/zabbix/zabbix-6.4.1-r1.ebuild
index f3edadcff0ce..e43f9f4d55ac 100644
--- a/net-analyzer/zabbix/zabbix-6.4.1.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.1-r1.ebuild
@@ -117,7 +117,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
 )
 
 S=${WORKDIR}/${MY_P}
@@ -143,6 +143,10 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	local econf_args=(
 		--with-libpcre2
diff --git a/net-analyzer/zabbix/zabbix-6.4.2.ebuild b/net-analyzer/zabbix/zabbix-6.4.2-r1.ebuild
index f3edadcff0ce..e43f9f4d55ac 100644
--- a/net-analyzer/zabbix/zabbix-6.4.2.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.2-r1.ebuild
@@ -117,7 +117,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
 )
 
 S=${WORKDIR}/${MY_P}
@@ -143,6 +143,10 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	local econf_args=(
 		--with-libpcre2
diff --git a/net-misc/curl/curl-8.0.1.ebuild b/net-misc/curl/curl-8.0.1.ebuild
index 098b942395f6..66122eea62bb 100644
--- a/net-misc/curl/curl-8.0.1.ebuild
+++ b/net-misc/curl/curl-8.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="curl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls"
 IUSE+=" nghttp3"