Publish srcux candidate 0000000623-20261010-204610

19 files changed, 13 insertions, 656 deletions

diff --git a/dev-libs/aws-c-mqtt/Manifest b/dev-libs/aws-c-mqtt/Manifest
index 2892be0f1dbe..92a4fc3246c1 100644
--- a/dev-libs/aws-c-mqtt/Manifest
+++ b/dev-libs/aws-c-mqtt/Manifest
@@ -1,5 +1,4 @@
 DIST aws-c-mqtt-0.13.3.tar.gz 444303 BLAKE2B 88636ba6433c93a3984008cf4261d5f6605bd935956fcaafed074b07594f7b405210e1f012a3bdd955d18d572e71653a9fd37280a86ff601bd0ce49fc940c770 SHA512 edd4eade44be803d18f97064adfd98bae4f9c70401f8730876743663da93eb04dbc5aa90b458765430a7e24624f2c9cd7c62c19866235ec6983dd15bf95d8880
 DIST aws-c-mqtt-0.16.0.tar.gz 466531 BLAKE2B 51094d36c3593ae77a430a216e474bdefba88443d506709db7641a04164f41a8d16fcc01e6555ce14e4669a253f61be721e3e5f0226c0275cc98c7aed68689a3 SHA512 10bff6e2e7d84bcc67e62a83ce91e9ecd5e9cae31a41e749707219d4cc9d5bb694718388de1e4d010f7b14cad580f5cdc4becbdfa502ee9f509d350592e4fffb
 DIST aws-c-mqtt-1.0.0.tar.gz 470552 BLAKE2B 02998e120e3515df14bc9327a918da564b7cc041dc78a68e0b179a51e545946606024816ec3f7774e4eeeb29a53ae1aa09a312cb33f439acbfa407a85ce87d82 SHA512 ad0d30e758455fa0b9a2b981cabb206279d45654a8c874319b65bc38b1d1087e7698d01892cae29a4438fe481c2ac81c2ff07e8760fd4fe6cb95ddc90f3621e6
-DIST aws-c-mqtt-1.1.0.tar.gz 473487 BLAKE2B 1f846b9b738186bceeb993cd023b5940b0d34e9244242b7551cb09a30f9e7d9388c743418b33fd5e3d56cd5ad9d1ff3e924ae4e545f388449ed509fdc5835436 SHA512 9933025f21436b61786bd5905bbc8676507843bd12c60f0bf7177812b2db6ab32aeae9d9c3955f9b4c79660f08512a1171d4cfd80a8511edb17aa63766b55d59
 DIST aws-c-mqtt-1.1.1.tar.gz 473456 BLAKE2B 29d03f26b3062f4d914ba2be58136c1744455cc7fb01cc0931975f2d149e50fe8875813334a74ac149b37d8cd9570cd35c1e4832283a7221888bef68655c5b2f SHA512 e6c2df2d3d328317e3a2e9227f4bc7f5d9cbcde3152188e87be18502494918e6cefe6ad341d55bd0e3c7ea20e162032686a273c510f6be1cf081c206261864ce
diff --git a/dev-libs/aws-c-mqtt/aws-c-mqtt-1.1.0.ebuild b/dev-libs/aws-c-mqtt/aws-c-mqtt-1.1.1-r1.ebuild
index 80906897f29a..f05348d0d97a 100644
--- a/dev-libs/aws-c-mqtt/aws-c-mqtt-1.1.0.ebuild
+++ b/dev-libs/aws-c-mqtt/aws-c-mqtt-1.1.1-r1.ebuild
@@ -10,7 +10,8 @@ HOMEPAGE="https://github.com/awslabs/aws-c-mqtt"
 SRC_URI="https://github.com/awslabs/aws-c-mqtt/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1-2)"
+SLOT="0/$(ver_cut 1-2)-fixed"
+[[ ${PV} != 1.1* ]] && die "Remove -fixed above"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/aws-c-mqtt/aws-c-mqtt-1.1.1.ebuild b/dev-libs/aws-c-mqtt/aws-c-mqtt-1.1.1.ebuild
deleted file mode 100644
index 2d21050782b7..000000000000
--- a/dev-libs/aws-c-mqtt/aws-c-mqtt-1.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2025-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="AWS C MQTT: C99 implementation"
-HOMEPAGE="https://github.com/awslabs/aws-c-mqtt"
-SRC_URI="https://github.com/awslabs/aws-c-mqtt/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/aws-c-common-1.0.0:=
-	>=dev-libs/aws-c-http-1.0.0:=
-	>=dev-libs/aws-c-io-1.0.0:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-libs/aws-c-common"
-
-src_configure() {
-	local mycmakeargs=(
-		-DAWS_GET_VERSION_MODULE="${ESYSROOT}/usr/$(get_libdir)/cmake/aws-c-common/modules/AwsGetVersion.cmake"
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	if use test; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
diff --git a/dev-libs/gmp/gmp-6.3.0-r1.ebuild b/dev-libs/gmp/gmp-6.3.0-r1.ebuild
deleted file mode 100644
index 4de48f340c64..000000000000
--- a/dev-libs/gmp/gmp-6.3.0-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gmp.asc
-inherit gnuconfig libtool flag-o-matic multilib-minimal toolchain-funcs verify-sig
-
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-
-MANUAL_PV=6.2.1
-
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-
-DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
-HOMEPAGE="https://gmplib.org/"
-SRC_URI="
-	https://gmplib.org/download/gmp/${MY_P}.tar.xz
-	mirror://gnu/${PN}/${MY_P}.tar.xz
-	doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf )
-	verify-sig? ( https://gmplib.org/download/gmp/${MY_P}.tar.xz.sig )
-"
-S="${WORKDIR}"/${MY_P%a}
-
-LICENSE="|| ( LGPL-3+ GPL-2+ )"
-# The subslot reflects the C & C++ SONAMEs.
-SLOT="0/10.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="+asm doc +cpudetection +cxx pic static-libs"
-REQUIRED_USE="cpudetection? ( asm )"
-RESTRICT="!cpudetection? ( bindist )"
-
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/m4
-	verify-sig? ( sec-keys/openpgp-keys-gmp )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
-HTML_DOCS=( doc )
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch
-	"${FILESDIR}"/${PN}-6.2.1-no-zarch.patch
-)
-
-pkg_pretend() {
-	if use cpudetection && ! use amd64 && ! use x86 ; then
-		elog "Using generic C implementation on non-amd64/x86 with USE=cpudetection"
-		elog "--enable-fat is a no-op on alternative arches."
-		elog "To obtain an optimized build, set USE=-cpudetection, but binpkgs should not then be made."
-	fi
-}
-
-src_unpack() {
-	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig}
-
-	default
-}
-
-src_prepare() {
-	default
-
-	# We cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# bug #536894
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch
-	fi
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/usr/bin/env sh
-	exec env ABI="${GMPABI}" "$0.wrapped" "$@"
-	EOF
-
-	# Patches to original configure might have lost the +x bit.
-	chmod a+rx configure{,.wrapped} || die
-
-	# Save the upstream files named config.{guess,sub} which are
-	# wrappers around the gnuconfig versions.
-	mkdir "${T}"/gmp-gnuconfig || die
-	mv config.guess "${T}"/gmp-gnuconfig/config.guess || die
-	mv config.sub "${T}"/gmp-gnuconfig/config.sub || die
-	# Grab fresh copies from gnuconfig.
-	touch config.guess config.sub || die
-	gnuconfig_update
-	# Rename the fresh copies to the filenames the wrappers from GMP
-	# expect.
-	mv config.guess configfsf.guess || die
-	mv config.sub configfsf.sub || die
-}
-
-multilib_src_configure() {
-	# Generally a very fragile package
-	strip-flags
-	# Miscompiled with LTO at least on arm64, bug #889948
-	# 6.3.0 says it now supports LTO, but needs retesting on a variety
-	# of platforms. Fix was maybe https://gmplib.org/repo/gmp-6.3/rev/9c324044f4b5.
-	filter-lto
-	# https://gmplib.org/list-archives/gmp-bugs/2024-November/005550.html
-	append-cflags $(test-flags-CC -std=gnu17)
-
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-
-	# https://gmplib.org/manual/Notes-for-Package-Builds
-	local myeconfargs=(
-		# -std=gnu99 appended here for bug #919935 to help
-		# prefix building w/ older compilers.
-		CC_FOR_BUILD="$(tc-getBUILD_CC) -std=gnu99"
-
-		--localstatedir="${EPREFIX}"/var/state/gmp
-		--enable-shared
-
-		$(use_enable asm assembly)
-		# fat is needed to avoid gmp installing either purely generic
-		# or specific-to-used-CPU (which our config.guess refresh prevents at the moment).
-		# Both Fedora and opensuse use this option to tackle the issue, bug #883201.
-		#
-		# This only works for amd64/x86, so to get accelerated performance
-		# (i.e. not using the generic C), one needs USE=-cpudetection if
-		# on non-amd64/x86.
-		#
-		# (We do not mask USE=cpudetection on !amd64/x86 because we want
-		# the flag to be useful on other arches to allow opting out of the
-		# config.guess logic below.)
-		$(use_enable cpudetection fat)
-		$(use_enable cxx)
-		$(use_enable static-libs static)
-
-		# --with-pic forces static libraries to be built as PIC
-		# and without TEXTRELs. musl does not support TEXTRELs: bug #707332
-		$(use pic && echo --with-pic)
-
-		# XXX: In the past, we had PGO support with upstream's 'tuneup' script
-		# per https://gmplib.org/manual/Performance-optimization, but we had
-		# a variety of issues with it: bug #454912, bug #650558, and bug #658688.
-	)
-
-	# Move the wrappers from GMP back into place (may have been destroyed by previous econf run)
-	cp "${T}"/gmp-gnuconfig/config.guess "${S}"/config.guess || die
-	cp "${T}"/gmp-gnuconfig/config.sub "${S}"/config.sub || die
-
-	# See bug #883201 again.
-	if ! use cpudetection && ! tc-is-cross-compiler ; then
-		local gmp_host=$("${S}"/config.guess || die "failed to run config.guess")
-
-		if [[ -z ${gmp_host} ]] ; then
-			die "Empty result from GMP's custom config.guess!"
-		fi
-
-		einfo "GMP guessed processor type: ${gmp_host}"
-		ewarn "This build will only work on this machine. Enable USE=cpudetection for binary packages!"
-		export ac_cv_build="${gmp_host}"
-		export ac_cv_host="${gmp_host}"
-	fi
-
-	# Clang with -fsanitize=address may emit weird section names in its asm,
-	# which causes gmp's configure checks to select a broken way of
-	# specifying `.rodata`. Disable this feature, which was introduced in
-	# Clang 15 (and defaulted to on in Clang 18).
-	if tc-is-clang && [[ "$(clang-major-version)" -ge 15 ]]; then
-		append-cxxflags "-fno-sanitize-address-globals-dead-stripping"
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Should be a standalone lib
-	rm -f "${ED}"/usr/$(get_libdir)/libgmp.la
-
-	# This requires libgmp
-	local la="${ED}/usr/$(get_libdir)/libgmpxx.la"
-	if ! use static-libs ; then
-		rm -f "${la}" || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	use doc && cp "${DISTDIR}"/gmp-man-${MANUAL_PV}.pdf "${ED}"/usr/share/doc/${PF}/
-}
diff --git a/dev-libs/libevdev/libevdev-1.13.7.ebuild b/dev-libs/libevdev/libevdev-1.13.7.ebuild
index 716471236929..eca5ee180daf 100644
--- a/dev-libs/libevdev/libevdev-1.13.7.ebuild
+++ b/dev-libs/libevdev/libevdev-1.13.7.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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 7b6b879e0478..22103ba71bec 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,6 +1,2 @@
-DIST mpc-1.3.1.tar.gz 773573 BLAKE2B 76434e6f8830af3571836d51576bfebbc9701e9bbb5c4686f134081cd96cd90ae02f7ff42bf9e3957c7a7ba92b6b2d9cdabe18f0269271147521cd7f6a2d551c SHA512 4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97
-DIST mpc-1.3.1.tar.gz.sig 119 BLAKE2B ec48cf3a37c3b4a923b354d5e321d73561361586dd6dee2ccfaf7e05021ec43dd34e6045dec475a47fae36cf5b36d9b3901ba677cb1bfc9016c3f28392c46099 SHA512 5c2e6cccf9c5e6a401095e4abf4c4c8eb44ae4cd81debaa94da817f68f7ef39a732e969d5c264912b0a44fd2a0575e2f903d71def38cb95fa073851e3a537e5c
-DIST mpc-1.4.0.tar.xz 532056 BLAKE2B d00dbc52a92efd619498671475743c9f35797343c731542f881c04c4a0b198f5b36df51bfde3ce520866d1851958409a6dd0de02d85d7b2e0ba00ccb27a30464 SHA512 de297e434b05905101b5a860e732b598da82129bdc28e3efebc0b36a107b6f2f4ae6962f55921ee20193df1dab241caf74dfc5d4dc1ae4b4edefbbcfe5b9c762
-DIST mpc-1.4.0.tar.xz.sig 119 BLAKE2B 6e821ce7e8ba4ba6f5622eaba8859d373bb3dae4bafa6c8d7295b74d55034fe73c7d30388744727164cb1ca124ddf305e9f3055fe9c583f5365468103509e6a1 SHA512 55d8aa606c683543bff8e766b46b5edc35759d1465b0fb51ef953e9c40dfcf4d1853277b7d98d231eee160dbfb68a3b7742d8226d01c8980f6cf4c23ff05d2d1
 DIST mpc-1.4.1.tar.xz 531992 BLAKE2B 793b4cf37e7e805dcbf24bc39903d5d778702e80cf5eac60b840834f09868656856a008cff6b45e7a5a312c3ed21a593d84f45765e9ac456ab3dd38a083acff1 SHA512 cdfbe64e80e30df64dbd536e8104a6bb10471582415d5b45a1dd30eb2a312781b38389a9531243413c14e0f88866a35159b20e77900718f28c1030253a1305b9
 DIST mpc-1.4.1.tar.xz.sig 119 BLAKE2B 433c8192edfc88d30876c26dd500ab6bb6943e6884d251b879f6da5bde0ce569d6509991a5035ba189fa6a04185c89d539539003f0ee1e56d5ccd607244736bc SHA512 1145e1f50c523596178cd3719eef35628467b203949fe350cb1be514095497cccae0b98f652c26e30c96babddf83a09ce12096360feea9b4f5fa96ad488cc71e
diff --git a/dev-libs/mpc/mpc-1.3.1.ebuild b/dev-libs/mpc/mpc-1.3.1.ebuild
deleted file mode 100644
index c1a56414074c..000000000000
--- a/dev-libs/mpc/mpc-1.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mpc.asc
-inherit multilib-minimal verify-sig
-
-DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
-HOMEPAGE="https://www.multiprecision.org/mpc/ https://gitlab.inria.fr/mpc/mpc"
-
-if [[ ${PV} == *_rc* ]] ; then
-	SRC_URI="https://www.multiprecision.org/downloads/${P/_}.tar.gz"
-	S="${WORKDIR}"/${PN}-$(ver_cut 1-3)
-else
-	SRC_URI="
-		mirror://gnu/${PN}/${P}.tar.gz
-		verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )
-	"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="LGPL-3+ FDL-1.3+"
-SLOT="0/3" # libmpc.so.3
-IUSE="static-libs"
-
-DEPEND="
-	>=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/mpfr-4.1.0:=[${MULTILIB_USEDEP},static-libs?]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	verify-sig? ( sec-keys/openpgp-keys-mpc )
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/mpc/mpc-1.4.0.ebuild b/dev-libs/mpc/mpc-1.4.0.ebuild
deleted file mode 100644
index 34561a870468..000000000000
--- a/dev-libs/mpc/mpc-1.4.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mpc.asc
-inherit multilib-minimal verify-sig
-
-DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
-HOMEPAGE="https://www.multiprecision.org/mpc/ https://gitlab.inria.fr/mpc/mpc"
-
-if [[ ${PV} == *_rc* ]] ; then
-	SRC_URI="https://www.multiprecision.org/downloads/${P/_}.tar.xz"
-	S="${WORKDIR}"/${PN}-$(ver_cut 1-3)
-else
-	SRC_URI="
-		mirror://gnu/${PN}/${P}.tar.xz
-		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
-	"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="LGPL-3+ FDL-1.3+"
-SLOT="0/3" # libmpc.so.3
-IUSE="static-libs"
-
-DEPEND="
-	>=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/mpfr-4.1.0:=[${MULTILIB_USEDEP},static-libs?]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	verify-sig? ( sec-keys/openpgp-keys-mpc )
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index af997c21670a..e20d5fc2d453 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,4 +1,2 @@
-DIST mpfr-4.2.1.tar.xz 1493608 BLAKE2B ad69f53bc910294647523e7613b18a683f1d0f3dd994168ab2a46b66d0371ffa9b8e7cb59495f898470aea69d343e83fc722f11babe4af7b3a12665a1e65860c SHA512 bc68c0d755d5446403644833ecbb07e37360beca45f474297b5d5c40926df1efc3e2067eecffdf253f946288bcca39ca89b0613f545d46a9e767d1d4cf358475
-DIST mpfr-4.2.1.tar.xz.asc 228 BLAKE2B a50ccf4136c3b460b15540364a49dec05da266a77bce6220832262581fa57cc1e70b7739ea4fdf2e8ad4fd3318151b8c420b09597942493d95e6276f380debfd SHA512 2f409f2a93726fba086882de3ad26d0bcb5d78afc687e44550bf55a98b940ff0d355a655aa18da78bfa2581ef37d72cb630d7642de7ec70590ec80044b3dbe38
 DIST mpfr-4.2.2.tar.xz 1505596 BLAKE2B 6bbf5658e70fbb673a3b65246a6bac708d1571aa6943c6742efd92f468ac71e6f0fe351b757f7133440ea312d9a5fc3549acd89d54f4d975c58bdc204d7b21ec SHA512 eb9e7f51b5385fb349cc4fba3a45ffdf0dd53be6dfc74932dc01258158a10514667960c530c47dd9dfc5aa18be2bd94859d80499844c5713710581e6ac6259a9
 DIST mpfr-4.2.2.tar.xz.asc 228 BLAKE2B 9e43ca847d140f78d658b108a699eeb34817c65f60e513a5540450444ae87fc4a087e71c4590b246db6fad253f1c3593c54935200ef22125ac7d514e590dc158 SHA512 ca6ff27d4ac3ac66735cd0b61e1e958217a2d7a4b30abccfda5e49c228bf594a722878992a1816a8f2531c3420aab6f8cdd3d60fd36a66765e9070e901ceac9d
diff --git a/dev-libs/mpfr/mpfr-4.2.1.ebuild b/dev-libs/mpfr/mpfr-4.2.1.ebuild
deleted file mode 100644
index b0e43e8dd871..000000000000
--- a/dev-libs/mpfr/mpfr-4.2.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vincentlefevre.asc
-inherit multilib-minimal verify-sig
-
-# Upstream distribute patches before a new release is made
-# See https://www.mpfr.org/mpfr-current/#bugs for the latest version (and patches)
-
-# Check whether any patches touch e.g. manuals!
-# https://archives.gentoo.org/gentoo-releng-autobuilds/message/c2dd39fc4ebc849db6bb0f551739e2ed
-MY_PV=${PV%%_p*}
-MY_PATCH=$(ver_cut 5-)
-MY_PATCHES=()
-MY_P=${PN}-${MY_PV/_/-}
-
-DESCRIPTION="Library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="https://www.mpfr.org/ https://gitlab.inria.fr/mpfr"
-SRC_URI="https://www.mpfr.org/${PN}-$(ver_cut 1-3)/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://www.mpfr.org/${PN}-$(ver_cut 1-3)/${MY_P}.tar.xz.asc )"
-
-if [[ ${PV} == *_p* ]] ; then
-	# If this is a patch release, we have to download each of the patches:
-	# -_pN = N patches
-	# - patch file names are like: patch01, patch02, ..., patch10, patch12, ..
-	#
-	# => name the ebuild _pN where N is the number of patches on the 'bugs' page.
-	patch_url_base="https://www.mpfr.org/${MY_P}"
-	my_patch_index=
-
-	for ((my_patch_index=1; my_patch_index <= MY_PATCH ; my_patch_index++)) ; do
-		printf -v mangled_patch_ver "patch%02d" "${my_patch_index}"
-
-		SRC_URI+=" ${patch_url_base}/${mangled_patch_ver} -> ${MY_P}-${mangled_patch_ver}.patch"
-
-		MY_PATCHES+=( "${DISTDIR}"/${MY_P}-${mangled_patch_ver}.patch )
-	done
-
-	unset patch_url_base my_patch_index mangled_patch_ver
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3+"
-# This is a critical package; if SONAME changes, bump subslot but also add
-# preserve-libs.eclass usage to pkg_*inst! See e.g. the readline ebuild.
-SLOT="0/6" # libmpfr.so version
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-fi
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-vincentlefevre )"
-
-PATCHES=(
-	# Apply the upstream patches released out-of-band; generated above
-	"${MY_PATCHES[@]}"
-
-	# Additional patches
-)
-
-HTML_DOCS=( doc/FAQ.html )
-
-src_unpack() {
-	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-
-	# Avoid src_unpack noise from patches
-	unpack ${MY_P}.tar.xz
-}
-
-src_prepare() {
-	default
-
-	# 4.1.0_p13's patch10 patches a .texi file *and* the corresponding
-	# info file. We need to make sure the info file is newer, so the
-	# build doesn't try to run makeinfo. Won't be needed on next release.
-	#touch "${S}/doc/mpfr.info" || die
-}
-
-multilib_src_configure() {
-	# bug #476336#19
-	# Make sure mpfr doesn't go probing toolchains it shouldn't
-	ECONF_SOURCE="${S}" \
-		user_redefine_cc=yes \
-		econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
-
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 682f57185d51..e1cdef8a1b20 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,12 +1,7 @@
 DIST opencl-clang-17.0.10.tar.gz 60029 BLAKE2B 59229343ae8ee3c81f11dcb550bbcf09a4e80aad32438aa9f7180e316ea28a9585db40de35ac9d912ae7962ee7a896bafe27373bcfaf2da74343b99a436b8042 SHA512 c634fea76e8d44c50f998fb5761d3ac4a4d0d1847a40ad746a092f9dfb61f40fb16901a52b348c0be06b694688e2af96e37203b2c1313ca437d5996a5d0680f2
-DIST opencl-clang-17.0.8.tar.gz 41372 BLAKE2B 9c7d6b4ab277084d9731d3ccc5be918d5a2e59381050dc58f0a2c9f3b79efc3b12be69a2044db13186d484c8d1b397b4d4e8e69ca4756588c96f89c92df00190 SHA512 018003729903b2487385b94c6ea609fbef325a087dca14a4f1e4ecdcf40377df7b3bce3bf144539bca4b3018d4c32249411656a9bfa27c1c4e615068ec86165d
-DIST opencl-clang-18.1.7.tar.gz 36888 BLAKE2B eba2f8359c7af4e9b3919631a1e01fd94b6eec9e7bd1d593aebb4c6a43a2b7d54447c9420f2c5f2ab02adf2f4623df2cc3195084d74f9750aff5bd9a726651e2 SHA512 a8940deed549ae76021e14683cea954f5a3a55db6c4ed99e6d1b71ada7c514c2e81798668a3035a42e6bbaca13fafaa09927e31a5c7a65aa6ec0611d29b6f6fc
 DIST opencl-clang-18.1.9.tar.gz 54669 BLAKE2B 7d9085b39b8d8e2756e445d4e9b5e0a6cbbf856b0591270ef00f3d2bb62f53f86a25ec55a026e99f979edab9c5cbffdaaa6d3f76dc6a47fe652be6ff5c032a22 SHA512 a2e5b30e93a6a01622e414bd56391f0292faeb89ec67e45ebe451bd5d34f7649ec50a0bacf21fd79b3463767617948e3bc99aed3350d92756526fac527a83be9
-DIST opencl-clang-19.1.5.tar.gz 41985 BLAKE2B 1dba88914fde11e95c415bd27f77ef5d38be743cb0f799888a0229c0776d5cec36b22d17da36bfbf0bf6639620843cb8b31edae9752381be59c4e75acf60f9e9 SHA512 cdfdcbd920b61bfefa40451846155d760deb176618afae4968713ebacfb323d647f54ca0ed26d753f47c894f362573b323fc52dc51cef95ed9ca525f3cc3f34e
 DIST opencl-clang-19.1.7.tar.gz 60979 BLAKE2B 545d100d7d27d7ae444da85be47347400066938d1b7898af1b49a75cc33b6e128f39a310270c561b0069268681fcd1b8076759d4e7d74d41e8e7e690b548de31 SHA512 1755d2c530ad88689b3a0c0cdeec3db09facef40d1ffef8bf26122387c36cce7014894d9ff79f8d50392785b1164bb587ae3bc54d44f50029dc9c3cc8451db78
-DIST opencl-clang-20.1.5.tar.gz 43134 BLAKE2B ff801e655719b85c6ec1970ef102955768b634924710af393b127d8182497a62d976321888378c996e7b76c11fed75c6f04e0e96f5fd3354aafc158bc96acdb3 SHA512 43f3e82de6eb9a3f875e99e9fb6782bcaf5415744f84abf4cf6f183bc36fb533e69eb0ae30ea1ef7588e4ed4adec2b30c617cf995daa958fd29a0bdc02e975f5
 DIST opencl-clang-20.1.7.tar.gz 62170 BLAKE2B 8a0f556ce8622ad2b20076d8e3e3b0ebfd04237e91fe512054d4e4ffc111debd37f44942c290cd4df215c7e0f4766d6372338fe175048a7215170e65db59b187 SHA512 6f6d0f82c725727508fa3c15c4ec0c15c15bca8ca84582ea6c25373b4ba0eda80192eb93d3675ddb2ffe32c2c673e5c59874d20443a51e00ed45a36acd32b050
-DIST opencl-clang-21.1.5.tar.gz 43121 BLAKE2B 1fbc3331af1cc4b0ff3eebffaf93f8a8029bc22c9524bc8ffc4e5438677f7e1a985c10f5fecc49fcd1fc674fccf1a3ff43969938a61e7f1a4cf89af4a716e958 SHA512 d16e6072167ec2738f335e258b290f37378bfc0ae24376a988d0d2f6f5d5daac3a8326e2c74e0485ed0401e3e0cb28edce405d6762c8234b08f65487c5ac3c69
 DIST opencl-clang-21.1.7.tar.gz 62139 BLAKE2B 1390c234591a8ff0f51091b452eae78744aae80e3e44498e7b740205db5e16c04d12b571be64a8ed3c2b2746205e92f5d0763533c9d4700309d0b8d7e55acd4e SHA512 b039a0fb25881fde55e286c6f96a4334314c3b1dd77c9fa001a735bff9eda839b36cb0c9531c7f61425e02f140778acf69ead26cbd8d59f5a2a87602f814a815
-DIST opencl-clang-22.1.2.tar.gz 44224 BLAKE2B a87780c590ee626b81dc9b110af5d6dd986fa4af27c508519b29e89f803918f330e0c8396f0463a5562ee4ae4344b4c7ecdf0d90c538b56867990a3d02d07cd0 SHA512 79fbf1f5eb93215d70c300795ce3f5ad577dbaf42d1cb30e3e968ad99c558f33c24a3745aa33d7a57ed82e6e0c2533e571dd7dd371b523572b30afd0de1c18cc
 DIST opencl-clang-22.1.4.tar.gz 63211 BLAKE2B 1afd2ec63641f8ee5dcc3f58d6cfcaebabe6eb0fc4910d51209554ab131fa020e3a79f5b66d1e772ac3c4b873996a047780d649a3786bf12ed6b98d802bb5acb SHA512 fdcdd0343b1f06580bd35a8c82971ad03deb52481b0c1469f126f683b7fac7844ff58d652c8cf86d6c54a71c114901d51a2e603786aa03ca57ad503c064e843a
+DIST opencl-clang-23.1.0.tar.gz 9456807 BLAKE2B d78387b8fc292d3dde828fbae44f192b1f25017e0b402876916f3f295319b22d92d7c5bd1f5a71095635d55cd3fc524cfd6584a6790699523a8b6144516c0b4c SHA512 64403cbfc642d8b1d4357434f519b800b2d7213c9c431edceeb57a2187d7330947fedc26133ebb2dafb058902c56bfd189c9a8e5b1cdc69deaf8eebf4a77bb55
diff --git a/dev-libs/opencl-clang/opencl-clang-17.0.8.ebuild b/dev-libs/opencl-clang/opencl-clang-17.0.8.ebuild
deleted file mode 100644
index c75a49e1ee6f..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-17.0.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 17 )
-
-inherit cmake llvm-r2
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	dev-util/spirv-llvm-translator:${SLOT}=
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
-		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
-		-DPREFERRED_LLVM_VERSION="${LLVM_SLOT}"
-		-DUSE_PREBUILT_LLVM="ON"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-18.1.7.ebuild b/dev-libs/opencl-clang/opencl-clang-18.1.7.ebuild
deleted file mode 100644
index 7c382fbfde29..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-18.1.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 18 )
-
-inherit cmake llvm-r2
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	dev-util/spirv-llvm-translator:${SLOT}=
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
-		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
-		-DUSE_PREBUILT_LLVM="ON"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-20.1.5.ebuild b/dev-libs/opencl-clang/opencl-clang-20.1.5.ebuild
deleted file mode 100644
index 1636478fc6cf..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-20.1.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 20 )
-
-inherit cmake llvm-r2
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	dev-util/spirv-llvm-translator:${SLOT}=
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
-		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
-		-DUSE_PREBUILT_LLVM="ON"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-21.1.5.ebuild b/dev-libs/opencl-clang/opencl-clang-21.1.5.ebuild
deleted file mode 100644
index dee45d345675..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-21.1.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 21 )
-
-inherit cmake llvm-r2
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	dev-util/spirv-llvm-translator:${SLOT}=
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
-		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
-		-DUSE_PREBUILT_LLVM="ON"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-22.1.2.ebuild b/dev-libs/opencl-clang/opencl-clang-22.1.2.ebuild
deleted file mode 100644
index 21e6b0daa9c5..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-22.1.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 22 )
-
-inherit cmake llvm-r2
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	dev-util/spirv-llvm-translator:${SLOT}=
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
-		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
-		-DUSE_PREBUILT_LLVM="ON"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-19.1.5.ebuild b/dev-libs/opencl-clang/opencl-clang-23.1.0.ebuild
index 7a6e850b48c6..0ad5fe6d9aeb 100644
--- a/dev-libs/opencl-clang/opencl-clang-19.1.5.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-23.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LLVM_COMPAT=( 19 )
+LLVM_COMPAT=( 23 )
 
 inherit cmake llvm-r2
 
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
@@ -29,10 +29,15 @@ DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
 
 src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d llvm-core/llvm:${LLVM_SLOT})"
+	local llvm_version="${llvm_version%%-r*}"
+
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
 		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
 		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
+		-DPREFERRED_LLVM_VERSION="${llvm_version##*-}"
 		-DUSE_PREBUILT_LLVM="ON"
 		-Wno-dev
 	)
diff --git a/dev-libs/simdjson/simdjson-4.6.11.ebuild b/dev-libs/simdjson/simdjson-4.6.11.ebuild
index 9b89182eacef..df7a64d3d971 100644
--- a/dev-libs/simdjson/simdjson-4.6.11.ebuild
+++ b/dev-libs/simdjson/simdjson-4.6.11.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
 SLOT="0/33"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+all-impls test tools"
 
 BDEPEND="
diff --git a/dev-libs/wayland/wayland-1.26.0.ebuild b/dev-libs/wayland/wayland-1.26.0.ebuild
index c6e4de75278e..532e10cfe895 100644
--- a/dev-libs/wayland/wayland-1.26.0.ebuild
+++ b/dev-libs/wayland/wayland-1.26.0.ebuild
@@ -8,7 +8,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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 inherit meson-multilib