Merge updates from master

46 files changed, 302 insertions, 38 deletions

diff --git a/app-admin/eselect/eselect-1.4.26.ebuild b/app-admin/eselect/eselect-1.4.26.ebuild
index ffe4c00e4b82..995643f6cb6d 100644
--- a/app-admin/eselect/eselect-1.4.26.ebuild
+++ b/app-admin/eselect/eselect-1.4.26.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs vim-syntax"
 
 DEPEND="sys-apps/sed
diff --git a/app-admin/sudo/sudo-1.9.14_p3.ebuild b/app-admin/sudo/sudo-1.9.14_p3.ebuild
index 8aae967ffb70..379ad3c8f1bd 100644
--- a/app-admin/sudo/sudo-1.9.14_p3.ebuild
+++ b/app-admin/sudo/sudo-1.9.14_p3.ebuild
@@ -33,7 +33,7 @@ else
 	"
 
 	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		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
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sudo )"
diff --git a/app-arch/tar/tar-1.35.ebuild b/app-arch/tar/tar-1.35.ebuild
index 48e447b2f78c..e31b35df0c56 100644
--- a/app-arch/tar/tar-1.35.ebuild
+++ b/app-arch/tar/tar-1.35.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 LICENSE="GPL-3+"
 SLOT="0"
 if [[ -z "$(ver_cut 3)" || "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="acl minimal nls selinux xattr"
 
diff --git a/app-dicts/eblook/eblook-1.6.1_p16-r1.ebuild b/app-dicts/eblook/eblook-1.6.1_p16-r1.ebuild
index 0c9c953d7367..4ef5bb49eb6c 100644
--- a/app-dicts/eblook/eblook-1.6.1_p16-r1.ebuild
+++ b/app-dicts/eblook/eblook-1.6.1_p16-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-$(ver_cut 1-3)
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv x86"
+KEYWORDS="~amd64 ppc ~riscv x86"
 
 DEPEND=">=dev-libs/eb-3.3.4"
 RDEPEND="${DEPEND}"
diff --git a/app-i18n/libpinyin/libpinyin-2.8.1.ebuild b/app-i18n/libpinyin/libpinyin-2.8.1.ebuild
index 3d7f84941d09..480d85b40fec 100644
--- a/app-i18n/libpinyin/libpinyin-2.8.1.ebuild
+++ b/app-i18n/libpinyin/libpinyin-2.8.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.tex
 
 LICENSE="GPL-3+"
 SLOT="0/13"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/app-misc/dvorak7min/dvorak7min-1.6.1-r2.ebuild b/app-misc/dvorak7min/dvorak7min-1.6.1-r2.ebuild
index 9e910b7d47b7..74cc65b5d0a0 100644
--- a/app-misc/dvorak7min/dvorak7min-1.6.1-r2.ebuild
+++ b/app-misc/dvorak7min/dvorak7min-1.6.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="sys-libs/ncurses:="
diff --git a/app-office/homebank/homebank-5.6.5.ebuild b/app-office/homebank/homebank-5.6.5.ebuild
index 4e6a9222786f..29ac29e41ddd 100644
--- a/app-office/homebank/homebank-5.6.5.ebuild
+++ b/app-office/homebank/homebank-5.6.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://homebank.free.fr/public/sources/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+ofx"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 RDEPEND=">=dev-libs/glib-2.39:2
 	>=net-libs/libsoup-2.26:2.4
diff --git a/app-text/a2ps/a2ps-4.15.5.ebuild b/app-text/a2ps/a2ps-4.15.5.ebuild
index 9d9fd4c00096..09c537192070 100644
--- a/app-text/a2ps/a2ps-4.15.5.ebuild
+++ b/app-text/a2ps/a2ps-4.15.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cjk emacs latex nls static-libs vanilla"
 
 # a2ps-lpr-wrapper needs bash
diff --git a/dev-db/unixODBC/unixODBC-2.3.12.ebuild b/dev-db/unixODBC/unixODBC-2.3.12.ebuild
index 9c8c42a0fa99..a366b51de1d1 100644
--- a/dev-db/unixODBC/unixODBC-2.3.12.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.unixodbc.org/unixODBC-${PV}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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 ~x64-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="
diff --git a/dev-libs/blake3/blake3-1.4.1.ebuild b/dev-libs/blake3/blake3-1.4.1.ebuild
index 27214e6b44a3..5988e582f180 100644
--- a/dev-libs/blake3/blake3-1.4.1.ebuild
+++ b/dev-libs/blake3/blake3-1.4.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/BLAKE3-${PV}/c"
 
 LICENSE="|| ( CC0-1.0 Apache-2.0 )"
 SLOT="0/0"
-KEYWORDS="~amd64 ~loong ~riscv"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/isl/isl-0.26.ebuild b/dev-libs/isl/isl-0.26.ebuild
index 68059f5d3281..96dbce5b2ff6 100644
--- a/dev-libs/isl/isl-0.26.ebuild
+++ b/dev-libs/isl/isl-0.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://libisl.sourceforge.io/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libbytesize/libbytesize-2.9.ebuild b/dev-libs/libbytesize/libbytesize-2.9.ebuild
index 49155b17a4a9..4cb4753960a9 100644
--- a/dev-libs/libbytesize/libbytesize-2.9.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="doc python test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
index 52b837ec265c..bff20d623165 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy static-libs"
 
 # Build system only has --disable-arm-crypto-support right now
diff --git a/dev-libs/libpcre/libpcre-8.45-r2.ebuild b/dev-libs/libpcre/libpcre-8.45-r2.ebuild
index 034bb69550d0..2064f9bd6621 100644
--- a/dev-libs/libpcre/libpcre-8.45-r2.ebuild
+++ b/dev-libs/libpcre/libpcre-8.45-r2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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 ~x64-solaris"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline static-libs unicode valgrind zlib"
 REQUIRED_USE="
 	readline? ( !libedit )
diff --git a/dev-perl/Authen-SASL/Authen-SASL-2.170.0.ebuild b/dev-perl/Authen-SASL/Authen-SASL-2.170.0.ebuild
index e65c3cf5d41b..5e303e6e1170 100644
--- a/dev-perl/Authen-SASL/Authen-SASL-2.170.0.ebuild
+++ b/dev-perl/Authen-SASL/Authen-SASL-2.170.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl SASL interface"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="kerberos"
 
 RDEPEND="
diff --git a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.510.0.ebuild b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.510.0.ebuild
index 5d29ac0c5791..0f674a5202cc 100644
--- a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.510.0.ebuild
+++ b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.510.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Comma-separated values manipulation routines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-IO
diff --git a/dev-perl/Type-Tiny/Type-Tiny-2.4.0-r1.ebuild b/dev-perl/Type-Tiny/Type-Tiny-2.4.0-r1.ebuild
index 5fcb7ad5b729..5c81e6b19c19 100644
--- a/dev-perl/Type-Tiny/Type-Tiny-2.4.0-r1.ebuild
+++ b/dev-perl/Type-Tiny/Type-Tiny-2.4.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Tiny, yet Moo(se)-compatible type constraint"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cairocffi/cairocffi-1.6.0.ebuild b/dev-python/cairocffi/cairocffi-1.6.0.ebuild
index 567cfc4d69eb..270d7af39969 100644
--- a/dev-python/cairocffi/cairocffi-1.6.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/flasgger/flasgger-0.9.7.1.ebuild b/dev-python/flasgger/flasgger-0.9.7.1.ebuild
index 7209659d58a9..6e68d0b662da 100644
--- a/dev-python/flasgger/flasgger-0.9.7.1.ebuild
+++ b/dev-python/flasgger/flasgger-0.9.7.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ~ppc ~riscv ~s390 sparc"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ~riscv ~s390 sparc"
 
 RDEPEND="
 	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/httpbin/httpbin-0.10.1.ebuild b/dev-python/httpbin/httpbin-0.10.1.ebuild
index 6bbb5413241f..4cd52d028605 100644
--- a/dev-python/httpbin/httpbin-0.10.1.ebuild
+++ b/dev-python/httpbin/httpbin-0.10.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( MIT ISC )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ~ppc ~riscv ~s390 sparc"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ~riscv ~s390 sparc"
 
 RDEPEND="
 	dev-python/brotlicffi[${PYTHON_USEDEP}]
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index 9e152ba6f2b4..8254e38d11e1 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,2 +1,3 @@
 DIST icalendar-5.0.7.tar.gz 104099 BLAKE2B df45ee6b8c1ad5bfc558195e86e2456aae8f70613724ba16e74093e5454695d8d4ef2e0eb2e312dd2a94c3a12bc6e4febc21174e8380e249f2de906500a1cfc8 SHA512 c541e61d79b76123d119e51ee6d927795a7d675aded427a21bd38d0f069ea454e182a61ff86b96c7769c42560dfc20f7facb00dfe8a9cfa47da74b279d841b42
 DIST icalendar-5.0.8.tar.gz 106954 BLAKE2B 2e6d9cbae1a8feba40c33403e047386dcb8846fb7d8fd9e6b78d2b58ffeb4fb033438f240dd3fa3290f5edeb171a940dc2213cd5d758f59908eea1099807f52d SHA512 275884cf934d8a275dc75346b0518701f2160c43d479e91069f3cad4370b14d9cbc78bf0c1fea287df2da271ec2f71137cfd5ec202d8304df16cf474f7008b53
+DIST icalendar-5.0.9.tar.gz 107376 BLAKE2B 506ccdbccc0e9d3e755becfb811380b9fc7c9d401b5812d3c56170c27350311c3d5bd2809e3dd93c1e6e361ce46015f1916326bc306571b1139b9d7aac592eac SHA512 b70c1adbcaeebbd81ba8c4cf4db146d593131dd3ba7c995f3b2417bf871cca82042ec43eab127f158895070d4e17ebf46cb30aca0a33b8344665798c29fd2e27
diff --git a/dev-python/icalendar/icalendar-5.0.9.ebuild b/dev-python/icalendar/icalendar-5.0.9.ebuild
new file mode 100644
index 000000000000..abbe040cb9ee
--- /dev/null
+++ b/dev-python/icalendar/icalendar-5.0.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
+HOMEPAGE="
+	https://github.com/collective/icalendar/
+	https://pypi.org/project/icalendar/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# reset conf.py to not read version from an installed instance
+	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index f24559577197..67f8a84f32ca 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -10,3 +10,4 @@ DIST moto-4.1.8.tar.gz 3520127 BLAKE2B 623d97dbec357227ea401ac98f694eaaa129fcb47
 DIST moto-4.1.9.tar.gz 3537033 BLAKE2B fda091585fd331ff68127290426bb1f5418b118b9d60711ca54bcf57b1ff4375320bb3f3ae79321d105e815d856183b7f3c012f20c07f357831fb8260dcbd9f1 SHA512 1ce3aa3549b6320a8493f7018ccdc630f94cd324791e91c2ce28a994dff8da37058c47c84f480dfcad870ef63a0e1d35712348b120c112696b8d9cbce66186a9
 DIST moto-4.2.2.tar.gz 3646677 BLAKE2B 142d66f069a8a461f26959be5ec63cbd8dac7c5f4e752be3f78a728ee262a50b9505c7e1631da3fe98ac7b7d0044bcf4dd31edeb936798722d3c5fac0f062908 SHA512 76d3b7f575f70a0ce51dfca0918c036f791ea74be2194a96210bf92ce628f873458f1eb5d2a04308d5b0805f4469f7cf0d50eef845830a0ee1fa85b96bfb4104
 DIST moto-4.2.3.tar.gz 4693815 BLAKE2B 3163376f5dd645af9fb9cd1a9af459ec76c6fd3c6f908d72429c2f72e5b4c2e8864afc0afbabe344524c403da0bf19477491b44bba2f29f422c38334595d0fc8 SHA512 a9a45fdb05722466f29e1a66b59637aa839960922b5992ad0aca6523edbe0c3b6c4e4724311d74d5b18cebdbf3fb26dd64887b2fea83ab5cc5487728f18a4c0e
+DIST moto-4.2.4.tar.gz 4705570 BLAKE2B b9e6e60b147320b8393ca6cfe1c985d9814b18be0b8722cd960cae66530d0b5f23d9005a4a57fd224a3ec82b6108275832ef10633dafb3e2735f78be22e4d225 SHA512 d733a73d90f6c0dd5f5ce7f626792a5e6f672f9a951b4a841a2ef342f7350bdfbc7caf7e39e06acacedc7153c641565c6339b881487cb80c42adb42bd0a37880
diff --git a/dev-python/moto/moto-4.2.4.ebuild b/dev-python/moto/moto-4.2.4.ebuild
new file mode 100644
index 000000000000..82ac9a3b5b9b
--- /dev/null
+++ b/dev-python/moto/moto-4.2.4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="
+	https://github.com/getmoto/moto/
+	https://pypi.org/project/moto/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
+	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
+	dev-python/pyaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_failed_dependencies
+		tests/test_batch/test_batch_jobs.py::test_failed_job
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_core/test_docker.py::test_docker_is_running_and_available
+		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+		# TODO
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_queue
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_fifo_queue
+		# require py_partiql_parser
+		tests/test_s3/test_s3_select.py
+		tests/test_dynamodb/test_dynamodb_statements.py
+		# broken by new urllib3
+		tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_data
+		tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_file_using_requests
+		tests/test_s3/test_s3.py::test_upload_from_file_to_presigned_url
+		tests/test_s3/test_s3.py::test_put_chunked_with_v4_signature_in_body
+		tests/test_s3/test_s3.py::test_presigned_put_url_with_approved_headers
+		tests/test_s3/test_s3.py::test_presigned_put_url_with_custom_headers
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+
+	local serial_tests=(
+		# these tests set up credentials that are needed by the tests below
+		tests/test_core/test_importorder.py
+		# these tests apparently rely on some other test setting credentials
+		# up for them, so they need to be run separately, after the above
+		tests/test_redshiftdata
+		tests/test_resourcegroupstaggingapi/test_server.py::test_resourcegroupstaggingapi_list
+		tests/test_s3/test_s3_file_handles.py::TestS3FileHandleClosuresUsingMocks
+		tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_can_handle_multiple_services
+	)
+
+	epytest "${serial_tests[@]}"
+
+	EPYTEST_DESELECT+=( "${serial_tests[@]}" )
+	epytest -m 'not network' -p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/pynacl/pynacl-1.5.0-r3.ebuild b/dev-python/pynacl/pynacl-1.5.0-r3.ebuild
index 09a863dfd5a6..5a282f646a9e 100644
--- a/dev-python/pynacl/pynacl-1.5.0-r3.ebuild
+++ b/dev-python/pynacl/pynacl-1.5.0-r3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/libsodium:=
diff --git a/dev-python/recurring-ical-events/Manifest b/dev-python/recurring-ical-events/Manifest
index 61e86c0b9e02..c16611a6a023 100644
--- a/dev-python/recurring-ical-events/Manifest
+++ b/dev-python/recurring-ical-events/Manifest
@@ -1 +1,2 @@
 DIST python-recurring-ical-events-2.0.2.gh.tar.gz 326754 BLAKE2B 1df6ffaf08e991ca49360f586abda344a9967e9fe0446a367920d6fe502aea20af35bb976b7a030d47f0b34388e7f169027e4106fc7c317d3a68358af812d40f SHA512 377f2f974cf0ce141d6c4f32aafe1b55339121229a74d66647d6779c1bec3ec4ede47a0c1353692c5eb3d5a6144b53f1fef3150343b503884c1d1d241138b65d
+DIST python-recurring-ical-events-2.1.0.gh.tar.gz 327954 BLAKE2B 8dae03b538e961fa18b51d6ecfd3d0818a64a44ebd9811370a7c78e8b897f38cad520d692fcc6e1c93751f500d8fd6072f0ce86ee9ac947b0aab7c82fcc3d9f7 SHA512 8e8e0d18e110be01f60a4834d21794d7a595413d109af88f44896d75db4c37176020f1f4fd74dc81c2f76d1e3654bc77c97240a6163444b0449a08178bb22c27
diff --git a/dev-python/recurring-ical-events/recurring-ical-events-2.1.0.ebuild b/dev-python/recurring-ical-events/recurring-ical-events-2.1.0.ebuild
new file mode 100644
index 000000000000..c790e2121364
--- /dev/null
+++ b/dev-python/recurring-ical-events/recurring-ical-events-2.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Repeat ICalendar events by RRULE, RDATE and EXDATE"
+HOMEPAGE="
+	https://github.com/niccokunzmann/python-recurring-ical-events/
+	https://pypi.org/project/recurring-ical-events/
+"
+SRC_URI="
+	https://github.com/niccokunzmann/python-recurring-ical-events/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/icalendar-6[${PYTHON_USEDEP}]
+	>=dev-python/icalendar-5.0.9[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2023.3[${PYTHON_USEDEP}]
+	<dev-python/x-wr-timezone-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/x-wr-timezone-0.0.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	test/test_readme.py
+)
+
+EPYTEST_DESELECT=(
+	# a test checking if tzdata package is installed that is apparently
+	# needed for other tests, except it isn't
+	test/test_zoneinfo_issue_57.py::test_zoneinfo_must_be_installed_if_it_is_possible
+)
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 432b62105870..eb7c8ec67992 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,3 +1,4 @@
 DIST zeroconf-0.108.0.tar.gz 154905 BLAKE2B c5ec272233faca801f30a0699a71a410f29d13565890ef25eb3ad164914fbe7a9f282c082cfe8fef3c47a72e92b5e1e33b6ccaefb96b30d3d2cb82dc624ec072 SHA512 a5206b548a8d32ac082e6aaff63437f488d5cac4200b24d2a8c9343e6bc859afb237d6e8003c569174c6c91ed2bba65044f37f730fb4d40664be70691d84d4ee
 DIST zeroconf-0.112.0.tar.gz 155715 BLAKE2B ce19e2d7798f3bc4e6e3ae5b6d319594f6941b9ea5b383fff1bc072ca86a62edc09bfa37caf67fd5dee492df2e704ccb383c7dea180c94514152b262446a99c0 SHA512 855da760f60ecace67722cf00ef0b8185907765a08dd30fb6796fc2efb9d233b8b9be12f2b69898efda041343647934b59b5b3ef57a457ba094d67349efad57c
+DIST zeroconf-0.113.0.tar.gz 155892 BLAKE2B 4de635a601349d2db2e2a0e72c0a1a130e3f9590bde2b1adfd603e758a17362a7588e90dfeeed91841317c0bc977f51ca176fa4e94734641ca8249436e78844c SHA512 e9000ea6d2787598b3203c79446c0f5f5efc833abcc2b625542850383e9905be023c89938adace8f7c06d46fb88263bb556281f0929fb1d5fa822dd55cbe9751
 DIST zeroconf-0.91.1.tar.gz 150551 BLAKE2B 220e6b5684d503c7d1c594196ffa7ecc4f06975accad2ad64a6dd0a75881326110bbf897e74a2a176307fc392fc9fce903c77bbf9fc70fec84f193072bd7a016 SHA512 852946a2f823de1dc25dda5321ec23c67e3893fd8dcf55391e001afb01eb4c8143813aaa0950fddbea6634975eb0904a6e3b500cbe082e843da301c0cd704e9a
diff --git a/dev-python/zeroconf/zeroconf-0.113.0.ebuild b/dev-python/zeroconf/zeroconf-0.113.0.ebuild
new file mode 100644
index 000000000000..b3ff07347a6d
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.113.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/python-zeroconf/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+# the build system uses custom build script that uses distutils to build
+# C extensions, sigh
+BDEPEND="
+	>=dev-python/cython-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export REQUIRE_CYTHON=1
+
+python_test() {
+	local -x SKIP_IPV6=1
+	local EPYTEST_DESELECT=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+
+		# fragile to timeouts (?)
+		tests/services/test_browser.py::test_service_browser_expire_callbacks
+		tests/utils/test_asyncio.py::test_run_coro_with_timeout
+	)
+
+	epytest -o addopts=
+}
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.20.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.20.ebuild
index fc77ff89ab23..bd6c662a73d7 100644
--- a/dev-ruby/asciidoctor/asciidoctor-2.0.20.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.20.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/redcloth/redcloth-4.3.2-r5.ebuild b/dev-ruby/redcloth/redcloth-4.3.2-r5.ebuild
index b43a51c4804f..4cf1252c9d4a 100644
--- a/dev-ruby/redcloth/redcloth-4.3.2-r5.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.3.2-r5.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://github.com/jgarber/redcloth/archive/v${PV}.tar.gz -> ${RUBY_FAK
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/rexml/rexml-3.2.6.ebuild b/dev-ruby/rexml/rexml-3.2.6.ebuild
index 34ea357c7f8f..1017a4e20e66 100644
--- a/dev-ruby/rexml/rexml-3.2.6.ebuild
+++ b/dev-ruby/rexml/rexml-3.2.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="3"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit )"
diff --git a/dev-ruby/warning/warning-1.3.0.ebuild b/dev-ruby/warning/warning-1.3.0.ebuild
index ac938e38630f..a53c3cbc5622 100644
--- a/dev-ruby/warning/warning-1.3.0.ebuild
+++ b/dev-ruby/warning/warning-1.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/jeremyevans/ruby-warning/archive/${PV}.tar.gz -> ${P
 RUBY_S="ruby-${P}"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~sparc ~x86"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.11-r1.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.11-r1.ebuild
index 91d533992d83..20b863648334 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.6.11-r1.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.6.11-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/warning )"
diff --git a/dev-util/scons/scons-4.5.2.ebuild b/dev-util/scons/scons-4.5.2.ebuild
index 811391d01289..a21519501e5e 100644
--- a/dev-util/scons/scons-4.5.2.ebuild
+++ b/dev-util/scons/scons-4.5.2.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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 ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libsndfile/libsndfile-1.2.2.ebuild b/media-libs/libsndfile/libsndfile-1.2.2.ebuild
index 0c8462f14e26..00c675e67f9c 100644
--- a/media-libs/libsndfile/libsndfile-1.2.2.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.2.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.xz"
-	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"
+	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"
 fi
 inherit python-any-r1 multilib-minimal
 
diff --git a/media-sound/flac123/flac123-2.1.1.ebuild b/media-sound/flac123/flac123-2.1.1.ebuild
index 9c5d3560c3d5..36fb9a8c7096 100644
--- a/media-sound/flac123/flac123-2.1.1.ebuild
+++ b/media-sound/flac123/flac123-2.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flac123/flac123/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-libs/popt
diff --git a/media-sound/mpg123/mpg123-1.31.3-r1.ebuild b/media-sound/mpg123/mpg123-1.31.3-r1.ebuild
index b5852ee1009b..c799d036667f 100644
--- a/media-sound/mpg123/mpg123-1.31.3-r1.ebuild
+++ b/media-sound/mpg123/mpg123-1.31.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/ncmpc/ncmpc-0.49.ebuild b/media-sound/ncmpc/ncmpc-0.49.ebuild
index 612cad148706..327075ddcd81 100644
--- a/media-sound/ncmpc/ncmpc-0.49.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.49.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/chrony/chrony-4.4.ebuild b/net-misc/chrony/chrony-4.4.ebuild
index 1716d1129c30..0323ccfde089 100644
--- a/net-misc/chrony/chrony-4.4.ebuild
+++ b/net-misc/chrony/chrony-4.4.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
 
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 	fi
 fi
 
diff --git a/net-vpn/tor/tor-0.4.7.14.ebuild b/net-vpn/tor/tor-0.4.7.14.ebuild
index 6ad8910e9eed..aeb7f67c091d 100644
--- a/net-vpn/tor/tor-0.4.7.14.ebuild
+++ b/net-vpn/tor/tor-0.4.7.14.ebuild
@@ -28,7 +28,7 @@ else
 	S="${WORKDIR}/${MY_PF}"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-		KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
+		KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
 	fi
 
 	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20230727 )"
diff --git a/perl-core/Math-BigInt/Math-BigInt-1.999.838.ebuild b/perl-core/Math-BigInt/Math-BigInt-1.999.838.ebuild
index 1df49ee4511e..3647dc3d939d 100644
--- a/perl-core/Math-BigInt/Math-BigInt-1.999.838.ebuild
+++ b/perl-core/Math-BigInt/Math-BigInt-1.999.838.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Arbitrary size floating point math package"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sec-keys/openpgp-keys-tor/openpgp-keys-tor-20230727.ebuild b/sec-keys/openpgp-keys-tor/openpgp-keys-tor-20230727.ebuild
index 3852f8d468f3..4c4c26438dc5 100644
--- a/sec-keys/openpgp-keys-tor/openpgp-keys-tor-20230727.ebuild
+++ b/sec-keys/openpgp-keys-tor/openpgp-keys-tor-20230727.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-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_install() {
 	local files=( ${A} )
diff --git a/sys-devel/mold/mold-2.2.0.ebuild b/sys-devel/mold/mold-2.2.0.ebuild
index bdb6e5ef63b5..16ecf90ddcc2 100644
--- a/sys-devel/mold/mold-2.2.0.ebuild
+++ b/sys-devel/mold/mold-2.2.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~loong ~riscv"
+	KEYWORDS="~amd64 ~loong ~riscv ~x86"
 fi
 
 # mold (MIT)
diff --git a/virtual/linux-sources/linux-sources-3-r6.ebuild b/virtual/linux-sources/linux-sources-3-r7.ebuild
index d184d5799a53..5e047f96051c 100644
--- a/virtual/linux-sources/linux-sources-3-r6.ebuild
+++ b/virtual/linux-sources/linux-sources-3-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,4 +22,5 @@ RDEPEND="
 		sys-kernel/gentoo-kernel
 		sys-kernel/gentoo-kernel-bin
 		sys-kernel/vanilla-kernel
+		sys-kernel/linux-next
 	)"
diff --git a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.838.ebuild b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.838.ebuild
index e6753c9224ad..2ce5e791b197 100644
--- a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.838.ebuild
+++ b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.838.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}