Merge updates from master

30 files changed, 174 insertions, 139 deletions

diff --git a/app-backup/borgmatic/borgmatic-1.8.9.ebuild b/app-backup/borgmatic/borgmatic-1.8.9.ebuild
index 09e09f4eea4c..0155eb3b0714 100644
--- a/app-backup/borgmatic/borgmatic-1.8.9.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.8.9.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://torsion.org/borgmatic/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv"
 IUSE="apprise"
 
 REQUIRED_USE="test? ( apprise )"
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 5afc950c5dd5..a001c6487902 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,8 +1,4 @@
 DIST yubikey_manager-5.2.0.tar.gz 184873 BLAKE2B 09041c23e23ff01cad2d126face63006d1648dfe8d2e7a47b7113deed990143c83a36b6c60458dc9cbf55a71ddf286b8259c97ee982044dbc554231655fb82e2 SHA512 988c25f378e0ce5b53ba5a47aac5fd5a136653f1592af5e9c7440eef7336903cf459a567b4be02119262dba70c3058f5d9f26049dc21c1d934dcf8897eedc03d
 DIST yubikey_manager-5.2.0.tar.gz.sig 309 BLAKE2B bb1a012832c99aaa94404717560e72fb93352b82dd3c0091cb492cde65706c39b9e2411e38a36150d77e72f6397d98cef643d0b392c1751e9c109de3468c9a39 SHA512 926a7a7c40d38bcc0a48e3b44f3eb673c16f7bed73701f5cb6f9ac4418c9f2a242b8d2af9459093ec10e8c188410412a8ba8c05a0fd4774a738629a4b0f874d4
-DIST yubikey_manager-5.2.1.tar.gz 185533 BLAKE2B 7aa61043eb7f8a9502ee3c3aaea8d2cae63bde564aa8d2332570247959df966049b181bc1b3fa5749d1f66f21c2a2b10871cbe8e6a83c81ee67648957a2eb869 SHA512 96118f1b4e9509f9b299f8dfea2b29f7ac2958797facfae6bacb425fd4aa4cf5c91a14dcdbb9edbc9cf5785cfb9d5e4c465ad3e3813fd902cf12ad2d6b072329
-DIST yubikey_manager-5.2.1.tar.gz.sig 310 BLAKE2B 1338fd7f05766629790188e20d0dc71548941522ce02e0b3d0f7db0be6ee61655000aeb45b3a58c80d0cb891a13a816f4af2f145339d2fb09b9c6293a882bf86 SHA512 57a63bd272e61f93182fb26e1378d8e355efd91c2e2eede70744223fd47e02f4e210725ad31b1ce1bfdc81a67183159054a8238930ca4bdaec2aa7970b170f35
-DIST yubikey_manager-5.3.0.tar.gz 188418 BLAKE2B cd33d3a22c82ef1588121b7f8ff1c724d1fe7c9a58daa68938c2c3c4f1f0bbcdd4b04c3a0d2c51db6a2184038e67cb62f452583e1304e23c3ea9df0e0f16aa4e SHA512 6cdcb10e490319344f3afb18a6826b4a83bd2ea388b2942b57b3e3eff7a21384df8e183989281eb30375dd371dfcfdf6504195144515439190f6c49f6b9e6a49
-DIST yubikey_manager-5.3.0.tar.gz.sig 310 BLAKE2B 7dbf245d168872ec59b37f8b676f8ae230dd27642f532526aa8edf64dd3da5f2492aeff73ce7e0b4b48eda00af8880d7b889aae653d38028e67233ebdc895a5f SHA512 5f1e690afa5bee00c2bdaea7e33686280d856a217953fc8d951eb8b2111ae67eb6f817db3e92b0f5b515ca1ab6b5d53f14ec68629728ddb2f210ef58e6e871cb
 DIST yubikey_manager-5.4.0.tar.gz 188859 BLAKE2B e83d74b0d512b7a1076bf6de0860c3a29259e337ccf508e81572e5802b1b1dced4c098ea21b4a3d63294b51a042780bf875536c30f65d46ce76b7a80c0bc1fce SHA512 c773895957d17ceac8e944958435071fbb3a80469016a22aa13785a5bc009406870366e5b65d3d2ddbd2ed1722f84b377a49101f4db67f0d3c04daee852301b3
 DIST yubikey_manager-5.4.0.tar.gz.sig 310 BLAKE2B 933a6638b754a8d3f23486f8adeb03e1b9c54d313370675f3e9e517751b495a5f3afae048b9740360459c86bef754618d9b8308cc30d8ae027421ee6f972fef1 SHA512 825d3e455b9cb9263a1336ac2d601fc2e25146ca45f143c16e559c5374c2aa0fc27f0330f5114e58186e02784e1ebda5e864726fea009dfb47377dcf5a3a32f4
diff --git a/app-crypt/yubikey-manager/yubikey-manager-5.2.1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-5.2.1.ebuild
deleted file mode 100644
index fe9eddedfb08..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-5.2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=poetry
-
-inherit distutils-r1 verify-sig
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# According to https://github.com/Yubico/yubikey-manager/issues/518 the release
-# tarballs on Yubico Web site and on GitHub should be identical, and at least
-# for recent releases the latter are signed as well. Only the automatically
-# generated "Source code (tar.gz)" tarballs should not be used.
-# Still, prefer the former if available.
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz
-	verify-sig? ( https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz.sig )"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="ssl"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/yubico.com.asc"
-
-# app-crypt/ccid required for
-# - 'ykman oath'
-# - 'ykman openpgp'
-# - 'ykman piv'
-RDEPEND="
-	app-crypt/ccid
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	<dev-python/cryptography-44[${PYTHON_USEDEP}]
-	dev-python/fido2:0/1.0[${PYTHON_USEDEP}]
-	<dev-python/keyring-25[${PYTHON_USEDEP}]
-	>=dev-python/pyscard-2.0[${PYTHON_USEDEP}]
-	ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
-BDEPEND="
-	test? ( dev-python/makefun[${PYTHON_USEDEP}] )
-	verify-sig? ( >=sec-keys/openpgp-keys-yubico-20220824 )"
-
-S="${WORKDIR}"/${MY_P}
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/ykman.1
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-5.3.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-5.3.0.ebuild
deleted file mode 100644
index a3f8053a2c6a..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-5.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=poetry
-
-inherit distutils-r1 verify-sig
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# According to https://github.com/Yubico/yubikey-manager/issues/518 the release
-# tarballs on Yubico Web site and on GitHub should be identical, and at least
-# for recent releases the latter are signed as well. Only the automatically
-# generated "Source code (tar.gz)" tarballs should not be used.
-# Still, prefer the former if available.
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz
-	verify-sig? ( https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz.sig )"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="ssl"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/yubico.com.asc"
-
-# app-crypt/ccid required for
-# - 'ykman oath'
-# - 'ykman openpgp'
-# - 'ykman piv'
-RDEPEND="
-	app-crypt/ccid
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	<dev-python/cryptography-45[${PYTHON_USEDEP}]
-	dev-python/fido2:0/1.0[${PYTHON_USEDEP}]
-	<dev-python/keyring-25[${PYTHON_USEDEP}]
-	>=dev-python/pyscard-2.0[${PYTHON_USEDEP}]
-	ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
-BDEPEND="
-	test? ( dev-python/makefun[${PYTHON_USEDEP}] )
-	verify-sig? ( >=sec-keys/openpgp-keys-yubico-20220824 )"
-
-S="${WORKDIR}"/${MY_P}
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/ykman.1
-}
diff --git a/app-misc/mc/mc-4.8.30-r2.ebuild b/app-misc/mc/mc-4.8.30-r2.ebuild
index 1d701a9bdb43..7970a6b0d148 100644
--- a/app-misc/mc/mc-4.8.30-r2.ebuild
+++ b/app-misc/mc/mc-4.8.30-r2.ebuild
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic
 
 MY_P="${P/_/-}"
 SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
 HOMEPAGE="https://midnight-commander.org"
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild
index 3531e3631cf7..64e4a5ed7503 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc64 ~riscv x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-python/jaraco-vcs/jaraco-vcs-2.1.0.ebuild b/dev-python/jaraco-vcs/jaraco-vcs-2.1.0.ebuild
index b5ab9cb550d5..b9682eb88b6b 100644
--- a/dev-python/jaraco-vcs/jaraco-vcs-2.1.0.ebuild
+++ b/dev-python/jaraco-vcs/jaraco-vcs-2.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc"
 
 RDEPEND="
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-versioning/jaraco-versioning-1.1.0.ebuild b/dev-python/jaraco-versioning/jaraco-versioning-1.1.0.ebuild
index 4a3bcefbe2f6..1a585db5adc2 100644
--- a/dev-python/jaraco-versioning/jaraco-versioning-1.1.0.ebuild
+++ b/dev-python/jaraco-versioning/jaraco-versioning-1.1.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/rst-linker/rst-linker-2.6.0.ebuild b/dev-python/rst-linker/rst-linker-2.6.0.ebuild
index 714e2cf969fd..ffc74738c341 100644
--- a/dev-python/rst-linker/rst-linker-2.6.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc"
 
 RDEPEND="
 	dev-python/jaraco-context[${PYTHON_USEDEP}]
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 510ceb7c9cfa..66e3836a23e5 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -6,3 +6,5 @@ DIST uv-0.1.24-crates.tar.xz 64420840 BLAKE2B 7324461092a07c86aadaddf051aaa7454e
 DIST uv-0.1.24.gh.tar.gz 899637 BLAKE2B fab26ba9934fc5f586505b5ac1fa386c11f07e51ca2bb2a79f46d5dec9475ba8d75ad8587223d5149df5f2a225146d020a49b7ff81ed26b949cff55892738c2d SHA512 520b47a096b50fce9e7b7af5bca203df9bf4c2d0aafbe28a3dcfe0592d8ddcaa7b58d52300c67454f6aeecfd196f1592be18e45c95b7c67257361917cdb0154d
 DIST uv-0.1.36-crates.tar.xz 65852268 BLAKE2B f9dac75dc992d37c54554c25e0ce0895aa017753a6688754acee5b6a99822e0f55923a539fcd67a8d30332abf1d2b2ed333b8b1125eef5061da2d8f57307004b SHA512 c0dd2171416333f8267592c75699fd35f686d04b3b81241e51cbf4b9f8d1e0def54ab9336b2e62e1fb5e40d3ad73146eba7dd6c0093fa23230d23c4fa73d8f74
 DIST uv-0.1.36.gh.tar.gz 1018114 BLAKE2B c57a3362940803df34f45c0dd2bcc176fb4928d1b0c168adc89d150ffb59a39d0fb57b41c063485a7c324a2101b9f4334cf29e175f910122842f893c6be9970a SHA512 39a4ec3b17803a13a53f331185bfb4fa321f9ee2c158828ad9f88aa7214ee72a58a87dcef74eaeac7a1e3a989909f0d50a457431ce22a72703db0e8c3fc4a6c2
+DIST uv-0.1.37-crates.tar.xz 65881140 BLAKE2B c1a640c44d73d5607c8d07468cefc66c150135b0f0249362148bd2b8f8c99a43c9031a642c0f76140631177df947be7637b49e99e247afbd7efbebb2ad79bcb1 SHA512 99bf6f341f9e6cf8eb0834c436b81453615725cabd3ddc4cca34edb307200bdbb71e913e8ff52a2a1d11e5f1a4abfb4dbdfe40a9c4f114079a7d9fdace0bcaab
+DIST uv-0.1.37.gh.tar.gz 1020667 BLAKE2B 4aa459b15dc06d57d5cad66ebeb5925ec833870dea17f72ef54889f8e8699719cba59bd0600263c1647f17402c002000114d603a474dbcf873ac2f2c37301fb8 SHA512 88d9233bd05e8003b75759e39bc22c469a0094a5ca5b6bd6f2bd8b266b376c44ecfa442f3cd5fff1c099234b660a871153423bacbf785863deb79df321b05574
diff --git a/dev-python/uv/files/uv-0.1.37-test.patch b/dev-python/uv/files/uv-0.1.37-test.patch
new file mode 100644
index 000000000000..0c39b4d3400f
--- /dev/null
+++ b/dev-python/uv/files/uv-0.1.37-test.patch
@@ -0,0 +1,22 @@
+diff --git a/crates/uv/tests/pip_compile.rs b/crates/uv/tests/pip_compile.rs
+index de3336a5..b6884992 100644
+--- a/crates/uv/tests/pip_compile.rs
++++ b/crates/uv/tests/pip_compile.rs
+@@ -3413,7 +3413,7 @@ fn compile_html() -> Result<()> {
+     # This file was autogenerated by uv via the following command:
+     #    uv pip compile requirements.in --cache-dir [CACHE_DIR]
+     jinja2==3.1.2
+-    markupsafe==2.1.3
++    markupsafe==2.1.5
+         # via jinja2
+ 
+     ----- stderr -----
+@@ -7737,7 +7737,7 @@ fn compile_index_url_fallback_prefer_primary() -> Result<()> {
+     ----- stdout -----
+     # This file was autogenerated by uv via the following command:
+     #    uv pip compile --cache-dir [CACHE_DIR] --index-strategy unsafe-any-match requirements.in --no-deps
+-    jinja2==3.1.2
++    jinja2==3.1.3
+ 
+     ----- stderr -----
+     Resolved 1 package in [TIME]
diff --git a/dev-python/uv/uv-0.1.37.ebuild b/dev-python/uv/uv-0.1.37.ebuild
new file mode 100644
index 000000000000..38bbfee404a1
--- /dev/null
+++ b/dev-python/uv/uv-0.1.37.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[async_zip]='https://github.com/charliermarsh/rs-async-zip;1dcb40cfe1bf5325a6fd4bfcf9894db40241f585;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;c26e485213e39582c6f2e4d45c0328422670e7a7;pubgrub-%commit%'
+)
+
+inherit cargo check-reqs
+
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	CRATE_P=${P}
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-DFS-2016
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+DEPEND="
+	dev-libs/libgit2:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=virtual/rust-1.77
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+PATCHES=(
+	# tests are running on live pip index, and need to be updated
+	# whenever upstreams release new packages x_x
+	"${FILESDIR}/${P}-test.patch"
+)
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+}
+
+src_configure() {
+	local myfeatures=(
+		# from upstream defaults
+		flate2/zlib-ng
+		python
+		pypi
+		git
+		maturin
+		# skip tests that require specific patch version of the interpreter:
+		# python-patch
+	)
+
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+}
diff --git a/dev-util/opencl-headers/opencl-headers-2023.12.14.ebuild b/dev-util/opencl-headers/opencl-headers-2023.12.14.ebuild
index e31ba9edaf8a..87de34362981 100644
--- a/dev-util/opencl-headers/opencl-headers-2023.12.14.ebuild
+++ b/dev-util/opencl-headers/opencl-headers-2023.12.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc64 ~riscv x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/gui-apps/wf-shell/wf-shell-0.8.1.ebuild b/gui-apps/wf-shell/wf-shell-0.8.1.ebuild
index f2973774fd55..5714b6ad5e53 100644
--- a/gui-apps/wf-shell/wf-shell-0.8.1.ebuild
+++ b/gui-apps/wf-shell/wf-shell-0.8.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	SLOT="0/0.8"
 else
 	SRC_URI="https://github.com/WayfireWM/wf-shell/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 	SLOT="0/$(ver_cut 1-2)"
 fi
 
diff --git a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.8.1.ebuild b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.8.1.ebuild
index 9a4704dc5c89..dcfe54dfa8b9 100644
--- a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.8.1.ebuild
+++ b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.8.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	SLOT="0/0.8"
 else
 	SRC_URI="https://github.com/WayfireWM/wayfire-plugins-extra/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64"
 	SLOT="0/$(ver_cut 1-2)"
 fi
 
diff --git a/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild b/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild
index 82d800484181..f3277a9f1614 100644
--- a/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild
+++ b/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	SLOT="0/0.8"
 else
 	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 	SLOT="0/$(ver_cut 1-2)"
 fi
 
diff --git a/mail-mta/msmtp/msmtp-1.8.25.ebuild b/mail-mta/msmtp/msmtp-1.8.25.ebuild
index f8f460e9df26..45413de9ffca 100644
--- a/mail-mta/msmtp/msmtp-1.8.25.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="daemon doc keyring +gnutls idn +mta nls sasl ssl"
 
 # fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
diff --git a/media-fonts/terminus-font/terminus-font-4.49.1-r1.ebuild b/media-fonts/terminus-font/terminus-font-4.49.1-r1.ebuild
index faa8d85eb7c5..3fd97b5ef3d2 100644
--- a/media-fonts/terminus-font/terminus-font-4.49.1-r1.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.49.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="OFL-1.1 GPL-2"
 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"
 IUSE="a-like-o +center-tilde distinct-l +otf pcf-8bit +pcf-unicode +psf quote
 	ru-dv +ru-g ru-i ru-k"
 
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.11.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.11.ebuild
index 7565309a3e0a..0c1e39bdc908 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.11.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.11.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.11.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.11.ebuild
index a0471a6a0d84..37d23abcd233 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.11.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
 DEPEND="${RDEPEND}"
diff --git a/media-sound/alsa-tools/alsa-tools-1.2.11.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.11.ebuild
index 8bd584b359a0..5b99762b58ca 100644
--- a/media-sound/alsa-tools/alsa-tools-1.2.11.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.11.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.11.ebuild
index 6986e3604132..69b5aa9a2ca6 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.11.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-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"
 IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux"
 
 DEPEND="
diff --git a/net-misc/linuxptp/linuxptp-4.2.ebuild b/net-misc/linuxptp/linuxptp-4.2.ebuild
index 782ff196d132..b7e1a9386967 100644
--- a/net-misc/linuxptp/linuxptp-4.2.ebuild
+++ b/net-misc/linuxptp/linuxptp-4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/v$(ver_cut 1-2)/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
 
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 4ef924ca46a9..625fd9cc15ae 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -22,7 +22,7 @@ app-emulation/qemu keyutils
 net-fs/cifs-utils ads creds pam
 net-fs/samba ads
 sys-auth/sssd keyutils
-sys-libs/libblockdev cryptsetup
+>=sys-libs/libblockdev-3.0.0 cryptsetup
 sys-libs/libnvme keyutils
 
 # Michał Górny <mgorny@gentoo.org> (2023-10-15)
diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask b/profiles/arch/powerpc/ppc64/package.use.stable.mask
index ca08aef61975..5b398ae9942d 100644
--- a/profiles/arch/powerpc/ppc64/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2024-04-24)
+# sys-apps/flashrom is not marked stable on ppc64 yet
+sys-apps/fwupd flashrom
+
 # Sam James <sam@gentoo.org> (2024-02-07)
 # grpc not stable here
 app-admin/syslog-ng grpc
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 8008676ecec2..fe844c67f2c7 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -41,7 +41,7 @@ app-emulation/qemu keyutils
 net-fs/samba ads
 net-fs/cifs-utils ads creds pam
 sys-auth/sssd keyutils
-sys-libs/libblockdev cryptsetup
+>=sys-libs/libblockdev-3.0.0 cryptsetup
 sys-libs/libnvme keyutils
 
 # Sam James <sam@gentoo.org> (2024-01-02)
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild
index f8a9bd5b940b..ccc75a2c9f42 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.6.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git"
 else
 	SRC_URI="https://github.com/fwupd/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/sys-apps/fwupd/fwupd-1.9.14.ebuild b/sys-apps/fwupd/fwupd-1.9.14.ebuild
index 6553ff479810..89c205df4205 100644
--- a/sys-apps/fwupd/fwupd-1.9.14.ebuild
+++ b/sys-apps/fwupd/fwupd-1.9.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc64 ~riscv x86"
 IUSE="amdgpu amt +archive bash-completion bluetooth cbor elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
diff --git a/sys-apps/uswid/uswid-0.4.7.ebuild b/sys-apps/uswid/uswid-0.4.7.ebuild
index 0d7c386217e0..517b40604bfa 100644
--- a/sys-apps/uswid/uswid-0.4.7.ebuild
+++ b/sys-apps/uswid/uswid-0.4.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 # Reminder: relicensed to BSD-2-with-patent between 0.4.7 and 0.5.0
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
 
 RDEPEND="
 	dev-python/cbor2[${PYTHON_USEDEP}]
diff --git a/sys-fs/udisks/udisks-2.10.1.ebuild b/sys-fs/udisks/udisks-2.10.1.ebuild
index 8054bb7ac7c8..11bf7f211661 100644
--- a/sys-fs/udisks/udisks-2.10.1.ebuild
+++ b/sys-fs/udisks/udisks-2.10.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc64 ~riscv x86"
 IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd"
 
 REQUIRED_USE="