gentoo auto-resync : 26:05:2024 - 00:07:27

26 files changed, 300 insertions, 610 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 936f5580256c..59dc2bdab305 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-ndk/Manifest b/dev-util/android-ndk/Manifest
deleted file mode 100644
index 0dc2164da2cb..000000000000
--- a/dev-util/android-ndk/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST android-ndk-r11c-linux-x86_64.zip 794135138 BLAKE2B e048c6c7172aafce47e5961669e8130780a060190854316edde8e2aca763055cba8bb739dcb8aa51227a798d19b36a11bf2e7591f817070c153f05a2e5d74fd4 SHA512 c0de562061c9f08bcd1ae05b1de26898788e71cc7dc40502348214edd5a90f1bf8125721e587b341f6fe774fc79b1a6e28b3f702f3275e016baa0382fcea2767
-DIST android-ndk-r13b-linux-x86_64.zip 687311866 BLAKE2B 2db7bfd9fa937d5f28fa238494e73ad1d09c539627308aa7f4e2c4114c6762dc908b1752b42dccf792f9c71ff7e3b5e08b2b03e7eac3ff5bea497c33d479d60a SHA512 39f3bd2d0e1daca11870df2e2ef318ad070b19163a55e2c1c4a1a871e02f8ec51263d7cf4b6da54eaadbe4253b5c11b85f4c5aeb67fccfff9147a5c420589d12
-DIST android-ndk-r14b-linux-x86_64.zip 840626594 BLAKE2B 5032893ee34e7167c5af5216d7b1357c3f9dcef136d63fa9a1d6c4849471430ac21a741e1c2439ec62b5cb1fa79af9ff39b46c31073e47e7a6f7c41e1a1a448b SHA512 24435267fc5acae559aa5159f7c895ce5ea0cbb8ef966bb8ff0dadffcadccbe46bc3880d285bf4e411ef78632cf2f862408e7b2b41ebca51078b41eac66a301a
-DIST android-ndk-r16b-linux-x86_64.zip 852525873 BLAKE2B 18f6e602d88ef0a8f1a7f31bc127547c32bc2fb133d5c87ca4d2f7099f79b54d67f578a68fcd59e94c84934ca2006decca5b09eac566f2f99d609862d4036e48 SHA512 94cd879925ee3174a9267e7da2d18d71874173976b362101ec06598a94b6587a33671e54bbbce5778c04418aacbb831e98386c16f6cde04574ea8c8589553dd7
-DIST android-ndk-r18-linux-x86_64.zip 556932539 BLAKE2B 52bde148e142fe72402d8ab6709b1dcb611f74c0cb8b511b3f0e69a2b6940ee5e05b1d4bd45fdff80f74f65ca3d8176de46bd0a3aa28e2dfd430fc07eab23d69 SHA512 7a8b372be53a7d5a008b6cafda451096623af33aea910edd8e98ee4b15682da5d2ad641727ab12eca522ba965073a3eb247cd3cd850c9b602e2c7b1cd6eec708
-EBUILD android-ndk-11c-r1.ebuild 1682 BLAKE2B f173dcb9b1dd77557cf1c8d65535d1685899396ad934a5823a1b2945b0acc6e25b154a679977cf972e33a222e32419dcfa50c1723ac7c659b29707b814edf4fa SHA512 fa6ddc88f436701143d623899af681a3973498dd8cb49a7e4196d2542ca10d8e149e90500060ecb632a9e4ecab4f3ae5c22066d25d9ca8208224e29cfb7faa16
-EBUILD android-ndk-11c.ebuild 1635 BLAKE2B 3a95feca41b97a302948fd4c304fce5c4272fa328142c9bec80bef3f56d551523d117bc59ae1ce4bb1aaf31439f72d8dffeb7412d17002cc32bdbca4ee5764fc SHA512 26734da5a03bd69a87a93f10ed6b1a2fd9bd5860e0ea9dc605209cd2c4b18a3d43a8bc8deee76e4cad582df36c75067ca94da43f1896eaffbdba5110fc33d72b
-EBUILD android-ndk-13b.ebuild 1682 BLAKE2B f173dcb9b1dd77557cf1c8d65535d1685899396ad934a5823a1b2945b0acc6e25b154a679977cf972e33a222e32419dcfa50c1723ac7c659b29707b814edf4fa SHA512 fa6ddc88f436701143d623899af681a3973498dd8cb49a7e4196d2542ca10d8e149e90500060ecb632a9e4ecab4f3ae5c22066d25d9ca8208224e29cfb7faa16
-EBUILD android-ndk-14b.ebuild 1651 BLAKE2B dfceca163d31f4039a8263e7e76352ebda42d6ec2238af4017c705e4d58b09dfbe27e3c2ebb12b306a365f0da3c107fc43b04ffb53fc6b0e1fc9ad0b2de796d9 SHA512 62a814cd7b1f95299624655af9b5783a508177ae27a5cb1359c0db9238a861c208017ffbb1569a56c6302809ec2b0c0f203e946e0723687686f59b080d5dd416
-EBUILD android-ndk-16b.ebuild 1651 BLAKE2B dfceca163d31f4039a8263e7e76352ebda42d6ec2238af4017c705e4d58b09dfbe27e3c2ebb12b306a365f0da3c107fc43b04ffb53fc6b0e1fc9ad0b2de796d9 SHA512 62a814cd7b1f95299624655af9b5783a508177ae27a5cb1359c0db9238a861c208017ffbb1569a56c6302809ec2b0c0f203e946e0723687686f59b080d5dd416
-EBUILD android-ndk-18.ebuild 1625 BLAKE2B 32fba25bea1f821dced3924f97e20cb5a726c3f08e28c4bf9311965f916af46ecfc16f6024da8a7eafe876ac0cffd09ec4c248c5d6589726e7e9ad999c6e2188 SHA512 0514c531d46d642e301850c572681363b72060e5289adab7b0df2995ba7db6af8c14da967950d2e4b4676111ba30d5ce542f14c8f417b1597559e6c260deb69c
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-util/android-ndk/android-ndk-11c-r1.ebuild b/dev-util/android-ndk/android-ndk-11c-r1.ebuild
deleted file mode 100644
index 7f937f777d2e..000000000000
--- a/dev-util/android-ndk/android-ndk-11c-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="6G"
-inherit check-reqs
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="https://developer.android.com/ndk/"
-SRC_URI="https://dl.google.com/android/repository/${PN}-r${PV}-linux-x86_64.zip"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="bindist mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=dev-build/make-3.81
-	|| (
-		sys-libs/ncurses:0/5[tinfo]
-		sys-libs/ncurses-compat:5[tinfo]
-	)
-	virtual/libcrypt"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,platforms,prebuilt}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{python-packages,sources,toolchains}
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-11c.ebuild b/dev-util/android-ndk/android-ndk-11c.ebuild
deleted file mode 100644
index 5d0c26df6b70..000000000000
--- a/dev-util/android-ndk/android-ndk-11c.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="6G"
-inherit check-reqs
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="https://developer.android.com/ndk/"
-SRC_URI="https://dl.google.com/android/repository/${PN}-r${PV}-linux-x86_64.zip"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="bindist mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=dev-build/make-3.81
-	sys-libs/ncurses-compat:5
-	virtual/libcrypt"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,platforms,prebuilt}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{python-packages,sources,toolchains}
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-13b.ebuild b/dev-util/android-ndk/android-ndk-13b.ebuild
deleted file mode 100644
index 7f937f777d2e..000000000000
--- a/dev-util/android-ndk/android-ndk-13b.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="6G"
-inherit check-reqs
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="https://developer.android.com/ndk/"
-SRC_URI="https://dl.google.com/android/repository/${PN}-r${PV}-linux-x86_64.zip"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="bindist mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=dev-build/make-3.81
-	|| (
-		sys-libs/ncurses:0/5[tinfo]
-		sys-libs/ncurses-compat:5[tinfo]
-	)
-	virtual/libcrypt"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,platforms,prebuilt}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{python-packages,sources,toolchains}
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-14b.ebuild b/dev-util/android-ndk/android-ndk-14b.ebuild
deleted file mode 100644
index ba111dc0f626..000000000000
--- a/dev-util/android-ndk/android-ndk-14b.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="6G"
-inherit check-reqs
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="https://developer.android.com/ndk/"
-SRC_URI="https://dl.google.com/android/repository/${PN}-r${PV}-linux-x86_64.zip"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="bindist mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=dev-build/make-3.81
-	|| (
-		sys-libs/ncurses:0/5[tinfo]
-		sys-libs/ncurses-compat:5[tinfo]
-	)
-	virtual/libcrypt"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,platforms,prebuilt}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{python-packages,sources,toolchains}
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	echo "PATH=\"${ANDROID_PATH}\"" > "${T}/80${PN}" || die
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-16b.ebuild b/dev-util/android-ndk/android-ndk-16b.ebuild
deleted file mode 100644
index ba111dc0f626..000000000000
--- a/dev-util/android-ndk/android-ndk-16b.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="6G"
-inherit check-reqs
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="https://developer.android.com/ndk/"
-SRC_URI="https://dl.google.com/android/repository/${PN}-r${PV}-linux-x86_64.zip"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="bindist mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=dev-build/make-3.81
-	|| (
-		sys-libs/ncurses:0/5[tinfo]
-		sys-libs/ncurses-compat:5[tinfo]
-	)
-	virtual/libcrypt"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,platforms,prebuilt}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{python-packages,sources,toolchains}
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	echo "PATH=\"${ANDROID_PATH}\"" > "${T}/80${PN}" || die
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-18.ebuild b/dev-util/android-ndk/android-ndk-18.ebuild
deleted file mode 100644
index e10c0a503b0e..000000000000
--- a/dev-util/android-ndk/android-ndk-18.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="6G"
-inherit check-reqs
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="https://developer.android.com/ndk/"
-SRC_URI="https://dl.google.com/android/repository/${PN}-r${PV}-linux-x86_64.zip"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="bindist mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=dev-build/make-3.81
-	sys-libs/ncurses-compat:5[abi_x86_32(-),tinfo]
-	virtual/libcrypt"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,platforms,prebuilt}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{python-packages,sources,toolchains}
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	echo "PATH=\"${ANDROID_PATH}\"" > "${T}/80${PN}" || die
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/metadata.xml b/dev-util/android-ndk/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/dev-util/android-ndk/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index ba9e611c3d36..7fa2a19f07dd 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -3,5 +3,5 @@ DIST aruba-2.1.0.tar.gz 130073 BLAKE2B 534bc67cbc4b5871a1bc6e37170586b3a5829e70d
 DIST aruba-2.2.0.tar.gz 130616 BLAKE2B f2f359d5ba79232e575a240e6d278b936f17d532d01e58f840f537a4d1e6a3663c04b24636aa20fda64ac3eccd4111c61d2f18e26e8c18cef35c7eeaaf7d797b SHA512 e4802dd915062b61e0a536d31294165310ce80aca3e4560f59bb23fcb3e01ea73a547d3f5738d3590c33175fb55268fa69512fe8f33f7cea6b83070e26b7cfee
 EBUILD aruba-0.6.2-r3.ebuild 1051 BLAKE2B 74adb785f62d6ca6379a782b93de3634bbde652e593eb897954b613a529d4389a022a9345fd0606b6c2762675c78e215231bdc5cf31fe40f9628ea2eb2ced212 SHA512 b6fee287b335d67a3b90f422bacf2977f622cfb77a35373c94fa7a25a75bebb9a0a348c9a98c05a5a331efa09a8456883a0ad0cfabe94ef1dd73e1338d71a75c
 EBUILD aruba-2.1.0.ebuild 2248 BLAKE2B f1ae5aed5b5b558b4f00851516277cef0f8fa7468f2217d3c4ef3d15e1fa0585a313811a43550579a1ca3cd4e5027bad713f29bbf8693646910024373b96a44f SHA512 a0bbf2a14dffe700fea2d18ccc810a2a55da23ec03cfcaaacea8b57fb9ddf131eca5ecaefa058a4d0b2f21d9a51eea3fe72e0f7e343c2e95171831456b7d9030
-EBUILD aruba-2.2.0.ebuild 2209 BLAKE2B ae36404a9143ff7853876d50ff2f9b6a06da09b8dcd99a3cf5f230a421b6a0f713e4a7bf9c093503a500a7c23d7b802c94fa0005a6b7dc5899e189a40322c595 SHA512 2666e24f74e3f2a5d02d7e3f4de6196219f62f5259d43d9afdde8afd286c79cc89b0e062256e451de1b4f13ea1e7bede4c04349ec6d800a621293a07b26ef836
+EBUILD aruba-2.2.0.ebuild 2220 BLAKE2B 0109b33e9c591c0d538c4953473867f6a3d02ff9b43b9526e784831f93003874f405a37176f51a4f56021d9287b34db80495e2d7ea155407292399a4cc75df59 SHA512 86d0000553fd86a0cd2f4772ecff4e0b49ef1b54b17092944ee82adcb58f619baeae061a038c904d10cbb593c2c9b90b7a53b0393a3743f27897a4508b43c851
 MISC metadata.xml 297 BLAKE2B 013e79bd25020910ff023586ed3e1349ee1dcbf195b73c230133775c2fe031794f91fd7e54d4df43bfc61de716f452492f2b7af3ba7dbf7e04cf4a47ac16a00d SHA512 c57a4e881304d3bdc2001d4f221ec7d4789223fa36b104271ec9a2439e7730ccbfd349b16209ac6a59fe782618b14423cf3b7b345ef2a7d4944a535eaed75c9a
diff --git a/dev-util/aruba/aruba-2.2.0.ebuild b/dev-util/aruba/aruba-2.2.0.ebuild
index c44c9bb335bc..c0484a4f124e 100644
--- a/dev-util/aruba/aruba-2.2.0.ebuild
+++ b/dev-util/aruba/aruba-2.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
 RUBY_FAKEGEM_RECIPE_DOC="none"
@@ -18,9 +18,9 @@ HOMEPAGE="https://github.com/cucumber/aruba"
 SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
-IUSE=""
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
 
 DEPEND="${DEPEND} test? ( app-alternatives/bc )"
 RDEPEND="${RDEPEND}"
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index e7bdeeefda8e..f23f4614f606 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,7 +1,9 @@
 DIST CLion-2022.3.2.tar.gz 847111855 BLAKE2B 7e1814bcc683126f51eefd350b3d171a22d320ec658bc24b8831db1198756c59ee1be951665d10f2c3e76831f0d8ab55c0ae5fd9abeae0acf4e7009ce00f1faa SHA512 7ca87933323c0e1a4800eb75fbe40d179af987f33de51bca0e6b35264aaffea991712187719b837e07bd11457f8891f9f6038fb10f4e3157170d7818179b7531
 DIST CLion-2023.1.4.tar.gz 858589459 BLAKE2B aed16b6cd6f88279f772fd38f63ff27019998ed1f7e63c1fcaba16fd1b43277d112806dd8ba4ff5e08a23fb5d80b0b80e24b7ef693e19a38220a7129c71d2d98 SHA512 b50ebcdb0b85ec00a9caaad6a309c8f37524a62115a8efeaa8b05819849bdda2d81bf2fae4a723d7d378fb32910a45af26aa5303006aff2e1ad96d5a4749ba90
 DIST CLion-2023.3.4.tar.gz 907669083 BLAKE2B ed0571341141e58b102cffbf3b96c7e6625f628b6092d93cc80c4d9ed5f47f25be3665ff26553e6c6584e41a519e102eceabe576986c44795a5257312dad1b76 SHA512 f5ab02ed8a3f854dc75483e7766267f043c7a493730900786a3a304e3f2fddaf12375eb6760e9438e8184b7a5405131a2e3ea7536be8b7a7ce0509b0901afc09
+DIST CLion-2024.1.tar.gz 1213246002 BLAKE2B b0060b98dc803e72513fb927c0d8b2762b9d0526d4708f75e3ed1b68642a2f01995b468a7df40b403eee4d619db9afe4430259a092506e139983ecee0629460b SHA512 9335b3811414919df8b251e25cf4a4155675c79c35de3a0ff21a30b06b46e130b0684fd2c6dcc17b4c8ee676211c6df9c84d6b6777bf7d88e1b2ec765c35f69b
 EBUILD clion-2022.3.2.ebuild 2758 BLAKE2B a0e3766a8130b7003be4b3532914fdd4e8712452afd07da24563a3f4ccb876b6a2bd40f9aef148d4e3b2ea4196899bb724a165fe2f54ac03a8cc341f9c436e4e SHA512 4d65ba07e2445dc4962bdfba1b70af76c4e89c200a3dfe503bdf787388cc1c8386691cabb7087841bf3cb5599392fbffe3b83673dbcb21c686f5637dc1ad889b
 EBUILD clion-2023.1.4.ebuild 2758 BLAKE2B a0e3766a8130b7003be4b3532914fdd4e8712452afd07da24563a3f4ccb876b6a2bd40f9aef148d4e3b2ea4196899bb724a165fe2f54ac03a8cc341f9c436e4e SHA512 4d65ba07e2445dc4962bdfba1b70af76c4e89c200a3dfe503bdf787388cc1c8386691cabb7087841bf3cb5599392fbffe3b83673dbcb21c686f5637dc1ad889b
 EBUILD clion-2023.3.4-r1.ebuild 2998 BLAKE2B 782bec71f1e8248c4517b6bedfce5f365dce5288d4f4ab451b09fc18e7743419e562ee0f5b7d3204ffb7da021564d4b38ac04b0285ef7bdf4824fc0da588c885 SHA512 e1842772da2b0d9432f611f27da5ca0a3a41218c3b3afe8cb0dd8050dbab334d5e47ea6bd5fbeaf4e92000b105627b2011a9c598f5ac9c28cc1cc12caade3ba0
+EBUILD clion-2024.1.ebuild 3068 BLAKE2B c43d0983bc70912cef31df370fd2cca6c2fef823d905d88e53876f5d271485b29f3020692081f12085fbe94451ae9a395ea97f6992268e9805fd42b7ab19eb4c SHA512 9f448bf99924bc18816573267d405770661ded6b4b0baf3fe85318babddd736dafdfb52c07b76cc8692ea42240f10a6fc8bd7612e37545d97561fd4016af8831
 MISC metadata.xml 402 BLAKE2B a74ce91089fa83dc91f1878f17b0e2adc483fdfdd987eb2dd4b184b2a98b8f1d995ab5d2c4dca2d7f25d3a8e1dfec711625e980feb5a0422fe5635c5816ef4fe SHA512 6d425358265cac8deb12c18632cfe520d82a733e4caab71eeb89b6d6643eddbfa27df03fcd8111477a77efea136aca1093c84024c89b85dc66ce1b92633709c6
diff --git a/dev-util/clion/clion-2024.1.ebuild b/dev-util/clion/clion-2024.1.ebuild
new file mode 100644
index 000000000000..c393c3f52384
--- /dev/null
+++ b/dev-util/clion/clion-2024.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper
+
+DESCRIPTION="A complete toolset for C and C++ development"
+HOMEPAGE="https://www.jetbrains.com/clion/"
+SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz"
+
+LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0
+	EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM
+	LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="bindist mirror splitdebug"
+
+BDEPEND="dev-util/patchelf"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-debug/gdb
+	dev-libs/expat
+	dev-libs/glib:2
+	~dev-util/lttng-ust-2.12.1
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/wayland
+	dev-build/cmake
+	app-alternatives/ninja
+	media-libs/alsa-lib
+	media-libs/freetype:2
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/pango"
+
+QA_PREBUILT="opt/${PN}/*"
+
+src_prepare() {
+	default
+
+	local remove_me=(
+		Install-Linux-tar.txt
+		help/ReferenceCardForMac.pdf
+		bin/cmake
+		bin/gdb/linux
+		bin/lldb/linux
+		bin/ninja
+		lib/async-profiler/aarch64
+		plugins/clion-radler/DotFiles/linux-arm64
+		plugins/clion-radler/dotTrace.dotMemory/DotFiles/linux-arm64
+		plugins/remote-dev-server/selfcontained
+		plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_aarch64.so
+	)
+
+	rm -rv "${remove_me[@]}" || die
+
+	patchelf --set-rpath '$ORIGIN' "jbr/lib/libjcef.so" || die
+	patchelf --set-rpath '$ORIGIN' "jbr/lib/jcef_helper" || die
+	patchelf --set-rpath '$ORIGIN/../lib' "bin/clang/linux/x64/libclazyPlugin.so" || die
+	patchelf --set-rpath '$ORIGIN/../lib' "bin/clang/linux/x64/libclazyPlugin.so.19git" || die
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{clion.sh,format.sh,fsnotifier,inspect.sh,jetbrains_client.sh,ltedit.sh,remote-dev-server.sh,repair,restarter,clang/linux/x64/{clangd,clang-tidy,clazy-standalone,llvm-symbolizer}}
+
+	if [[ -d jbr ]]; then
+		fperms 755 "${dir}"/jbr/bin/{java,javac,javadoc,jcmd,jdb,jfr,jhsdb,jinfo,jmap,jps,jrunscript,jstack,jstat,keytool,rmiregistry,serialver}
+		# Fix #763582
+		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+	fi
+
+	dosym -r "${EPREFIX}/usr/bin/ninja" "${dir}"/bin/ninja/linux/x64/ninja
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.svg" "${PN}.svg"
+	make_desktop_entry "${PN}" "CLion" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	insinto /usr/lib/sysctl.d
+	newins - 30-"${PN}"-inotify-watches.conf <<<"fs.inotify.max_user_watches = 524288"
+}
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index bf1871ec609e..4c46e445cc16 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,8 +1,8 @@
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.15985.15.tar.gz 9175100 BLAKE2B b6d184d22f38e576ddde21b624cb438f997ce5f0549d3db65f73c755c6200dc73928c1961e081954948b4a7e5f2b8c5451998a5aca34a993876e8b08db7512a8 SHA512 98edc835a76ea4d4be5a0732c45656406ddb2eeaa5e0ef0d7e2fbf6cbb0866afb406cc2dee95c9581f2191659344dc771403ded0cf4a4b5609a535efffc4ece6
 DIST intel-graphics-compiler-1.0.16695.2.tar.gz 9525078 BLAKE2B abfc63f5c4ec257879b3279b113bca3fe612ba4c4b2eae02a736690eedf5ed0639e86482607998fd01be0331c45abf230d65ff38aa2ea5276d23a32bed170a40 SHA512 e8146083ade89cbaf3db7bb9cb345c6a887715259821ed51f91a0aad58354bca3412c4fd22dc71cf38e668b6bceb176fc4c5fb568056823b88bd8e389cc91ca1
-EBUILD intel-graphics-compiler-1.0.15985.15.ebuild 2833 BLAKE2B 93cab9759e547b6ff4380116be36de3ccbfbbd86683ba7ca2ba95ff500e0cca01cc09c734bd1d308d0d18e3dd49b20dc61368d0330db96075d01939e72f83cd3 SHA512 a5e469ac2717e783c189a85467e4a88b6dfa48515e54afbc514b980b999f493e25032094e51e1bd58924f64175c8ea99958a2d0585676f0b5e473476114f80eb
-EBUILD intel-graphics-compiler-1.0.16695.2.ebuild 2834 BLAKE2B c773c2df03ef0732383a32ccd84e59a0413a766cfbba7bfda0e45d0b42573224bf4eeb63bd05964042856b99ce7bf79892d42c9ea5496cbfe9b2094c57c394a0 SHA512 944b1dbd115c3f008931e07a60f56f6cbb5fe69900879bd6513d9cfa5e0e1c1cdccc400301eafd6098533c902ea7569b3b22183f618696257d3a8e4d35329914
+DIST intel-graphics-compiler-1.0.16695.4.tar.gz 9525288 BLAKE2B dcd684ab7a439febfdfddc832b4521947335a5ca9f5c9fc3a3b8478756c6dac50a7a9679a93a3d99607805d22e5f71aba0248787948a59fde5d2b87935f1ffaf SHA512 18532abc0d0675815017d03e36dd090cd35a1904ac86fbe66b169c6fa962de80ccfee29d90c8ce827b24300270c4f7bdfa4793dd11c6d79ae7b1a937217351b1
+EBUILD intel-graphics-compiler-1.0.16695.2.ebuild 2833 BLAKE2B 93cab9759e547b6ff4380116be36de3ccbfbbd86683ba7ca2ba95ff500e0cca01cc09c734bd1d308d0d18e3dd49b20dc61368d0330db96075d01939e72f83cd3 SHA512 a5e469ac2717e783c189a85467e4a88b6dfa48515e54afbc514b980b999f493e25032094e51e1bd58924f64175c8ea99958a2d0585676f0b5e473476114f80eb
+EBUILD intel-graphics-compiler-1.0.16695.4.ebuild 2834 BLAKE2B 2cd91eb6a239ec060ddef2a2339e53e23d469244ae1484e3510a20f0f481e14943fc4fa8c80778a9e00c51a5fd9088374ad7e2ec084cdf29a2fc3d864a3f5a00 SHA512 4a762c0ee8d5d9483a0e81d440750ff7d076dcd36d1af1ea35b0d5a42857d25e7d11b52f997b361c5d80caa67f600cb4f2985516d57e2f684a96742d64f81bbd
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.16695.2.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.16695.2.ebuild
index 8a1eb1385c0e..90b406a314e6 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.16695.2.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.16695.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug vc"
 
 DEPEND="
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15985.15.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.16695.4.ebuild
index 90b406a314e6..a3c00201da99 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15985.15.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.16695.4.ebuild
@@ -7,7 +7,7 @@ CMAKE_BUILD_TYPE="Release"
 LLVM_COMPAT=( 15 )
 MY_PN="igc"
 MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit cmake flag-o-matic llvm-r1 python-any-r1
 
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="debug vc"
 
 DEPEND="
diff --git a/dev-util/kyua/Manifest b/dev-util/kyua/Manifest
index af4ea1b79b11..bab4f1e50a57 100644
--- a/dev-util/kyua/Manifest
+++ b/dev-util/kyua/Manifest
@@ -1,4 +1,3 @@
 DIST kyua-0.13.tar.gz 663776 BLAKE2B 5bb6b2a7723567395baeace0b70085a631856ac98ddb304bb5300f26bc89a1a1add589486cd08f1569ca9c7534fd5071a62cdcbb519a10d59221df63c0aef932 SHA512 80ecf4fd888d4759122f3c1d1d5b06a19135e06f7bca1ef8458c7a5e78c1b6baff54969c863c93f11c40611ca256fc0334402531397b16788fb3ec701dd278ae
-EBUILD kyua-0.13-r2.ebuild 655 BLAKE2B 1877dd71cbe35cb0647f4813e6a251bd9f614f923e5cbfac83948c82463d93d30d85e87b86e1070050f75cd5aaa8e0bf638e0eff3b2bb1225ae60c57e4dbccd4 SHA512 1fded5caa615ff11c415b355c23961ff9e4dbc6025b6db60b0fa4fdbf903415b3fbf840d0f1e407848ebef420239fd8b89ade9d418c0aea5959ecfcfba24202b
-EBUILD kyua-0.13-r3.ebuild 1019 BLAKE2B 8197b949dad041a4317ca0ecd1257d406e484112fcdf50cf4fb506790798f42d3b3bc55cf1bd2061c051cd1766e88664a3ce639370ad971b710164adf1c4e2dd SHA512 34f759c749398b3b83cb93b604ecdf9e8ac602e22a1e0df92fa022403ab60d487d28619396a241ab294ae3ce0520771c5145de655534b465d0e88c3cf6ca5148
-MISC metadata.xml 321 BLAKE2B 0fd4703df1ae5e167bc3db67837bffa244560add52630c872c27c33150bc6780ee1c51db982a25323728dca8e789264e0bb3cf1734c5c3186ea93b766e672177 SHA512 77837e1a401b4eabe4ac0c82794739932e0d079556f4227e6b7e9edf70f0ef9d84280aeaaefa7723445bfdf57ebedca92479c7d92bd2a91d22cddab47e9da92d
+EBUILD kyua-0.13-r3.ebuild 1024 BLAKE2B f476403e42323a6ddcab0a8f74bf645a427b48f0fc76183fb1314a68947731145a9badcc38d90a2899f354ff6feb01c765780807265967f370f94979ac166322 SHA512 82b15fd218d670c4637a3972db039d7561d1dc03ad47f2ad20c221584f3e62a108c6334f7420790980092c5caadfd99f3a0ea10b448a473c649fa74426a80374
+MISC metadata.xml 324 BLAKE2B e27d408570c0daab7c3c233fda8011d556ea574026329fa277082e25218a45568e11f6401584e134b004cc51ecfdd57be1fb621d54788170c50cfba01257a05a SHA512 544f93c2f9e1a46a7a615ff724ecc7ff1f668f5c880f6a32b853fa9ff8f74161ac27ff52b0298d5465b71ba4ce598313a23551ab8d85d5f3217b98aed986f0a5
diff --git a/dev-util/kyua/kyua-0.13-r2.ebuild b/dev-util/kyua/kyua-0.13-r2.ebuild
deleted file mode 100644
index d22427caaa15..000000000000
--- a/dev-util/kyua/kyua-0.13-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Testing framework for infrastructure software"
-HOMEPAGE="https://github.com/jmmv/kyua"
-SRC_URI="https://github.com/jmmv/kyua/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-
-# Tests fail
-RESTRICT="test"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/atf
-	dev-lua/lutok
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-libs/atf )
-"
-
-src_install() {
-	default
-	rm -r "${ED}"/usr/tests || die
-}
diff --git a/dev-util/kyua/kyua-0.13-r3.ebuild b/dev-util/kyua/kyua-0.13-r3.ebuild
index f19ac7a8b9ad..571840d43489 100644
--- a/dev-util/kyua/kyua-0.13-r3.ebuild
+++ b/dev-util/kyua/kyua-0.13-r3.ebuild
@@ -6,12 +6,12 @@ EAPI=8
 inherit flag-o-matic
 
 DESCRIPTION="Testing framework for infrastructure software"
-HOMEPAGE="https://github.com/jmmv/kyua"
-SRC_URI="https://github.com/jmmv/kyua/releases/download/${P}/${P}.tar.gz"
+HOMEPAGE="https://github.com/freebsd/kyua"
+SRC_URI="https://github.com/freebsd/kyua/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/kyua/metadata.xml b/dev-util/kyua/metadata.xml
index ce51fd51d7b2..03f0c05d39ab 100644
--- a/dev-util/kyua/metadata.xml
+++ b/dev-util/kyua/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Mike Gilbert</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">jmmv/kyua</remote-id>
+		<remote-id type="github">freebsd/kyua</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/rinstall/Manifest b/dev-util/rinstall/Manifest
index e5ec9b564d20..2dfdf368147d 100644
--- a/dev-util/rinstall/Manifest
+++ b/dev-util/rinstall/Manifest
@@ -78,5 +78,5 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST xdg-2.4.1.crate 14034 BLAKE2B 7fd98ef4e1534d13da125a78cb7425318f1f2f0c7e06a8c8045b2145c1696bf86daf820577aa9757af0deb11951315efd382091b1c73dd3853841388927c2b01 SHA512 23e69abbe79a0977900af37feb9f367a82d0ba4e69fc9421e356a5957920e316379355b1c6eeda1235feb3d028f738c41f520d28665f919e775b20240219e07e
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD rinstall-0.2.0.ebuild 1827 BLAKE2B e77dfcde8e7a6ad8be0d464e7c402b6487b7abd6a18ac1393fccfa0221607c15dbc72560275b7d02ef2b09bcf59e465bfa3f787042a1f22841c17e35e13dc135 SHA512 a0a1ddbe1a74a91b13c1131690efc3c5fcb151a4ab896b2adf908a6fad92969229ea5126ba06b42e673e238111ae0607b07efaa3f89a3fe7cc23c0c3ad816a11
+EBUILD rinstall-0.2.0.ebuild 1820 BLAKE2B 2bcc99c8c4ba29d6065cdbdd798eafc0d88e27908b1c4c1b8e7452f7c8de2365b82e300de9ce944fe5e3af2ce0528f1f53cd92450c2fc1a31bb316c0b7b6bf6f SHA512 05891e6cc2fc9a8fb3375a551c8550c6644d4d3d7a3dbef7a04e8f92bb0c00433278f2691bedfe0d8602c3937fc4d7d552845fb0d4b270e42de594fd5509436d
 MISC metadata.xml 844 BLAKE2B e2839b8fe70fbe3067f11da0bb7016fe5e2be2d94fc86529e1e029431abce6a4714d052bfa71cc9fd221464d7bacdad1462b3ca4c6d3c0c011142eee8989424c SHA512 069db1b272fc9481c5fc392a9451fe7a747db06977a92fcb5ee5461f06d74f54f6d16d18ce498c2919fa4935e3ea8b1620e1a0f7a3e662f8d0bd55ea1b64c615
diff --git a/dev-util/rinstall/rinstall-0.2.0.ebuild b/dev-util/rinstall/rinstall-0.2.0.ebuild
index 9b38c8a0e49a..355b1ca102b9 100644
--- a/dev-util/rinstall/rinstall-0.2.0.ebuild
+++ b/dev-util/rinstall/rinstall-0.2.0.ebuild
@@ -1,96 +1,98 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CRATES="
-addr2line-0.17.0
-adler-1.0.2
-arrayref-0.3.6
-arrayvec-0.7.2
-atty-0.2.14
-autocfg-1.1.0
-backtrace-0.3.65
-bitflags-1.3.2
-blake3-1.3.1
-block-buffer-0.10.2
-camino-1.0.8
-cc-1.0.73
-cfg-if-1.0.0
-clap-3.1.18
-clap_complete-3.1.4
-clap_derive-3.1.18
-clap_lex-0.2.0
-clap_mangen-0.1.6
-color-eyre-0.6.1
-colored-2.0.0
-constant_time_eq-0.1.5
-crypto-common-0.1.3
-digest-0.10.3
-dirs-4.0.0
-dirs-sys-0.3.7
-eyre-0.6.8
-generic-array-0.14.5
-getrandom-0.2.6
-gimli-0.26.1
-hashbrown-0.11.2
-heck-0.4.0
-hermit-abi-0.1.19
-indenter-0.3.3
-indexmap-1.8.1
-json-0.12.4
-lazy_static-1.4.0
-libc-0.2.125
-linked-hash-map-0.5.4
-log-0.4.17
-memchr-2.5.0
-miniz_oxide-0.5.1
-object-0.28.4
-once_cell-1.10.0
-os_str_bytes-6.0.0
-owo-colors-3.4.0
-proc-macro-error-1.0.4
-proc-macro-error-attr-1.0.4
-proc-macro2-1.0.38
-quote-1.0.18
-redox_syscall-0.2.13
-redox_users-0.4.3
-roff-0.2.1
-rustc-demangle-0.1.21
-ryu-1.0.9
-same-file-1.0.6
-semver-1.0.9
-serde-1.0.137
-serde_derive-1.0.137
-serde_yaml-0.8.24
-strsim-0.10.0
-subtle-2.4.1
-syn-1.0.94
-termcolor-1.1.3
-terminal_size-0.1.17
-textwrap-0.15.0
-thiserror-1.0.31
-thiserror-impl-1.0.31
-typenum-1.15.0
-unicode-xid-0.2.3
-version_check-0.9.4
-void-1.0.2
-walkdir-2.3.2
-wasi-0.10.2+wasi-snapshot-preview1
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-winapi-x86_64-pc-windows-gnu-0.4.0
-xdg-2.4.1
-yaml-rust-0.4.5
+addr2line@0.17.0
+adler@1.0.2
+arrayref@0.3.6
+arrayvec@0.7.2
+atty@0.2.14
+autocfg@1.1.0
+backtrace@0.3.65
+bitflags@1.3.2
+blake3@1.3.1
+block-buffer@0.10.2
+camino@1.0.8
+cc@1.0.73
+cfg-if@1.0.0
+clap@3.1.18
+clap_complete@3.1.4
+clap_derive@3.1.18
+clap_lex@0.2.0
+clap_mangen@0.1.6
+color-eyre@0.6.1
+colored@2.0.0
+constant_time_eq@0.1.5
+crypto-common@0.1.3
+digest@0.10.3
+dirs@4.0.0
+dirs-sys@0.3.7
+eyre@0.6.8
+generic-array@0.14.5
+getrandom@0.2.6
+gimli@0.26.1
+hashbrown@0.11.2
+heck@0.4.0
+hermit-abi@0.1.19
+indenter@0.3.3
+indexmap@1.8.1
+json@0.12.4
+lazy_static@1.4.0
+libc@0.2.125
+linked-hash-map@0.5.4
+log@0.4.17
+memchr@2.5.0
+miniz_oxide@0.5.1
+object@0.28.4
+once_cell@1.10.0
+os_str_bytes@6.0.0
+owo-colors@3.4.0
+proc-macro-error@1.0.4
+proc-macro-error-attr@1.0.4
+proc-macro2@1.0.38
+quote@1.0.18
+redox_syscall@0.2.13
+redox_users@0.4.3
+roff@0.2.1
+rustc-demangle@0.1.21
+ryu@1.0.9
+same-file@1.0.6
+semver@1.0.9
+serde@1.0.137
+serde_derive@1.0.137
+serde_yaml@0.8.24
+strsim@0.10.0
+subtle@2.4.1
+syn@1.0.94
+termcolor@1.1.3
+terminal_size@0.1.17
+textwrap@0.15.0
+thiserror@1.0.31
+thiserror-impl@1.0.31
+typenum@1.15.0
+unicode-xid@0.2.3
+version_check@0.9.4
+void@1.0.2
+walkdir@2.3.2
+wasi@0.10.2+wasi-snapshot-preview1
+winapi@0.3.9
+winapi-i686-pc-windows-gnu@0.4.0
+winapi-util@0.1.5
+winapi-x86_64-pc-windows-gnu@0.4.0
+xdg@2.4.1
+yaml-rust@0.4.5
 "
 
 inherit cargo
 
 DESCRIPTION="Utility for declarative installation of programs"
 HOMEPAGE="https://github.com/DanySpin97/rinstall"
-SRC_URI="https://github.com/DanySpin97/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
+SRC_URI="
+	https://github.com/DanySpin97/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index f63a6431ac7b..901fd94a6a7a 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,4 +1,6 @@
 AUX rr-5.7.0-no-force-lto.patch 720 BLAKE2B 78733ac4cf79e9f49ccd4f6c6dc98ef7ebc518392072eed660ee5fbf22c90f0b89ee5d708edae2bce61e06d91522e46b5cebc3ffb8983c8d97ecbc1b261a8f7a SHA512 2f53aad8c1c65689a967ddf94c5f9d60d8edd2ed5486a4c95d74e2fa6e50e752adb3ae699085834af57d4251b48616d414d452a73bd1e0e3d9a5b0ee9e75622b
 DIST mozilla-rr-5.7.0.tar.gz 1688069 BLAKE2B 613196a441b8c384765403838d4c89248eeb85af203b596ff01610fe65c62650cbeb7f8bde4c97ac4bb65f2bdcf7caa605ca1b6cb2f8f36b0355d816ed39a4f1 SHA512 e0e45f47a5f1de9e0e3f982e9eb5565699189ed23c52de03bf68b8215e7b8ac267619c04495c19e75a55aa8e0face08b9bb6c7f325650384c10a719c17ecf576
+DIST mozilla-rr-5.8.0.tar.gz 1734617 BLAKE2B 75fcd99da89dc4acc033d033abc91ff61500ad1429702641888c628ad0e70f1dfb61309aa76092f34d3314086572a6af334970e5f4abb4d7c812800b23e64869 SHA512 98f0c970fad5c3a2c5d7c17f40c454db072d31053425ffc308a66a643e2f36ede04f33ab8b13f94c42c60a3b00e18a790783467f99a97e421551c498df313a6b
 EBUILD rr-5.7.0.ebuild 1592 BLAKE2B 97e9bfbfe4f5e7918ad8175c6dfc9b62a2ceb8e6486389a064c1987870b8bb68cf93781709bd921e0b1ff2025ff8830557e8afc9d8bd1b1eabe7ae5761b74ca7 SHA512 7319e9da33514cdffd036aa9eb6226e212d4d6d2235604c73617a05ffdc4c3eeee089c6f963cbb7f62a8fe0146cb40c1a8901fc11625e9bb36ca0f5678b67938
+EBUILD rr-5.8.0.ebuild 1747 BLAKE2B 83d9a865300bb5500f5c31286132af1825fde3d143d96a014eeff3c0594c44a419aa45571022dc6220c5855b822bfeae83ef9b29c6c1d0f2c10ba8d6a8bccf78 SHA512 06813556d7da688f76f3a8a4bb086ace12fb8c9c364b5b1de52f34e3675bc280c56067e20abba32466a9fcaab05248e559f4c957b7d8406bcedfc2d902bbe667
 MISC metadata.xml 448 BLAKE2B 2ca27171b81983b513710708955b70a7a73174ca72fb8bac4c8363a5f0fb464431d9d84d3be7818e4132ff7ca9b2f6b3325c526e6424bbeac8ee6dad1728c8cb SHA512 01fa6e40deff5fc58f51b90f75f93cf38f10ad58e994153045954ebc9d00dc41e7d8ea625b2b882a376cb0db1dbcc9e1a025c85f9fb584ef7a46b6db812b649b
diff --git a/dev-util/rr/rr-5.8.0.ebuild b/dev-util/rr/rr-5.8.0.ebuild
new file mode 100644
index 000000000000..4b3f96db0d10
--- /dev/null
+++ b/dev-util/rr/rr-5.8.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake linux-info python-single-r1
+
+DESCRIPTION="Record and Replay Framework"
+HOMEPAGE="https://rr-project.org/"
+SRC_URI="https://github.com/rr-debugger/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
+
+# rr itself is MIT and BSD-2, but there's various bits under third-party too.
+LICENSE="MIT BSD-2 GPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="multilib test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-libs/capnproto:=
+	sys-libs/zlib:=
+"
+RDEPEND="
+	${DEPEND}
+	dev-debug/gdb[xml]
+"
+# Add all the deps needed only at build/test time.
+DEPEND+="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pexpect[${PYTHON_USEDEP}]
+		')
+		dev-debug/gdb[xml]
+	)"
+
+QA_FLAGS_IGNORED="
+	usr/lib.*/rr/librrpage.so
+	usr/lib.*/rr/librrpage_32.so
+"
+
+RESTRICT="test" # toolchain and kernel version dependent
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.0-no-force-lto.patch
+)
+
+pkg_setup() {
+	if use kernel_linux; then
+		CONFIG_CHECK="SECCOMP"
+		linux-info_pkg_setup
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i 's:-Werror::' CMakeLists.txt || die #609192
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		ewarn "Test suite fails under FEATURES=usersandbox (bug #632394). Skipping."
+		return 0
+	fi
+
+	cmake_src_test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-Ddisable32bit=$(usex !multilib) #636786
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	python_fix_shebang "${ED}"/usr/bin/rr-collect-symbols.py
+	python_newscript scripts/zen_workaround.py rr-zen_workaround.py
+}
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index 83c4f84db8c2..07cf7a774e8f 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -7,6 +7,6 @@ DIST tree-sitter-cli-0.22.4-crates.tar.gz 51254931 BLAKE2B 1cc056f503353ce594726
 DIST tree-sitter-cli-0.22.6-crates.tar.xz 22184056 BLAKE2B f18cfafa9a767fb1b3408dd473d97b2d7a87c9c37a50fb108e164074641e656cc2ca322914f98d627209485cf7b14f92280a50a64cf5136f8375e5870d2b097f SHA512 a3e6eb6585d61c86e32de21c0422c2cd1f95c6116823f5a8ee291f6682658fb7afe5e1369eda4682d4e842d91531b56e6fadb99e4d575230f4c1d65a6b0778ca
 EBUILD tree-sitter-cli-0.22.2-r1.ebuild 941 BLAKE2B 083d1e90da8b718c64a095f314c63fd04b0eead49a2910c9dbfdc9fe97d02ed02bc0c2c496f105a09d62002abab498a934a6eea58699ac332c9fb2f91a287ba8 SHA512 e17e5aba1710fea46144749fbd2317b4e8c2c9785439cac272234612bdf634ac5db7e6a259b2b51b891140ef65650689dd6b65d9115fd69584c26bbd911ab651
 EBUILD tree-sitter-cli-0.22.4-r1.ebuild 899 BLAKE2B 2ca614b84c2ac24af555512aa96cc9704f4330ec69324ea930f0509e8b14c664aeba4e93e90f60f14ce906b802ed26d31351d8a7eeab23df45635f083335e544 SHA512 4d70728d73ab197dadc096942483db7e4798f97bd1b0b70175dea18ec11f4652fb1d11afdb92ae2f5831e2fb116d9baf926a552af7e9cd7bcca74d64281af95b
-EBUILD tree-sitter-cli-0.22.5.ebuild 904 BLAKE2B 7a00a7e8496e8f0beeedf97acefddeccf4ffa1aef583560387f3e645c147e876fe1a76709faf25d086c7bccad7bee62af67f5ef65d4b10c4f9a65a4259586aac SHA512 e2d921fa6af9d57e1986d9e9da045e57aeedfd88fddc7d5174ec827cba9946ef00d1cec0bf7e38797e9696e9075dd051c4b1a0920a362a6aab351c44dc7bb505
+EBUILD tree-sitter-cli-0.22.5.ebuild 903 BLAKE2B cb70c580d1e1df6c5660e1d9fd393f424b0e17135093a8569c544195778cac53896e52ac1c9d7d9a4aecd199e5d3f7e121f938b3123189c674678760f14782cf SHA512 6effefc08e1a3b0f00d4aa7a0100fa5da583ec3193309c7174d23d9d4ced26ae4f0a49c82943dbde4a98c18dc0991d1c07c9593c6d3232be621c0b53e7dfa843
 EBUILD tree-sitter-cli-0.22.6.ebuild 916 BLAKE2B 28ac3fbf95af4d731ca58851b17f74c39c2f56de7ce630000a601b3bd91fd1838e8205511f2d7491f37b78ee31e00593c7c5ad80db1883d7858b616d03ed2ba4 SHA512 d133b4eedb0d04ed7000243a5bdbbd095af8b8eb0aeb945b849a5039954e19763474ddc858d5d82dbfb90c43faedc75d9994783fc2ea9a06dfc6623bc868637c
 MISC metadata.xml 678 BLAKE2B e000f4502ed07b8fffcbf05a9dcf0730407d70a00ddf289b8ffdd9e6d28df6481f7e6eec3416aa1278ad9602c098bde72bcaad4f7819c9554c39baf045555dc8 SHA512 37e64d773a4b01b34208b65be600e6f46c7633571d7ad39210b7957f41f31b296565304a4dc8a4ec0518489a89b1bf7a1b204111c4d428307b562e3f6d0575f8
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.5.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.5.ebuild
index e6de10c1dc8d..41b809340b75 100644
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.5.ebuild
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.5.ebuild
@@ -21,7 +21,7 @@ LICENSE+="
 	Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 # Test seems to require files (grammar definitions) that we don't have.
 RESTRICT="test"