Merge updates from master

author: Repository mirror & CI <repomirrorci@gentoo.org> 2022-12-03 06:16:46 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2022-12-03 06:16:46 +0000
commit: ba017a1ac2119a00d7edc2553c945fdca8b18ec6 (patch)
tree: a97150ea16463b90f2f5a58a2b9669eb933b9fce
parent: Merge updates from master (diff)
parent: sys-kernel/dracut: Stabilize 057-r2 hppa, #884089 (diff)
download: gentoo-ba017a1ac2119a00d7edc2553c945fdca8b18ec6.tar.gz
gentoo-ba017a1ac2119a00d7edc2553c945fdca8b18ec6.tar.bz2
gentoo-ba017a1ac2119a00d7edc2553c945fdca8b18ec6.zip
107 files changed, 1116 insertions, 116 deletions
diff --git a/app-i18n/uim/files/uim-clang-16-configure.patch b/app-i18n/uim/files/uim-clang-16-configure.patch
index 46e3bac01534..9a1a4726eb18 100644
--- a/app-i18n/uim/files/uim-clang-16-configure.patch
+++ b/app-i18n/uim/files/uim-clang-16-configure.patch
@@ -1,3 +1,4 @@
+Part of this went upstream as https://github.com/uim/uim/commit/99fd890fa601b81ff99e5e0f1977fe309f56b90e.
 --- a/configure.ac
 +++ b/configure.ac
 @@ -601,6 +601,7 @@ if test "x$ac_cv_func_snprintf" = xyes; then
diff --git a/app-misc/pwsafe/files/pwsafe-0.2.0-modern-autoconf-automake.patch b/app-misc/pwsafe/files/pwsafe-0.2.0-modern-autoconf-automake.patch
new file mode 100644
index 000000000000..a10940fd5716
--- /dev/null
+++ b/app-misc/pwsafe/files/pwsafe-0.2.0-modern-autoconf-automake.patch
@@ -0,0 +1,61 @@
+https://github.com/nsd20463/pwsafe/commit/7a960f21eed6e3e8b74bf32628c38a5d8c963587
+https://github.com/nsd20463/pwsafe/commit/0bc444c8caadcbd93143e5dba77db3abfd3e51d2
+
+From 7a960f21eed6e3e8b74bf32628c38a5d8c963587 Mon Sep 17 00:00:00 2001
+From: "Nicolas S. Dade" <nic.dade@gmail.com>
+Date: Sat, 13 Jun 2015 16:49:20 -0700
+Subject: [PATCH] update ac input files to fix warnings from modern (version
+ 1.14.1) aclocal
+
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -6,7 +6,7 @@ dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared --
+ dnl usually in <utime.h>.
+ dnl Some systems have utime.h but don't declare the struct anywhere.
+ 
+-AC_DEFUN(jm_CHECK_TYPE_STRUCT_UTIMBUF,
++AC_DEFUN([jm_CHECK_TYPE_STRUCT_UTIMBUF],
+ [
+   AC_CHECK_HEADERS(utime.h)
+   AC_REQUIRE([AC_HEADER_TIME])
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,7 +146,7 @@ AC_CHECK_TYPE(socklen_t,[AC_DEFINE(HAVE_SOCKLEN_T, 1, [Define to 1 if the type s
+ 
+ 
+ dnl Checks for library functions.
+-AM_SYS_POSIX_TERMIOS
++AC_SYS_POSIX_TERMIOS
+ if test "$am_cv_sys_posix_termios" != yes -a "$ac_cv_sys_posix_termios" != yes; then
+   AC_MSG_ERROR("POSIX termios operations are required")
+ fi
+
+From 0bc444c8caadcbd93143e5dba77db3abfd3e51d2 Mon Sep 17 00:00:00 2001
+From: "Nicolas S. Dade" <nic.dade@gmail.com>
+Date: Sat, 13 Jun 2015 17:02:04 -0700
+Subject: [PATCH] Update configure.ac and INSTALL for a modern (1.14.1)
+ automake
+
+It seems fine to let automake symlink to its default versions
+of files it wants (like 'compile' and 'test-driver'), so for
+now I do that.
+
+Maybe instead I should regenerate everything. After all most
+of the autoXxx bits date from 2004.
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,10 +3,10 @@ dnl confgure.ac for pwsafe
+ dnl $Id$
+ 
+ AC_PREREQ(2.5)
+-AC_INIT(pwsafe.cpp)
+ 
+-dnl Every other copy of the package version number gets its value from here
+-AM_INIT_AUTOMAKE(pwsafe, 0.2.0)
++dnl Every other copy of the package version number gets its value from the following line
++AC_INIT([pwsafe.cpp], [0.2.0])
++AM_INIT_AUTOMAKE
+ 
+ dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
+ AM_CONFIG_HEADER(config.h)
+
diff --git a/app-misc/pwsafe/pwsafe-0.2.0-r5.ebuild b/app-misc/pwsafe/pwsafe-0.2.0-r6.ebuild
index ae32ba74d73e..04977864b35b 100644
--- a/app-misc/pwsafe/pwsafe-0.2.0-r5.ebuild
+++ b/app-misc/pwsafe/pwsafe-0.2.0-r6.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="A Password Safe compatible command-line password manager"
 HOMEPAGE="https://github.com/nsd20463/pwsafe"
@@ -10,12 +12,12 @@ SRC_URI="https://web.archive.org/web/20171006105548if_/http://nsd.dyndns.org/pws
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-
 IUSE="X readline"
 
-DEPEND="sys-libs/ncurses:0=
-	dev-libs/openssl:0=
-	readline? ( sys-libs/readline:0= )
+DEPEND="
+	dev-libs/openssl:=
+	sys-libs/ncurses:=
+	readline? ( sys-libs/readline:= )
 	X? (
 		x11-libs/libSM
 		x11-libs/libICE
@@ -31,7 +33,10 @@ src_prepare() {
 	eapply -p0 "${FILESDIR}/${P}-fake-readline.patch"
 	eapply -p0 "${FILESDIR}/${P}-man-page-option-syntax.patch"
 	eapply -p0 "${FILESDIR}/${P}-XChangeProperty.patch"
+	eapply "${FILESDIR}/${P}-modern-autoconf-automake.patch"
 	eapply_user
+	# Clang 16
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-misc/wayland-utils/wayland-utils-1.1.0.ebuild b/app-misc/wayland-utils/wayland-utils-1.1.0.ebuild
index 0a35f5005c18..237677d9ee6e 100644
--- a/app-misc/wayland-utils/wayland-utils-1.1.0.ebuild
+++ b/app-misc/wayland-utils/wayland-utils-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/archive/${PV}/${P}.tar.b
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/wayland-1.20.0
diff --git a/app-mobilephone/scmxx/scmxx-0.9.0.ebuild b/app-mobilephone/scmxx/scmxx-0.9.0-r1.ebuild
index 2df2b2dcf4ea..ee5459b3efd1 100644
--- a/app-mobilephone/scmxx/scmxx-0.9.0.ebuild
+++ b/app-mobilephone/scmxx/scmxx-0.9.0-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="Exchange data with Siemens phones"
 HOMEPAGE="http://www.hendrik-sattler.de/scmxx/"
@@ -13,8 +15,15 @@ KEYWORDS="~amd64 x86"
 IUSE="bluetooth nls"
 
 RDEPEND="bluetooth? ( net-wireless/bluez )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	# Clang 16
+	eautoreconf
+}
 
 src_install() {
 	default
diff --git a/app-office/dia/dia-0.97.3-r1.ebuild b/app-office/dia/dia-0.97.3-r1.ebuild
index 7b6401a9959c..1a963358eaaf 100644
--- a/app-office/dia/dia-0.97.3-r1.ebuild
+++ b/app-office/dia/dia-0.97.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,6 +46,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761
 	"${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1
 	"${FILESDIR}"/${PN}-0.97.3-slibtool.patch
+	"${FILESDIR}"/${PN}-0.97.3-configure-clang16.patch
 )
 
 src_prepare() {
diff --git a/app-office/dia/files/dia-0.97.3-configure-clang16.patch b/app-office/dia/files/dia-0.97.3-configure-clang16.patch
new file mode 100644
index 000000000000..75b6f003ca3f
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.3-configure-clang16.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/874729
+https://src.fedoraproject.org/rpms/dia/blob/0a14169fc36b959598074065678e0126830317f8/f/dia-configure-c99.patch
+
+C99 removes support for implicit ints, so declare the return type
+of main explicitly.  Future compilers are likely to require explicit
+type declarations.
+
+Upstream has switched to Meson, and it does not seem to use this
+particular check anymore.
+
+--- a/configure.in
++++ b/configure.in
+@@ -197,7 +197,7 @@ if test "$png_ok" = yes; then
+                   png_structp pp;
+ 		  png_infop info; 
+ 		  png_colorp cmap; 
+-		  main() { void*foo = png_create_read_struct; }],
++		  int main(void) { void*foo = png_create_read_struct; }],
+                  png_ok=yes,
+                  png_ok=no)
+   LDFLAGS="${old_LDFLAGS}"
+
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 51396b4f1a13..f1ba268e1bd6 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,2 +1,3 @@
+DIST Firebird-3.0.10.33601-0.tar.bz2 13270269 BLAKE2B 1c30b002525287b239a6e24e59f146fdb61e1a9880cf66f2c59605b9f2a28c42603e21b2c5275e03a319af24c18f8fa5a7fa73f34c9a0d6c19e36e69864ad122 SHA512 0297a191ea1d0eda9557519d8ce6b7686cc3698a98b9c6c00547c2d36bf098083ae9d34b61614a7232b6195344bea1d66d2cbd3b092844b11f5b139162f8f886
 DIST Firebird-3.0.4.33054-0.tar.bz2 9778106 BLAKE2B 4b9116cbc351e0c2e10d15e6ea8e9754a383da77d8e016337604143eb2677ff2519da34b1a5c2e9b7b071fa9774eddbb535e9f926058ee626573b0411f6c042d SHA512 a346ebd53aeccf0b33eac5d35c3c3356624c1fbd0ad897173b3f68d940143062b28460a2822df807e8e8a1ea8792ebf98ed33e5b3ae273d86e6e36295a7fc8ad
 DIST ib_b60_doc.zip 10530848 BLAKE2B b4008b3e8b0416014d024cbbc9ac2e648ad671c71b91b7aeb0eedf0f8479aef80e22aff7105c5e7417e88bcf57f2cdacbc2d5f51a2ef7fb870f9d361c5f0ed6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a
diff --git a/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch
new file mode 100644
index 000000000000..29cca62fc790
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch
@@ -0,0 +1,21 @@
+https://github.com/FirebirdSQL/firebird/commit/3fe8f6510de79689a26868e244840b24dcb19567
+
+From 3fe8f6510de79689a26868e244840b24dcb19567 Mon Sep 17 00:00:00 2001
+From: AlexPeshkoff <alexander.peshkoff@gmail.com>
+Date: Wed, 23 Nov 2022 20:30:03 +0300
+Subject: [PATCH] Fixed #7394: autoconf 2.72 support
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -696,8 +696,9 @@ if test "$STD_EDITLINE" = "true"; then
+       AC_CHECK_LIB(readline, readline, [READLINE=readline EDITLINE_FLG=Y],
+         [STD_EDITLINE=false
+          if test "$EDITLINE_FLG" = "Y"; then
+-           AC_MSG_WARN([[[--with-system-editline specified, not found. Using bundled editline]]])])))
++           AC_MSG_WARN([[[--with-system-editline specified, not found. Using bundled editline]]])
+ 		 fi
++           ])))
+ fi
+ XE_RESTORE_ENV()
+ 
+
diff --git a/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch
new file mode 100644
index 000000000000..06d6907369ca
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch
@@ -0,0 +1,48 @@
+https://github.com/FirebirdSQL/firebird/pull/7407
+
+From a39cde31c4c78866c8f8ee0285fc4bcb81496d81 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Thu, 1 Dec 2022 18:26:06 +0100
+Subject: [PATCH] configure.ac: Add missing int return types to main
+
+Implicit ints are a language feature that was removed in C99 and
+future compilers may require declaration of all return types.
+--- a/configure.ac
++++ b/configure.ac
+@@ -1118,7 +1118,7 @@ AC_CHECK_FUNCS(sem_init)
+ if test "$ac_cv_func_sem_init" = "yes"; then
+ AC_MSG_CHECKING(for working sem_init())
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <semaphore.h>
+-	main () {
++	int main () {
+ 		sem_t s;
+ 		return sem_init(&s,0,0);
+ 		}
+@@ -1159,7 +1159,7 @@ AC_SYS_LARGEFILE
+ if test "$ac_cv_sys_file_offset_bits" = "no"; then
+   AC_MSG_CHECKING(for native large file support)
+   AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <unistd.h>
+-    main () {
++    int main () {
+     return !(sizeof(off_t) == 8);
+   }]])],[ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
+    AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[])
+@@ -1206,7 +1206,7 @@ dnl EKU: try to determine the alignment of long and double
+ dnl      replaces FB_ALIGNMENT and FB_DOUBLE_ALIGN in src/jrd/common.h
+ AC_MSG_CHECKING(alignment of long)
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <semaphore.h>
+-main () {
++int main () {
+   struct s {
+     char a;
+     union { long long x; sem_t y; } b;
+@@ -1217,7 +1217,7 @@ AC_MSG_RESULT($ac_cv_c_alignment)
+ AC_DEFINE_UNQUOTED(FB_ALIGNMENT, $ac_cv_c_alignment, [Alignment of long])
+ 
+ AC_MSG_CHECKING(alignment of double)
+-AC_RUN_IFELSE([AC_LANG_SOURCE([[main () {
++AC_RUN_IFELSE([AC_LANG_SOURCE([[int main () {
+   struct s {
+     char a;
+     double b;
+
diff --git a/dev-db/firebird/files/firebird-3.0.10.33601.0-unbundle.patch b/dev-db/firebird/files/firebird-3.0.10.33601.0-unbundle.patch
new file mode 100644
index 000000000000..4e5399f198b6
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.10.33601.0-unbundle.patch
@@ -0,0 +1,97 @@
+Partly based on:
+- https://github.com/freebsd/freebsd-ports/blob/main/databases/firebird30-server/files/patch-builds-posix_Makefile.in.plugins_examples
+- https://github.com/freebsd/freebsd-ports/blob/main/databases/firebird30-server/files/patch-extern_btyacc_Makefile
+- https://github.com/freebsd/freebsd-ports/blob/main/databases/firebird30-server/files/patch-extern_cloop_Makefile
+- https://github.com/freebsd/freebsd-ports/blob/main/databases/firebird30-server/files/patch-builds_posix_make.defaults
+--- a/builds/posix/Makefile.in
++++ b/builds/posix/Makefile.in
+@@ -688,8 +688,8 @@ install install-embedded silent_install package packages dist:
+ # various cleaning
+ #
+ .PHONY: clean clean_objects clean_dependancies clean_extern_objects clean_build \
+-		clean_gpre_gen clean_icu clean_dbs clean_examples clean_makefiles \
+-		clean_editline clean_all
++		clean_gpre_gen clean_dbs clean_examples clean_makefiles \
++		clean_all
+ 
+ 
+ clean: clean_objects clean_dependancies clean_extern_objects clean_build \
+@@ -708,8 +708,6 @@ clean_config clean_all: clean clean_makefiles
+ 	$(RM) $(ROOT)/config.status
+ 	$(RM) $(ROOT)/libtool
+ 	$(RM_R) $(ROOT)/autom4te.cache
+-	-$(MAKE) -C $(ROOT)/extern/editline distclean
+-#	-$(MAKE) -C $(ROOT)/extern/icu/source distclean
+ 	-$(MAKE) -C $(ROOT)/extern/btyacc distclean
+ 
+ clean_dbs:
+@@ -724,12 +722,6 @@ clean_dbs:
+ clean_examples:
+ 	$(RM) `find $(GEN_ROOT)/examples/ -type f ! -name 'Make*'`
+ 
+-clean_editline:
+-	-$(MAKE) -C $(ROOT)/extern/editline clean
+-
+-#clean_icu:
+-#	-$(MAKE) -C $(ROOT)/extern/icu/source clean
+-
+ clean_tommath:
+ 	-$(MAKE) -C $(ROOT)/extern/libtommath clean
+ 
+--- a/builds/posix/Makefile.in.plugins_examples
++++ b/builds/posix/Makefile.in.plugins_examples
+@@ -99,7 +99,7 @@ AllObjects += $(CA_Objects)
+ crypt_app: $(CRYPT_APP)
+ 
+ $(CRYPT_APP):	$(CA_Objects)
+-	$(EXE_LINK) $^ -o $@ $(FIREBIRD_LIBRARY_LINK)
++	$(EXE_LINK) $(LDFLAGS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK)
+ 
+ 
+ include $(ROOT)/gen/make.shared.targets
+--- a/builds/posix/make.defaults
++++ b/builds/posix/make.defaults
+@@ -240,7 +240,7 @@ LIBFBINTL_SO = $(FB_BUILD)/intl/$(LIB_PREFIX)fbintl.$(SHRLIB_EXT)
+ 
+ ifeq ($(EDITLINE_FLG),Y)
+   ifeq ($(STD_EDITLINE), true)
+-	LIBEDITLINE := -l$(READLINE)
++	LIBEDITLINE := $(shell ${PKG_CONFIG} libedit --libs)
+   else
+ 	LIBEDITLINE := $(LIB)/libedit.a
+   endif
+--- a/extern/btyacc/Makefile
++++ b/extern/btyacc/Makefile
+@@ -42,7 +42,7 @@ OTHERS	      = README README.BYACC \
+ all:		$(PROGRAM)
+ 
+ $(PROGRAM):     $(OBJS) $(LIBS)
+-		$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
++		$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
+ 
+ clean:;		rm -f $(OBJS)
+ 
+--- a/extern/cloop/Makefile
++++ b/extern/cloop/Makefile
+@@ -6,7 +6,7 @@ TARGET	:= release
+ 
+ CC	:= $(CC)
+ CXX	:= $(CXX)
+-LD	:= $(CXX)
++LD	:= $(CXX) $(LDFLAGS)
+ 
+ SRC_DIR		:= src
+ BUILD_DIR	:= build
+@@ -27,8 +27,10 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$(wildcard $(sdir)/*.cpp))
+ OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C))
+ OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
+ 
+-C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
+-CXX_FLAGS := $(C_FLAGS)
++
++COMMON_C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
++C_FLAGS := $(COMMON_C_FLAGS) $(CFLAGS) $(CPPFLAGS)
++CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS)
+ FPC_FLAGS := -Mdelphi
+ 
+ ifeq ($(TARGET),release)
diff --git a/dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild b/dev-db/firebird/firebird-3.0.10.33601.0.ebuild
index 3ee04900edfe..bb52d1549c92 100644
--- a/dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild
+++ b/dev-db/firebird/firebird-3.0.10.33601.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_P=${PN/f/F}-$(ver_rs 4 '-')
 inherit autotools flag-o-matic
@@ -9,7 +9,7 @@ inherit autotools flag-o-matic
 DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 features"
 HOMEPAGE="https://www.firebirdsql.org/"
 SRC_URI="
-	https://github.com/FirebirdSQL/firebird/releases/download/R$(ver_rs 1-3 '_' $(ver_cut 1-3))/${MY_P}.tar.bz2
+	https://github.com/FirebirdSQL/firebird/releases/download/v$(ver_cut 1-3)/${MY_P}.tar.bz2
 	doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
 "
 S="${WORKDIR}/${MY_P}"
@@ -19,8 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples +server xinetd"
 
+# FIXME: btyacc?
 BDEPEND="
-	>=dev-util/btyacc-3.0-r2
 	doc? ( app-arch/unzip )
 "
 # FIXME: cloop?
@@ -38,8 +38,9 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.2.32703.0-unbundle.patch
-	"${FILESDIR}"/${PN}-3.0.2.32703.0-cloop-compiler.patch
+	"${FILESDIR}"/${PN}-3.0.10.33601.0-unbundle.patch
+	"${FILESDIR}"/${P}-configure-autoconf2.72.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
 )
 
 pkg_pretend() {
@@ -84,12 +85,17 @@ src_prepare() {
 		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
 
 	find . -name \*.sh -exec chmod +x {} + || die
-	rm -r extern/{btyacc,editline,icu} || die
+	# TODO: unbundle btyacc again
+	# https://github.com/FirebirdSQL/firebird/commit/9aab6ed8cc6872e2ebc6bfa2531e089cb96e8305#diff-a01303d63fcb967bea34359c3c7f79e4356d6549ab22a1a9190e8020c0b33a3d
+	# breaks usage of system copy.
+	rm -r extern/{editline,icu} || die
 
 	eautoreconf
 }
 
 src_configure() {
+	tc-export PKG_CONFIG
+
 	filter-flags -fprefetch-loop-arrays
 	filter-mfpmath sse
 
@@ -121,6 +127,7 @@ src_configure() {
 		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins
 		--with-gnu-ld
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
@@ -224,5 +231,5 @@ src_install() {
 	elog "Starting with version 3, server mode is set in firebird.conf"
 	elog "The default setting is superserver."
 	elog
-	elog "If you're using UDFs, please remember to move them to /usr/$(get_libdir)/firebird/UDF"
+	elog "If you're using UDFs, please remember to move them to ${EPREFIX}/usr/$(get_libdir)/firebird/UDF"
 }
diff --git a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
index aa3811672d98..40cf830dd60a 100644
--- a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/easymock/easymock-2.5.2.ebuild b/dev-java/easymock/easymock-2.5.2.ebuild
index cbc09bfd69ea..30cfb883f7a9 100644
--- a/dev-java/easymock/easymock-2.5.2.ebuild
+++ b/dev-java/easymock/easymock-2.5.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/easymock/easymock/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
index f0ae43bbeb99..df163b2381bb 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild b/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild
index ef879a1a1645..e70076614ec8 100644
--- a/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild
+++ b/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/felix-utils/felix-utils-1.11.8.ebuild b/dev-java/felix-utils/felix-utils-1.11.8.ebuild
index 6dae3adfc641..9c7ef0ca3fcd 100644
--- a/dev-java/felix-utils/felix-utils-1.11.8.ebuild
+++ b/dev-java/felix-utils/felix-utils-1.11.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/felix/org.apache.felix.utils-${PV}-source-release.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-libs/libevdev/libevdev-1.13.0.ebuild b/dev-libs/libevdev/libevdev-1.13.0.ebuild
index a905f916ece4..055511866150 100644
--- a/dev-libs/libevdev/libevdev-1.13.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.13.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libiconv/libiconv-1.17.ebuild b/dev-libs/libiconv/libiconv-1.17.ebuild
index 4ab6ce4c0851..b3e7779d9c1c 100644
--- a/dev-libs/libiconv/libiconv-1.17.ebuild
+++ b/dev-libs/libiconv/libiconv-1.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="prefix static-libs"
 
 DEPEND="!sys-libs/glibc
diff --git a/dev-libs/papi/files/papi-6.0.0.1-configure-clang16.patch b/dev-libs/papi/files/papi-6.0.0.1-configure-clang16.patch
new file mode 100644
index 000000000000..a56213cdb6d5
--- /dev/null
+++ b/dev-libs/papi/files/papi-6.0.0.1-configure-clang16.patch
@@ -0,0 +1,53 @@
+https://bitbucket.org/icl/papi/pull-requests/406
+
+From 3d09c90d892c845473ba92bb1e9ff0ead4f3eb84 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Mon, 28 Nov 2022 08:44:38 +0100
+Subject: [PATCH] configure: Avoid implicit ints and implicit function
+ declarations
+
+Implicit ints and implicit function declarations were removed from
+the C language in 1999.  Relying on them can cause spurious autoconf
+check failures with compilers that do not support them in the default
+language mode.
+--- a/configure.in
++++ b/configure.in
+@@ -577,14 +577,16 @@ fi
+ 
+ AC_MSG_CHECKING(for working gettid)
+ AC_LINK_IFELSE([AC_LANG_SOURCE([#include <sys/types.h>
+-                main() { pid_t a = gettid(); }])],
++                #include <unistd.h>
++                int main() { pid_t a = gettid(); }])],
+                [AC_MSG_RESULT(yes)
+                 AC_DEFINE(HAVE_GETTID, 1, [Full gettid function])],
+                [AC_MSG_RESULT(no)
+                 AC_MSG_CHECKING(for working syscall(SYS_gettid))
+                 AC_LINK_IFELSE([AC_LANG_SOURCE([#include <sys/types.h>
+                                 #include <sys/syscall.h>
+-                                main() { pid_t a = syscall(SYS_gettid); }])],
++                                #include <unistd.h>
++                                int main() { pid_t a = syscall(SYS_gettid); }])],
+                                [AC_MSG_RESULT(yes)
+                                 AC_DEFINE(HAVE_SYSCALL_GETTID, 1, [gettid syscall function])],
+                                [AC_MSG_RESULT(no)]) ])
+@@ -625,7 +627,7 @@ AC_ARG_WITH(walltimer,
+                                      #include <stdio.h>
+                                      #include <time.h>
+                                      #include <syscall.h>
+-                                     main() {
++                                     int main() {
+                                        struct timespec t1, t2;
+                                        double seconds;
+                                        if (syscall(__NR_clock_gettime,CLOCK_REALTIME_HR,&t1) == -1) exit(1);
+@@ -646,7 +648,7 @@ AC_ARG_WITH(walltimer,
+                                                  #include <stdio.h>
+                                                  #include <time.h>
+                                                  #include <syscall.h>
+-                                                 main() {
++                                                 int main() {
+                                                    struct timespec t1, t2;
+                                                    double seconds;
+                                                    if (syscall(__NR_clock_gettime,CLOCK_REALTIME,&t1) == -1) exit(1);
+-- 
+2.38.1
diff --git a/dev-libs/papi/papi-6.0.0.1.ebuild b/dev-libs/papi/papi-6.0.0.1-r1.ebuild
index f63cab71642c..a42b0ca09acf 100644
--- a/dev-libs/papi/papi-6.0.0.1.ebuild
+++ b/dev-libs/papi/papi-6.0.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.0.1-configure-clang16.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.27.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.27.ebuild
index a4add7336933..94fa60001ece 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.27.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.27.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-util/directx-headers/directx-headers-1.606.4.ebuild b/dev-util/directx-headers/directx-headers-1.606.4.ebuild
index 4314233e9802..859631ad8fb0 100644
--- a/dev-util/directx-headers/directx-headers-1.606.4.ebuild
+++ b/dev-util/directx-headers/directx-headers-1.606.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/microsoft/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/gui-libs/display-manager-init/display-manager-init-1.1.1.ebuild b/gui-libs/display-manager-init/display-manager-init-1.1.1.ebuild
index e7f303b0d33d..c388b7de1539 100644
--- a/gui-libs/display-manager-init/display-manager-init-1.1.1.ebuild
+++ b/gui-libs/display-manager-init/display-manager-init-1.1.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}"
 
diff --git a/media-libs/freeglut/freeglut-3.4.0.ebuild b/media-libs/freeglut/freeglut-3.4.0.ebuild
index d2553af73d02..14a5266ed9d7 100644
--- a/media-libs/freeglut/freeglut-3.4.0.ebuild
+++ b/media-libs/freeglut/freeglut-3.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 # enabling GLES support seems to cause build failures
 RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
index 641f403c5db5..12645639cc62 100644
--- a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libcuefile/libcuefile-477-r2.ebuild b/media-libs/libcuefile/libcuefile-477-r2.ebuild
index a083d0decc2d..3ce4ca74df21 100644
--- a/media-libs/libcuefile/libcuefile-477-r2.ebuild
+++ b/media-libs/libcuefile/libcuefile-477-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 PATCHES=( "${FILESDIR}"/${PN}-static-libs.patch )
 
diff --git a/media-libs/libglvnd/libglvnd-1.5.0.ebuild b/media-libs/libglvnd/libglvnd-1.5.0.ebuild
index 8032490c73ac..767f74cfa8dc 100644
--- a/media-libs/libglvnd/libglvnd-1.5.0.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.5.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
 	S=${WORKDIR}/${PN}-v${PV}
 fi
diff --git a/media-libs/libkate/libkate-0.4.1-r4.ebuild b/media-libs/libkate/libkate-0.4.1-r4.ebuild
index d69809aca8d3..388800af3874 100644
--- a/media-libs/libkate/libkate-0.4.1-r4.ebuild
+++ b/media-libs/libkate/libkate-0.4.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="debug doc"
 
diff --git a/media-libs/libmatroska/libmatroska-1.7.1.ebuild b/media-libs/libmatroska/libmatroska-1.7.1.ebuild
index a13271e866f4..020123cbafc5 100644
--- a/media-libs/libmatroska/libmatroska-1.7.1.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/7" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
 
 RDEPEND=">=dev-libs/libebml-1.4.3:="
 DEPEND="${RDEPEND}"
diff --git a/media-libs/libprojectm/libprojectm-3.1.12.ebuild b/media-libs/libprojectm/libprojectm-3.1.12.ebuild
index bc76c8758855..ac0666d889a8 100644
--- a/media-libs/libprojectm/libprojectm-3.1.12.ebuild
+++ b/media-libs/libprojectm/libprojectm-3.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	MY_PV="${PV/_/-}"
 	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 	S=${WORKDIR}/projectm-${MY_PV}/
 fi
 
diff --git a/media-libs/libprojectm/libprojectm-9999.ebuild b/media-libs/libprojectm/libprojectm-9999.ebuild
index a273f50c063e..386efc175ac5 100644
--- a/media-libs/libprojectm/libprojectm-9999.ebuild
+++ b/media-libs/libprojectm/libprojectm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	MY_PV="${PV/_/-}"
 	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	S=${WORKDIR}/projectm-${MY_PV}/
 fi
 
diff --git a/media-libs/libreplaygain/libreplaygain-477-r2.ebuild b/media-libs/libreplaygain/libreplaygain-477-r2.ebuild
index c63499b43c26..ea4a29822212 100644
--- a/media-libs/libreplaygain/libreplaygain-477-r2.ebuild
+++ b/media-libs/libreplaygain/libreplaygain-477-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 PATCHES=( "${FILESDIR}"/${PN}-static-libs.patch )
 
diff --git a/media-libs/libshout/libshout-2.4.6.ebuild b/media-libs/libshout/libshout-2.4.6.ebuild
index 9a1e48a6d194..c8aebcadf59e 100644
--- a/media-libs/libshout/libshout-2.4.6.ebuild
+++ b/media-libs/libshout/libshout-2.4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r6.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r6.ebuild
index b56e698d40da..6ed31c6a4874 100644
--- a/media-libs/libsidplay/libsidplay-2.1.1-r6.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="static-libs"
 
 BDEPEND="sys-devel/autoconf-archive"
diff --git a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
index df9ce1ce5d1d..dbe4761bde85 100644
--- a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
+++ b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://libtiger.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-libs/mesa/mesa-22.2.3.ebuild b/media-libs/mesa/mesa-22.2.3.ebuild
index 45a5d7918231..dbced9dbf5a3 100644
--- a/media-libs/mesa/mesa-22.2.3.ebuild
+++ b/media-libs/mesa/mesa-22.2.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/sdl-image/sdl-image-1.2.12_p20220527.ebuild b/media-libs/sdl-image/sdl-image-1.2.12_p20220527.ebuild
index 768e24bbd64b..03519ff7c99c 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12_p20220527.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12_p20220527.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_IMAGE_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-plugins/live/live-2021.08.24.ebuild b/media-plugins/live/live-2021.08.24.ebuild
index d00a4cc4c636..36becf719bff 100644
--- a/media-plugins/live/live-2021.08.24.ebuild
+++ b/media-plugins/live/live-2021.08.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.live555.com/"
 SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="ssl"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/fluidsynth/fluidsynth-2.3.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.3.0.ebuild
index d5a21ab76f24..2fe564bc72d2 100644
--- a/media-sound/fluidsynth/fluidsynth-2.3.0.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss pipewire portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/musepack-tools/musepack-tools-465-r2.ebuild b/media-sound/musepack-tools/musepack-tools-465-r2.ebuild
index 7aab37cd226c..6b5b76e9cdf3 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r2.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 DEPEND="
 	>=media-libs/libcuefile-${PV}
diff --git a/net-im/centerim/centerim-5.0.1-r2.ebuild b/net-im/centerim/centerim-5.0.1-r2.ebuild
new file mode 100644
index 000000000000..422b37bee710
--- /dev/null
+++ b/net-im/centerim/centerim-5.0.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}5-${PV/_}"
+
+DESCRIPTION="Ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal client"
+HOMEPAGE="http://www.centerim.org/"
+SRC_URI="http://www.centerim.org/download/cim5/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls"
+
+DEPEND=">=sys-libs/ncurses-5.2:=
+	>=net-im/pidgin-2.7.0
+	>=dev-libs/glib-2.16.0
+	>=dev-libs/libsigc++-2.2.0:2"
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	CONFIG_SHELL="${BROOT}"/bin/bash econf \
+		$(use_enable debug) \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -f "${ED}"/usr/lib*/libcppconsui.{a,la}
+
+	dodoc AUTHORS HACKING NEWS README TODO
+}
diff --git a/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild b/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild
index ad225d598c00..78aed926297f 100644
--- a/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild
+++ b/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/videolabs/${PN}"
 else
 	SRC_URI="https://github.com/videolabs/${PN}/releases/download/${PV}/${P/lib/}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/${P/lib/}"
 fi
 
diff --git a/net-libs/libmicrodns/libmicrodns-9999.ebuild b/net-libs/libmicrodns/libmicrodns-9999.ebuild
index 0e1d2c1f619f..8c8df3daedfd 100644
--- a/net-libs/libmicrodns/libmicrodns-9999.ebuild
+++ b/net-libs/libmicrodns/libmicrodns-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/videolabs/${PN}"
 else
 	SRC_URI="https://github.com/videolabs/${PN}/releases/download/${PV}/${P/lib/}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${P/lib/}"
 fi
 
diff --git a/net-libs/libvncserver/libvncserver-0.9.13-r1.ebuild b/net-libs/libvncserver/libvncserver-0.9.13-r1.ebuild
index af204e2ea41f..29851d5a4e57 100644
--- a/net-libs/libvncserver/libvncserver-0.9.13-r1.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.13-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326
diff --git a/net-misc/freerdp/freerdp-2.9.0.ebuild b/net-misc/freerdp/freerdp-2.9.0.ebuild
index 4c72f0c98d6b..017e251705a7 100644
--- a/net-misc/freerdp/freerdp-2.9.0.ebuild
+++ b/net-misc/freerdp/freerdp-2.9.0.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild
index 552cf7789bae..aabe0a91863d 100644
--- a/net-misc/freerdp/freerdp-2.9999.ebuild
+++ b/net-misc/freerdp/freerdp-2.9999.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 552cf7789bae..aabe0a91863d 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
diff --git a/net-print/cups-bjnp/cups-bjnp-2.0.3-r1.ebuild b/net-print/cups-bjnp/cups-bjnp-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..55fb1e8a2677
--- /dev/null
+++ b/net-print/cups-bjnp/cups-bjnp-2.0.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="CUPS backend for canon printers using proprietary USB over IP BJNP protocol"
+HOMEPAGE="https://sourceforge.net/projects/cups-bjnp/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.3-configure-clang16.patch
+)
+
+src_prepare() {
+	default
+
+	# Clang 16
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-Werror
+}
diff --git a/net-print/cups-bjnp/files/cups-bjnp-2.0.3-configure-clang16.patch b/net-print/cups-bjnp/files/cups-bjnp-2.0.3-configure-clang16.patch
new file mode 100644
index 000000000000..e1d37445f89d
--- /dev/null
+++ b/net-print/cups-bjnp/files/cups-bjnp-2.0.3-configure-clang16.patch
@@ -0,0 +1,34 @@
+https://sourceforge.net/p/cups-bjnp/patches/5/
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -25,9 +25,9 @@
+ 	#include <sys/socket.h> ], [
+ 	 /* AF_INET6 available check */  
+  	if (socket(AF_INET6, SOCK_STREAM, 0) < 0) 
+-   	  exit(1); 
++   	  return 1; 
+  	else 
+-   	  exit(0); 
++   	  return 0; 
+       ],[
+         AC_MSG_RESULT(yes) 
+         AC_DEFINE([ENABLE_IPV6], 1, [Define to 1 if the system supports IPv6]) 
+@@ -47,7 +47,7 @@
+ 	/* test if the ss_family member exists in struct sockaddr_storage */
+ 	struct sockaddr_storage ss;
+ 	ss.ss_family = AF_INET;
+-	exit (0);
++	return 0;
+     ], [
+ 	AC_MSG_RESULT(yes)
+ 	AC_DEFINE([HAS_SS_FAMILY], 1, [Define to 1 if struct sockaddr_storage has an ss_family member])
+@@ -59,7 +59,7 @@
+ 		/* test if the __ss_family member exists in struct sockaddr_storage */
+ 		struct sockaddr_storage ss;
+ 		ss.__ss_family = AF_INET;
+-		exit (0);
++		return 0;
+ 	  ], [
+ 		AC_MSG_RESULT([no, but __ss_family exists])
+ 		AC_DEFINE([HAS___SS_FAMILY], 1, [Define to 1 if struct sockaddr_storage has __ss_family instead of ss_family])
+
diff --git a/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild b/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild
index cf74c8bf763f..6d38a1954b32 100644
--- a/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild
+++ b/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit out-of-source
 
 DESCRIPTION="Multiple independent streams of pseudo-random numbers"
-HOMEPAGE="http://statmath.wu.ac.at/software/RngStreams/"
-SRC_URI="http://statmath.wu.ac.at/software/RngStreams/${P}.tar.gz"
+HOMEPAGE="https://statmath.wu.ac.at/software/RngStreams/"
+SRC_URI="https://statmath.wu.ac.at/software/RngStreams/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -15,7 +15,8 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 my_src_configure() {
-	econf --enable-shared --disable-static
+	# bash for bug #818532
+	CONFIG_SHELL="${BROOT}"/bin/bash econf --enable-shared --disable-static
 }
 
 my_src_install_all() {
diff --git a/sci-mathematics/unuran/Manifest b/sci-mathematics/unuran/Manifest
index 55e7dd8c0dbd..0451dcefc7dd 100644
--- a/sci-mathematics/unuran/Manifest
+++ b/sci-mathematics/unuran/Manifest
@@ -1 +1,2 @@
 DIST unuran-1.8.1.tar.gz 4409911 BLAKE2B 2b036032deaeae70aa6ef58124fc88e9c167ae7952d04cba4b50181fff4249eff88c20bbb667c5702899bc863745b6991ae842da86f6bc592b6635dc310ec544 SHA512 4d98861914afe39065ec31ee837c0e21e0fb4f4667f559dee38a7a5c4e06f0d09bd550b20d06321d1f5fcd4799d482a9eebc66ac35f8cd7fff834f536d24854c
+DIST unuran-1.9.0.tar.gz 3803126 BLAKE2B 20a88e9004d284983770364f35941f8ea66e1c68ef8c0ea210e1b12d9027947fbf723032f22f88b87c8f649ab52c904b460673cee8d78a52ff5196a6f4212d9c SHA512 8fe389f2fc569265e7bac2a5de3d12e4a6238076bff2a7e19842a57da314dfdca19ff5c398e24732883a19de794a65bab7d0663b4551c664562a3c93f2d87170
diff --git a/sci-mathematics/unuran/files/unuran-1.9.0-configure-clang16.patch b/sci-mathematics/unuran/files/unuran-1.9.0-configure-clang16.patch
new file mode 100644
index 000000000000..66a9d44538bb
--- /dev/null
+++ b/sci-mathematics/unuran/files/unuran-1.9.0-configure-clang16.patch
@@ -0,0 +1,27 @@
+https://src.fedoraproject.org/rpms/unuran/blob/4e6e6392ad892454339458b655fd0324e58de3b7/f/unuran-configure-c99.patch
+https://bugzilla.redhat.com/show_bug.cgi?id=2150308
+
+Avoid calling the undeclared exit function.  Instead return
+from main.  Implicit function declarations were removed from C99,
+and future compilers are likely to reject them.
+
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -14,7 +14,7 @@ int main (void)
+    nan = inf / inf;
+    /* nan = 0.0 / 0.0; */
+    status = (nan == nan);
+-   exit (status);
++   return status;
+ }]])],
+ [ac_cv_c_ieee_comparisons="yes"],
+ [ac_cv_c_ieee_comparisons="no"],
+@@ -43,7 +43,7 @@ int main (void)
+    double x = 0.0;
+    double inf = 1.0 / x;
+    int status = (inf < DBL_MAX/2.);
+-   exit (status);
++   return status;
+ }]])],
+ [ac_cv_c_divide_by_zero="yes"],
+ [ac_cv_c_divide_by_zero="no"],
diff --git a/sci-mathematics/unuran/unuran-1.8.1.ebuild b/sci-mathematics/unuran/unuran-1.8.1.ebuild
index 27d0f064189a..7dfbd8eacfeb 100644
--- a/sci-mathematics/unuran/unuran-1.8.1.ebuild
+++ b/sci-mathematics/unuran/unuran-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit out-of-source
 
 DESCRIPTION="Universal Non-Uniform Random number generator"
-HOMEPAGE="http://statmath.wu.ac.at/unuran/"
-SRC_URI="http://statmath.wu.ac.at/unuran/${P}.tar.gz"
+HOMEPAGE="https://statmath.wu.ac.at/unuran/"
+SRC_URI="https://statmath.wu.ac.at/unuran/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sci-mathematics/unuran/unuran-1.9.0.ebuild b/sci-mathematics/unuran/unuran-1.9.0.ebuild
new file mode 100644
index 000000000000..971d2638952a
--- /dev/null
+++ b/sci-mathematics/unuran/unuran-1.9.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source
+
+DESCRIPTION="Universal Non-Uniform Random number generator"
+HOMEPAGE="https://statmath.wu.ac.at/unuran/"
+SRC_URI="https://statmath.wu.ac.at/unuran/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples gsl prng +rngstreams"
+
+DEPEND="
+	gsl? ( sci-libs/gsl:= )
+	prng? ( sci-mathematics/prng )
+	rngstreams? ( sci-mathematics/rngstreams:= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.0-configure-clang16.patch
+)
+
+src_prepare() {
+	default
+
+	# Clang 16
+	eautoreconf
+}
+
+my_src_configure() {
+	local udefault=builtin
+	use rngstreams && udefault=rngstream
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf \
+		--enable-shared \
+		--disable-static \
+		--with-urng-default="${udefault}" \
+		$(use_with gsl urng-gsl) \
+		$(use_with prng urng-prng) \
+		$(use_with rngstreams urng-rngstream)
+}
+
+my_src_install_all() {
+	use doc && dodoc doc/${PN}.pdf
+	einstalldocs
+
+	if use examples; then
+		rm examples/Makefile* || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/dbus-broker/dbus-broker-32.ebuild b/sys-apps/dbus-broker/dbus-broker-32.ebuild
index b910903b5f10..e38efa7398dd 100644
--- a/sys-apps/dbus-broker/dbus-broker-32.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-32.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
 	SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	KEYWORDS="~amd64 arm64 ppc64 ~riscv"
 fi
 
 DESCRIPTION="Linux D-Bus Message Broker"
diff --git a/sys-devel/gdb/files/gdb-12.1-configure-clang16.patch b/sys-devel/gdb/files/gdb-12.1-configure-clang16.patch
new file mode 100644
index 000000000000..3b2c15de4895
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-12.1-configure-clang16.patch
@@ -0,0 +1,112 @@
+https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0075c53724f78c78aa1692cc8e3bf1433eeb0b9f
+https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=885b6660c17fb91980b5682514ef54668e544b02
+https://bugzilla.redhat.com/show_bug.cgi?id=2143992
+
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Keith Seitz <keiths@redhat.com>
+Date: Tue, 29 Nov 2022 13:43:34 -0800
+Subject: gdb-rhbz2143992-libiberty-fix-c89isms-in-configure.patch
+
+;; libiberty: Fix C89-isms in configure tests
+;; (Florian Weimer, RHBZ 2143992)
+
+    libiberty/
+
+            * acinclude.m4 (ac_cv_func_strncmp_works): Add missing
+            int return type and parameter list to the definition of main.
+            Include <stdlib.h> and <string.h> for prototypes.
+            (ac_cv_c_stack_direction): Add missing
+            int return type and parameter list to the definitions of
+            main, find_stack_direction.  Include <stdlib.h> for exit
+            prototype.
+            * configure: Regenerate.
+
+--- a/libiberty/acinclude.m4
++++ b/libiberty/acinclude.m4
+@@ -24,6 +24,8 @@ AC_CACHE_CHECK([for working strncmp], ac_cv_func_strncmp_works,
+ [AC_TRY_RUN([
+ /* Test by Jim Wilson and Kaveh Ghazi.
+    Check whether strncmp reads past the end of its string parameters. */
++#include <stdlib.h>
++#include <string.h>
+ #include <sys/types.h>
+ 
+ #ifdef HAVE_FCNTL_H
+@@ -51,7 +53,8 @@ AC_CACHE_CHECK([for working strncmp], ac_cv_func_strncmp_works,
+ 
+ #define MAP_LEN 0x10000
+ 
+-main ()
++int
++main (void)
+ {
+ #if defined(HAVE_MMAP) || defined(HAVE_MMAP_ANYWHERE)
+   char *p;
+@@ -157,7 +160,10 @@ if test $ac_cv_os_cray = yes; then
+ fi
+ 
+ AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
+-[AC_TRY_RUN([find_stack_direction ()
++[AC_TRY_RUN([#include <stdlib.h>
++
++int
++find_stack_direction (void)
+ {
+   static char *addr = 0;
+   auto char dummy;
+@@ -169,7 +175,9 @@ AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
+   else
+     return (&dummy > addr) ? 1 : -1;
+ }
+-main ()
++
++int
++main (void)
+ {
+   exit (find_stack_direction() < 0);
+ }],
+--- a/libiberty/configure
++++ b/libiberty/configure
+@@ -6918,7 +6918,10 @@ else
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-find_stack_direction ()
++#include <stdlib.h>
++
++int
++find_stack_direction (void)
+ {
+   static char *addr = 0;
+   auto char dummy;
+@@ -6930,7 +6933,9 @@ find_stack_direction ()
+   else
+     return (&dummy > addr) ? 1 : -1;
+ }
+-main ()
++
++int
++main (void)
+ {
+   exit (find_stack_direction() < 0);
+ }
+@@ -7755,6 +7760,8 @@ else
+ 
+ /* Test by Jim Wilson and Kaveh Ghazi.
+    Check whether strncmp reads past the end of its string parameters. */
++#include <stdlib.h>
++#include <string.h>
+ #include <sys/types.h>
+ 
+ #ifdef HAVE_FCNTL_H
+@@ -7782,7 +7789,8 @@ else
+ 
+ #define MAP_LEN 0x10000
+ 
+-main ()
++int
++main (void)
+ {
+ #if defined(HAVE_MMAP) || defined(HAVE_MMAP_ANYWHERE)
+   char *p;
+
diff --git a/sys-devel/gdb/gdb-12.1-r3.ebuild b/sys-devel/gdb/gdb-12.1-r3.ebuild
new file mode 100644
index 000000000000..d488fd670d9c
--- /dev/null
+++ b/sys-devel/gdb/gdb-12.1-r3.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
+
+export CTARGET=${CTARGET:-${CHOST}}
+
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+case ${PV} in
+	9999*)
+		# live git tree
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		SRC_URI=""
+		;;
+	*.*.50.2???????)
+		# weekly snapshots
+		SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
+		;;
+	*)
+		# Normal upstream release
+		SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+			ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
+		;;
+esac
+
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# In fact, gdb's test suite needs some work to get passing.
+# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
+# As of 11.2, on amd64: "# of unexpected failures    8600"
+# ia64 kernel crashes when gdb testsuite is running
+# in fact, gdb's test suite needs some work to get passing.
+# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
+# As of 11.2, on amd64: "# of unexpected failures    8600"
+RESTRICT="
+	ia64? ( test )
+	!test? ( test )
+	test
+"
+
+RDEPEND="
+	dev-libs/mpfr:0=
+	dev-libs/gmp:=
+	>=sys-libs/ncurses-5.2-r2:0=
+	>=sys-libs/readline-7:0=
+	sys-libs/zlib
+	elibc_glibc? ( net-libs/libnsl:= )
+	lzma? ( app-arch/xz-utils )
+	python? ( ${PYTHON_DEPS} )
+	guile? ( >=dev-scheme/guile-2.0 )
+	xml? ( dev-libs/expat )
+	source-highlight? (
+		dev-util/source-highlight
+	)
+	xxhash? (
+		dev-libs/xxhash
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	app-alternatives/yacc
+	nls? ( sys-devel/gettext )
+	source-highlight? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+	"${FILESDIR}"/${P}-readline-8.2-build.patch
+	"${FILESDIR}"/${P}-core-file-detach.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	strip-linguas -u bfd/po opcodes/po
+
+	# Avoid using ancient termcap from host on Prefix systems
+	sed -i -e 's/termcap tinfow/tinfow/g' \
+		gdb/configure{.ac,} || die
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	local myconf=(
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# gnulib's or gdb's configure.
+		--disable-dependency-tracking
+
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. bug #490566
+		--disable-{binutils,etc,gas,gold,gprof,ld}
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		$(use_enable test unit-tests)
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+
+		# We need to set both configure options, --with-sysroot and --libdir,
+		# to fix cross build issues that happen when configuring gmp.
+		# We explicitly need --libdir. Having only --with-sysroot without
+		# --libdir would not fix the build issues.
+		# For some reason, it is not enough to set only --with-sysroot,
+		# also not enough to pass --with-gmp-xxx options.
+		--with-sysroot="${ESYSROOT}"
+		--libdir="${ESYSROOT}/usr/$(get_libdir)"
+	)
+
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	# gdbserver only works for native targets (CHOST==CTARGET).
+	# it also doesn't support all targets, so rather than duplicate
+	# the target list (which changes between versions), use the
+	# "auto" value when things are turned on, which is triggered
+	# whenever no --enable or --disable is given
+	if is_cross || use !server ; then
+		myconf+=( --disable-gdbserver )
+	fi
+
+	myconf+=(
+		--enable-64-bit-bfd
+		--disable-install-libbfd
+		--disable-install-libiberty
+		--enable-obsolete
+		# This only disables building in the readline subdir.
+		# For gdb itself, it'll use the system version.
+		--disable-readline
+		--with-system-readline
+		# This only disables building in the zlib subdir.
+		# For gdb itself, it'll use the system version.
+		--without-zlib
+		--with-system-zlib
+		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+		$(use_with xml expat)
+		$(use_with lzma)
+		$(use_enable nls)
+		$(use_enable source-highlight)
+		$(use multitarget && echo --enable-targets=all)
+		$(use_with python python "${EPYTHON}")
+		$(use_with xxhash)
+		$(use_with guile)
+	)
+
+	if use sparc-solaris || use x86-solaris ; then
+		# Disable largefile support
+		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
+		myconf+=( --disable-largefile )
+	fi
+
+	# source-highlight is detected with pkg-config: bug #716558
+	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+	# ensure proper compiler is detected for Clang builds: bug #831202
+	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	find "${ED}"/usr -name libiberty.a -delete || die
+
+	# Delete translations that conflict with binutils-libs. bug #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
+
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+		gdb/NEWS gdb/PROBLEMS
+	docinto sim
+	dodoc sim/{MAINTAINERS,README-HACKING}
+
+	if use server ; then
+		docinto gdbserver
+		dodoc gdbserver/README
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
+
+	if use python ; then
+		python_optimize "${ED}"/usr/share/gdb/python/gdb
+	fi
+}
+
+pkg_postinst() {
+	# Portage doesn't unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-kernel/dracut/dracut-057-r2.ebuild b/sys-kernel/dracut/dracut-057-r2.ebuild
index 678424b982dd..d32613b55bfa 100644
--- a/sys-kernel/dracut/dracut-057-r2.ebuild
+++ b/sys-kernel/dracut/dracut-057-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
 else
 	if [[ "${PV}" != *_rc* ]]; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc ~x86"
 	fi
 	SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 fi
diff --git a/sys-libs/obstack-standalone/obstack-standalone-1.2.3.ebuild b/sys-libs/obstack-standalone/obstack-standalone-1.2.3.ebuild
index 2e6273ec8142..f61d3b927b3a 100644
--- a/sys-libs/obstack-standalone/obstack-standalone-1.2.3.ebuild
+++ b/sys-libs/obstack-standalone/obstack-standalone-1.2.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/musl-obstack-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
 IUSE="static-libs"
 
 DEPEND="!sys-libs/glibc"
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.1.ebuild
index e0561d1c92fe..84f8b1fc1c6f 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1.1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X.Org bdftopcf application"
 SRC_URI="https://xorg.freedesktop.org/archive/individual/util/${P}.tar.xz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="x11-base/xorg-proto"
 RDEPEND=""
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.6.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.6.ebuild
index 70ec0a4df17a..59c6141082b3 100644
--- a/x11-apps/fslsfonts/fslsfonts-1.0.6.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="list fonts served by X font server"
 
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="x11-libs/libFS"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/fstobdf/fstobdf-1.0.7.ebuild b/x11-apps/fstobdf/fstobdf-1.0.7.ebuild
index 9473822da683..4817496a1f40 100644
--- a/x11-apps/fstobdf/fstobdf-1.0.7.ebuild
+++ b/x11-apps/fstobdf/fstobdf-1.0.7.ebuild
@@ -6,7 +6,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="generate BDF font from X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/ico/ico-1.0.6.ebuild b/x11-apps/ico/ico-1.0.6.ebuild
index 4a360e501073..a87282f7448d 100644
--- a/x11-apps/ico/ico-1.0.6.ebuild
+++ b/x11-apps/ico/ico-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="animate an icosahedron or other polyhedron"
 
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/oclock/oclock-1.0.5.ebuild b/x11-apps/oclock/oclock-1.0.5.ebuild
index 77acb4305108..33f966753631 100644
--- a/x11-apps/oclock/oclock-1.0.5.ebuild
+++ b/x11-apps/oclock/oclock-1.0.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="round X clock"
 
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/rgb/rgb-1.1.0.ebuild b/x11-apps/rgb/rgb-1.1.0.ebuild
index 649729b5046e..83d21cf15628 100644
--- a/x11-apps/rgb/rgb-1.1.0.ebuild
+++ b/x11-apps/rgb/rgb-1.1.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="uncompile an rgb color-name database"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="x11-misc/util-macros"
diff --git a/x11-apps/sessreg/sessreg-1.1.3.ebuild b/x11-apps/sessreg/sessreg-1.1.3.ebuild
index 361b363af1b2..4f8782dde895 100644
--- a/x11-apps/sessreg/sessreg-1.1.3.ebuild
+++ b/x11-apps/sessreg/sessreg-1.1.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="manage utmp/wtmp entries for non-init clients"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-apps/showfont/showfont-1.0.6.ebuild b/x11-apps/showfont/showfont-1.0.6.ebuild
index 30df1c7a2b3d..e485c24bc999 100644
--- a/x11-apps/showfont/showfont-1.0.6.ebuild
+++ b/x11-apps/showfont/showfont-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="font dumper for X font server"
 
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="x11-libs/libFS"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/smproxy/smproxy-1.0.7.ebuild b/x11-apps/smproxy/smproxy-1.0.7.ebuild
index c963e6c8d387..b697233df560 100644
--- a/x11-apps/smproxy/smproxy-1.0.7.ebuild
+++ b/x11-apps/smproxy/smproxy-1.0.7.ebuild
@@ -6,7 +6,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="Session Manager Proxy"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libSM
diff --git a/x11-apps/viewres/viewres-1.0.7.ebuild b/x11-apps/viewres/viewres-1.0.7.ebuild
index 0a98d2105800..d3e17d17c31a 100644
--- a/x11-apps/viewres/viewres-1.0.7.ebuild
+++ b/x11-apps/viewres/viewres-1.0.7.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="graphical class browser for Xt"
 
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/x11perf/x11perf-1.6.2.ebuild b/x11-apps/x11perf/x11perf-1.6.2.ebuild
index 436eeb73dbd5..f8215af276ea 100644
--- a/x11-apps/x11perf/x11perf-1.6.2.ebuild
+++ b/x11-apps/x11perf/x11perf-1.6.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X rendering operation stress test utility"
 SRC_URI="https://xorg.freedesktop.org/archive/individual/test/${P}.tar.xz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/xditview/xditview-1.0.6.ebuild b/x11-apps/xditview/xditview-1.0.6.ebuild
index 69437dfbbcc2..eb134c8c3900 100644
--- a/x11-apps/xditview/xditview-1.0.6.ebuild
+++ b/x11-apps/xditview/xditview-1.0.6.ebuild
@@ -6,7 +6,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="display ditroff output"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xgc/xgc-1.0.6.ebuild b/x11-apps/xgc/xgc-1.0.6.ebuild
index 47641202fd90..94f26d6af6ef 100644
--- a/x11-apps/xgc/xgc-1.0.6.ebuild
+++ b/x11-apps/xgc/xgc-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X graphics demo"
 
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xkbprint/xkbprint-1.0.6.ebuild b/x11-apps/xkbprint/xkbprint-1.0.6.ebuild
index eb39a131e9e6..832a5e061ea7 100644
--- a/x11-apps/xkbprint/xkbprint-1.0.6.ebuild
+++ b/x11-apps/xkbprint/xkbprint-1.0.6.ebuild
@@ -6,7 +6,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="Print an XKB keyboard description"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libxkbfile
diff --git a/x11-apps/xsetroot/xsetroot-1.1.3.ebuild b/x11-apps/xsetroot/xsetroot-1.1.3.ebuild
index 1f25d8f49fe2..43a94ebd33bb 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.3.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xsetroot application"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-base/xorg-proto/xorg-proto-2022.2.ebuild b/x11-base/xorg-proto/xorg-proto-2022.2.ebuild
index 268b0907225e..dc8af070c605 100644
--- a/x11-base/xorg-proto/xorg-proto-2022.2.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2022.2.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-base/xwayland/xwayland-22.1.5.ebuild b/x11-base/xwayland/xwayland-22.1.5.ebuild
index a8b48c055f61..afcd2774aad0 100644
--- a/x11-base/xwayland/xwayland-22.1.5.ebuild
+++ b/x11-base/xwayland/xwayland-22.1.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standalone X server running under Wayland"
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.2.0.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.2.0.ebuild
index ae823b5c11b8..d0d68a1da898 100644
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.2.0.ebuild
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.2.0.ebuild
@@ -7,7 +7,7 @@ inherit udev xorg-3
 
 DESCRIPTION="VMWare mouse input driver"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="x11-base/xorg-proto"
 
diff --git a/x11-drivers/xf86-input-void/xf86-input-void-1.4.2.ebuild b/x11-drivers/xf86-input-void/xf86-input-void-1.4.2.ebuild
index 6790b43a3bd6..f692badf4063 100644
--- a/x11-drivers/xf86-input-void/xf86-input-void-1.4.2.ebuild
+++ b/x11-drivers/xf86-input-void/xf86-input-void-1.4.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="null input driver"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libFS/libFS-1.0.9.ebuild b/x11-libs/libFS/libFS-1.0.9.ebuild
index 96e77c0bebf5..9b7cb2a16c01 100644
--- a/x11-libs/libFS/libFS-1.0.9.ebuild
+++ b/x11-libs/libFS/libFS-1.0.9.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org FS library"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 DEPEND="
 	x11-base/xorg-proto
diff --git a/x11-libs/libXau/libXau-1.0.10.ebuild b/x11-libs/libXau/libXau-1.0.10.ebuild
index 05c87c02f24f..075339292021 100644
--- a/x11-libs/libXau/libXau-1.0.10.ebuild
+++ b/x11-libs/libXau/libXau-1.0.10.ebuild
@@ -10,6 +10,6 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X authorization library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.4.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.4.ebuild
index 032377e118bd..a60f4b45da62 100644
--- a/x11-libs/libXaw3d/libXaw3d-1.6.4.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xaw3d library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="xpm"
 
 RDEPEND="
diff --git a/x11-libs/libXext/libXext-1.3.5.ebuild b/x11-libs/libXext/libXext-1.3.5.ebuild
index 71abf3dd5afd..22b382ccee1b 100644
--- a/x11-libs/libXext/libXext-1.3.5.ebuild
+++ b/x11-libs/libXext/libXext-1.3.5.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xext library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libXfont2/libXfont2-2.0.6.ebuild b/x11-libs/libXfont2/libXfont2-2.0.6.ebuild
index a16e7f7fc1a8..44b38555dc58 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.6.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.6.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 truetype"
 
 RDEPEND="sys-libs/zlib
diff --git a/x11-libs/libXft/libXft-2.3.6.ebuild b/x11-libs/libXft/libXft-2.3.6.ebuild
index 08e03115610f..94b783f7312b 100644
--- a/x11-libs/libXft/libXft-2.3.6.ebuild
+++ b/x11-libs/libXft/libXft-2.3.6.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xft library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc"
 
 RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXinerama/libXinerama-1.1.5.ebuild b/x11-libs/libXinerama/libXinerama-1.1.5.ebuild
index 664efeedacdb..f1b6ab302d90 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.5.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.5.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xinerama library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXmu/libXmu-1.1.4.ebuild b/x11-libs/libXmu/libXmu-1.1.4.ebuild
index cffa51a991f3..92fc3a86a94c 100644
--- a/x11-libs/libXmu/libXmu-1.1.4.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.4.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xmu library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXpresent/libXpresent-1.0.1.ebuild b/x11-libs/libXpresent/libXpresent-1.0.1.ebuild
index 91b60c1c4a82..7941b9ed47c0 100644
--- a/x11-libs/libXpresent/libXpresent-1.0.1.ebuild
+++ b/x11-libs/libXpresent/libXpresent-1.0.1.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X Present Extension C Library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	x11-libs/libX11[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXrender/libXrender-0.9.11.ebuild b/x11-libs/libXrender/libXrender-0.9.11.ebuild
index ec360869ca6d..aebb9e4e0c79 100644
--- a/x11-libs/libXrender/libXrender-0.9.11.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.11.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xrender library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXtst/libXtst-1.2.4.ebuild b/x11-libs/libXtst/libXtst-1.2.4.ebuild
index 4307ef5e6142..5f813ea5ef15 100644
--- a/x11-libs/libXtst/libXtst-1.2.4.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.4.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild
index 12365de2791b..71dde7ec8fc1 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libdrm/libdrm-2.4.114.ebuild b/x11-libs/libdrm/libdrm-2.4.114.ebuild
index e0e16f301a86..cd9b827671be 100644
--- a/x11-libs/libdrm/libdrm-2.4.114.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.114.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libfontenc/libfontenc-1.1.6.ebuild b/x11-libs/libfontenc/libfontenc-1.1.6.ebuild
index 0d980987b4fc..d58a84ca2df8 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.6.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org fontenc library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libpciaccess/libpciaccess-0.17.ebuild b/x11-libs/libpciaccess/libpciaccess-0.17.ebuild
index 136e855dbe74..1d080ab62a63 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.17.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.17.ebuild
@@ -8,7 +8,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3 meson-multilib
 
 DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 DEPEND="
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.1.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.1.ebuild
index 4f666caa6ef7..90ec22f907fb 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.1.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xkbfile library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.1.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.1.ebuild
index 68e5ce6ef244..94640bdf7fb7 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3.1.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3.1.ebuild
@@ -9,6 +9,6 @@ inherit xorg-3
 
 DESCRIPTION="Shared memory fences using futexes"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/pixman/pixman-0.42.2.ebuild b/x11-libs/pixman/pixman-0.42.2.ebuild
index 397ec588a58b..a374ef666c6d 100644
--- a/x11-libs/pixman/pixman-0.42.2.ebuild
+++ b/x11-libs/pixman/pixman-0.42.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi
 
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.4.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.4.ebuild
index 41211c46bc72..8081fc1c6350 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.4.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.4.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild
index 0087e7d795c6..e9ccc532cf9b 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-0.4:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild
index 14a0752700e7..8ed8a55f1c54 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild
index 0c93fcb1eb58..db086a9eaf19 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild
index 94b5ea1384ae..b156cde9d75a 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-misc/imake/imake-1.0.9.ebuild b/x11-misc/imake/imake-1.0.9.ebuild
index c2494666dbdf..12436d8ee0ab 100644
--- a/x11-misc/imake/imake-1.0.9.ebuild
+++ b/x11-misc/imake/imake-1.0.9.ebuild
@@ -6,7 +6,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit toolchain-funcs xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-misc/xorg-cf-files"
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-misc/makedepend/makedepend-1.0.7.ebuild b/x11-misc/makedepend/makedepend-1.0.7.ebuild
index 329e83efa162..7346a7316d01 100644
--- a/x11-misc/makedepend/makedepend-1.0.7.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.7.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild
index b929e91d88ec..fa640550337b 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-plugins/wmweather+/files/wmweather+-2.18-configure-clang16.patch b/x11-plugins/wmweather+/files/wmweather+-2.18-configure-clang16.patch
new file mode 100644
index 000000000000..68a4d3f33190
--- /dev/null
+++ b/x11-plugins/wmweather+/files/wmweather+-2.18-configure-clang16.patch
@@ -0,0 +1,67 @@
+https://sourceforge.net/p/wmweatherplus/bugs/21/
+https://bugs.gentoo.org/870958
+
+Port the configure script to C99 by avoiding calls to the undeclared
+exit function.  Future compilers are likely to reject implicit
+function declarations by default; this C features was removed from the
+language in 1999.
+
+--- a/m4/snprintf.m4
++++ b/m4/snprintf.m4
+@@ -24,7 +24,7 @@ int snprintf(char *str, size_t size, const char *format, ...);
+ #endif
+ ]],
+ [[char foo[]="ABC"; snprintf(foo, 2, "%d", 12);
+-exit((foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1);]])],
++return (foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1;]])],
+ [x_cv_func_snprintf_size=yes],
+ [x_cv_func_snprintf_size=no],
+ [x_cv_func_snprintf_size=no])])
+@@ -52,7 +52,7 @@ AC_CACHE_CHECK([if snprintf return value is sane], x_cv_func_snprintf_retval,
+ int snprintf(char *str, size_t size, const char *format, ...);
+ #endif
+ ]],
+-[[char foo[10]; exit((snprintf(foo, 1, "%d", 9876)==4)?0:1);]])],
++[[char foo[10]; return (snprintf(foo, 1, "%d", 9876)==4)?0:1;]])],
+ [x_cv_func_snprintf_retval=yes],
+ [x_cv_func_snprintf_retval=no],
+ [x_cv_func_snprintf_retval=no])])
+@@ -79,7 +79,7 @@ AC_CACHE_CHECK([if snprintf(NULL, 0, ...) works], x_cv_func_snprintf_null_ok,
+ int snprintf(char *str, size_t size, const char *format, ...);
+ #endif
+ ]],
+-[int r=snprintf(NULL, 0, "%d", 100); exit((r==3 || r==-1)?0:1);])],
++[int r=snprintf(NULL, 0, "%d", 100); return (r==3 || r==-1)?0:1;])],
+ [x_cv_func_snprintf_null_ok=yes],
+ [x_cv_func_snprintf_null_ok=no],
+ [x_cv_func_snprintf_null_ok=no])])
+--- a/m4/vsnprintf.m4
++++ b/m4/vsnprintf.m4
+@@ -37,7 +37,7 @@ int doit(char *str, size_t size, const char *format, ...){
+ }
+ ]],
+ [[char foo[]="ABC"; doit(foo, 2, "%d", 12);
+-exit((foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1);]])],
++return (foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1;]])],
+ [x_cv_func_vsnprintf_size=yes],
+ [x_cv_func_vsnprintf_size=no],
+ [x_cv_func_vsnprintf_size=no])])
+@@ -74,7 +74,7 @@ int doit(char *str, size_t size, const char *format, ...){
+     return r;
+ }
+ ]],
+-[[char foo[10]; exit((doit(foo, 1, "%d", 9876)==4)?0:1);]])],
++[[char foo[10]; return (doit(foo, 1, "%d", 9876)==4)?0:1;]])],
+ [x_cv_func_vsnprintf_retval=yes],
+ [x_cv_func_vsnprintf_retval=no],
+ [x_cv_func_vsnprintf_retval=no])])
+@@ -110,7 +110,7 @@ int doit(char *str, size_t size, const char *format, ...){
+     return r;
+ }
+ ]],
+-[int r=doit(NULL, 0, "%d", 100); exit((r==3 || r==-1)?0:1);])],
++[int r=doit(NULL, 0, "%d", 100); return (r==3 || r==-1)?0:1;])],
+ [x_cv_func_vsnprintf_null_ok=yes],
+ [x_cv_func_vsnprintf_null_ok=no],
+ [x_cv_func_vsnprintf_null_ok=no])])
+
diff --git a/x11-plugins/wmweather+/wmweather+-2.18.ebuild b/x11-plugins/wmweather+/wmweather+-2.18-r1.ebuild
index 3ff866178306..0c62154e0166 100644
--- a/x11-plugins/wmweather+/wmweather+-2.18.ebuild
+++ b/x11-plugins/wmweather+/wmweather+-2.18-r1.ebuild
@@ -21,7 +21,10 @@ DEPEND="dev-libs/libpcre
 	x11-wm/windowmaker"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-ar.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
+)
 
 src_prepare() {
 	default
author	Repository mirror & CI <repomirrorci@gentoo.org>	2022-12-03 06:16:46 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2022-12-03 06:16:46 +0000
commit	ba017a1ac2119a00d7edc2553c945fdca8b18ec6 (patch)
tree	a97150ea16463b90f2f5a58a2b9669eb933b9fce
parent	Merge updates from master (diff)
parent	sys-kernel/dracut: Stabilize 057-r2 hppa, #884089 (diff)
download	gentoo-ba017a1ac2119a00d7edc2553c945fdca8b18ec6.tar.gz gentoo-ba017a1ac2119a00d7edc2553c945fdca8b18ec6.tar.bz2 gentoo-ba017a1ac2119a00d7edc2553c945fdca8b18ec6.zip