gentoo auto-resync : 30:03:2024 - 19:13:59

8 files changed, 380 insertions, 31 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f6c4c1b3f48f..56be917e6c55 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 35b8a20d2be4..fd9208d2d27c 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,6 +1,8 @@
 AUX cuda-config.in 407 BLAKE2B 5f7a0d50d774db58c180b767f00bead7c7dbf5f6b3b4a2f960dfc3b8450f7abf5c2b67c6620c5318f1331646dd2003d61c70a4c31359efd16ff418ecc9d0b446 SHA512 363903b999c43a47a48c52e8898c6044fadcc66d259338ee22863e859c2bc9873a2f1392aa83c9182486d3aa4eaeb5f164cf8ccf29cc74fd8ad56245f76a039a
 DIST cuda_11.8.0_520.61.05_linux.run 4336730777 BLAKE2B cfdb4a51c49ee504e56a4a95de4e477ef207b678527cbb633c1e83e667f1a62c0f67038befd0b10f7ae24cda9c8bc5c54293d06a05b2e45be6cf677e40f71f17 SHA512 e96e1389abed34b5093b3a1d4e6ae9f3d4f8406621b1475f378efae65868657efce22da03b5b4e0a548d9635e406b8690b18b17b186d03ecb3ca0703c5d5787a
 DIST cuda_12.3.2_545.23.08_linux.run 4368514070 BLAKE2B bfb6239b7669636e2ef424921f5a1dd99409a0351ea7d3453fcec3d484e714d87639e733cfae913b0f222d7af8acb7bebae340ea8af53fb7ab320805abb7b230 SHA512 dce569e42955fc351a6b52b2876948029d5183bb000754f0cdcba754673a280acfd4c9e4d8cf61d572ed045de006e0bbb0e8ff32012e6cc336be9c05fd529340
+DIST cuda_12.4.0_550.54.14_linux.run 4454353277 BLAKE2B da339a44ac21799a88b4573e9afc0866f11649707594383414cb0c729b36dc63d55032e5ccbbbe46e84c1dc88fc76e466067be7ef2ae3d131a74190c548d76ba SHA512 329b81c63dcefa5c6713eeb2dc5ccc223f5b456f4b7558bd3723d166357d8bb4c79d12082ea396aaadae8b5593b20584f7bd0cf617bb3494e4423b58726255a1
 EBUILD nvidia-cuda-toolkit-11.8.0-r4.ebuild 7972 BLAKE2B fbe811911b5b646f9a3ddb2bcd483f8ecdeb3f185e5d56ad1b4378276d3047d343efb20ac8f4fa186524254dc1917941161004811c131b17e90decaf31999b93 SHA512 a3f4511631efaaecbdf7489d04b4b8674db24ff6bf7ba61027dfb663da1eacd1db7f2bd2e21cb6b433f82f27f4f8900a9341d12371115c3e6d9f7ebcbd325fb2
 EBUILD nvidia-cuda-toolkit-12.3.2.ebuild 9379 BLAKE2B 1ec0cc7e10b9d1abda2afc89b14551b62b025aaa15c12756198bf085a5cd690cb09158ed73f3cab92e6e914daf024e38052bf3e006dd5e1f8b2394b430220850 SHA512 73d42738125ec3bf134d49ec727ae21fd150d19d2a086ca269cdf6e7d1dc0a13a6d46c6fe39446ee57ae4da35f685d4505ca8bc1b5fbbdb46599690d7d4aa2fb
+EBUILD nvidia-cuda-toolkit-12.4.0.ebuild 10344 BLAKE2B b0e1bb1797ad4216d8aafcc55b8d806c6774e52d8d35f0ba2560d8004a288470509d5b7ad240962c82c1dcb58f2298fa19145d638ffcb28a21288b2a7f62c541 SHA512 00ca00d31949c92319f0ed3fdb2bc5ae18a50fd4e4e5ec65e72e1002759f9c59ddb97f73386dc6db32821abe005d80bade1eae37f9aaa0bacc471786b28078f8
 MISC metadata.xml 761 BLAKE2B a6ae653c6206cbc05349297499b6dde91bce6d543e10bd5ea915cfe9729dfa6f1eb954ae09c2e4d3997f51315ae090b38606c21b5099e750596ea66fdd93e817 SHA512 9133517d805201d25b651e48abed90394c88ef33a2571ab20b3b19d365f85a90478486c7c087c9150d7d9f6e4026873c5236c64ed649fd3bfc8f9b81479dcc59
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.4.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.4.0.ebuild
new file mode 100644
index 000000000000..39914c80209d
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.4.0.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs toolchain-funcs unpacker
+
+DRIVER_PV="550.54.14"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger examples nsight profiler rdma vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+# since CUDA 11, the bundled toolkit driver (== ${DRIVER_PV}) and the
+# actual required minimum driver version are different.
+RDEPEND="
+	<sys-devel/gcc-14_pre[cxx]
+	>=x11-drivers/nvidia-drivers-525.60.13
+	examples? (
+		media-libs/freeglut
+		media-libs/glu
+	)
+	nsight? (
+		dev-libs/libpfm
+		dev-libs/wayland
+		dev-qt/qtwayland:6
+		|| (
+			dev-libs/openssl-compat:1.1.1
+			dev-libs/openssl:0/1.1
+		)
+		media-libs/tiff-compat:4
+		sys-libs/zlib
+	)
+	rdma? ( sys-cluster/rdma-core )
+	vis-profiler? (
+		>=virtual/jre-1.8:*
+	)"
+BDEPEND="nsight? ( dev-util/patchelf )"
+
+QA_PREBUILT="opt/cuda/*"
+CHECKREQS_DISK_BUILD="15000M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# ATTENTION: change requires revbump, see link below for supported GCC # versions
+	# https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements
+	local cuda_supported_gcc="8.5 9.5 10 11 12 13"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	local pathextradirs ldpathextradirs
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cccl,cudart,cuobjdump,cuxxfilt,demo_suite,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,opencl}
+		builds/lib{cublas,cufft,cufile,curand,cusolver,cusparse,npp,nvjitlink,nvjpeg}
+		builds/nvidia_fs
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti builds/cuda_profiler_api" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d f
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend $?
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	fperms +x ${cudadir}/nvvm/bin/cicc
+	eend $?
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend $?
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/compute-sanitizer
+		# special handling for the executable
+		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
+		eend $?
+	fi
+
+	use debugger && ldpathextradirs+=":${ecudadir}/extras/Debugger/lib64"
+	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		fperms +x ${cudadir}/libnvvp/nvvp
+		eend $?
+		pathextradirs+=":${ecudadir}/libnvvp"
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		# check this list on every bump
+		local exes=(
+			${ncu_dir}/ncu
+			${ncu_dir}/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/OpenGLVersionChecker
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/QdstrmImporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
+		)
+
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui}
+		eend $?
+
+		# remove rdma libs (unless USE=rdma)
+		if ! use rdma; then
+			rm -r "${ED}"/${cudadir}/${ncu_dir}/host/target-linux-x64/CollectX || die
+		fi
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+
+		# check this list on every bump
+		exes+=(
+			${nsys_dir}/host-linux-x64/nsys-ui
+			${nsys_dir}/host-linux-x64/nsys-ui.bin
+			${nsys_dir}/host-linux-x64/ResolveSymbols
+			${nsys_dir}/host-linux-x64/ImportNvtxt
+			${nsys_dir}/host-linux-x64/CrashReporter
+			${nsys_dir}/host-linux-x64/QdstrmImporter
+			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
+			${nsys_dir}/target-linux-x64/nsys
+			${nsys_dir}/target-linux-x64/launcher
+			${nsys_dir}/target-linux-x64/nvgpucs
+			${nsys_dir}/target-linux-x64/nsys-launcher
+			${nsys_dir}/target-linux-x64/sqlite3
+			${nsys_dir}/target-linux-x64/python/bin/python
+			${nsys_dir}/target-linux-x64/CudaGpuInfoDumper
+		)
+
+		# remove rdma libs (unless USE=rdma)
+		if ! use rdma; then
+			rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-x64/CollectX || die
+		fi
+
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-ui}
+		eend $?
+
+		# nsight scripts and binaries need to have their executable bit set, #691284
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+
+		# fix broken RPATHs
+		patchelf --set-rpath '$ORIGIN' \
+		"${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/{libarrow.so,libparquet.so.500.0.0} || die
+		patchelf --set-rpath '$ORIGIN' \
+		"${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/{libarrow.so,libparquet.so.500.0.0} || die
+
+		# remove foreign archs (triggers SONAME warning, #749903)
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
+
+		# unbundle libstdc++
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libstdc++.so.6 || die
+
+		# unbundle openssl
+		rm "${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/lib{crypto,ssl}.so* || die
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/lib{crypto,ssl}.so* || die
+
+		# unbundle libpfm
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libpfm.so* || die
+
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle mesa
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+	fi
+
+	if use examples; then
+		local exes=(
+			extras/demo_suite/bandwidthTest
+			extras/demo_suite/busGrind
+			extras/demo_suite/deviceQuery
+			extras/demo_suite/nbody
+			extras/demo_suite/oceanFFT
+			extras/demo_suite/randomFog
+			extras/demo_suite/vectorAdd
+		)
+
+		# set executable bit on demo_suite binaries
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+	else
+		rm -r "${ED}"/${cudadir}/extras/demo_suite || die
+	fi
+
+	# remove rdma libs (unless USE=rdma)
+	if ! use rdma; then
+		rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/libcufile_rdma* || die
+	fi
+
+	# Add include and lib symlinks
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
+
+	# Remove bad symlinks
+	rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die
+	rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/lib64 || die
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin${pathextradirs}
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+
+	# To address the sandbox errors encountered in packages with CUDA,
+	# such as those documented in https://bugs.gentoo.org/926116, it is
+	# necessary to modify the sandbox environment settings. This change
+	# specifically targets issues during the execution of
+	# CMakeDetermineCompilerABI_CUDA.bin, as observed in a range of
+	# software including caffe2, opencv, vtk, cholmod, and openvdb
+	# (refer to https://forums.gentoo.org/viewtopic-p-8789206.html).
+	# Granting access to /proc/self within the sandbox is essential for
+	# these applications to correctly determine the CUDA compiler ABI
+	# without triggering sandbox violations. While opening up /proc/self
+	# may seem to have security implications, its impact is limited as
+	# it only exposes information about the processes inside the same
+	# sandbox environment. The proposed configuration is as follows:
+	insinto /etc/sandbox.d
+	newins - 80${PN} <<-EOF
+		SANDBOX_PREDICT="/proc/self/task"
+	EOF
+}
+
+pkg_postinst_check() {
+	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 47fa63378559..a141daf0ba8f 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,5 +1,3 @@
-DIST stripe-mock-0.182.0.tar.gz 1531682 BLAKE2B 35a2b81646cd3bcd57b9b45b12bfa19f16be8337ac3261e163fd68daf33b2fce2eb6b655bf17b7858ef6d63296c404dae7798195ec957b7f73752365688b1f0e SHA512 cdfab6c73554e978bec77047eaff74af9d3a3e48f79b7118c8f9603275adcf825076e70fcf84c49bd561de0748c496df5ff4a2cf4d366e39ab82d7c734f8c456
 DIST stripe-mock-0.183.0.tar.gz 1552131 BLAKE2B e67aa487d375c8d7df36cd53ce2052a8a288512870f96abd45d9206b7572f405f91f94c51c8a1f3f6ca5b5411464741ac1db87f09c6eef721fd86308825ee61b SHA512 5ddc6459752092ecca2691da6bbc13a676b1909f0080be18b4154e3ab9f106cea4e97d3816cda0c237bae560631004ddac92debbf1294d3de262325806c4b21a
-EBUILD stripe-mock-0.182.0.ebuild 504 BLAKE2B 0c5bb03539d8951adf39cbd0136ba6e5030f7aa78d56c654a751b5cc64d609687b57f900f92f661d567195a1f25ae2f7ab25da886dba72190feba7298949f4fc SHA512 923f0c772ac40e8e7261f62cb3d0e7cb3aa6c400e706b6508a769ec6f7c56535d24afac724040c61430b3309ac4c25d2d0d5835e521d46b87f2555a9fd3562ab
-EBUILD stripe-mock-0.183.0.ebuild 507 BLAKE2B 27a91d651b531becfed0a42c432226cb82d7938021ba33f64aea3db0a563fba9513533bd1b773a47ddd4b9e2a08ff0e30de75e44c063f7ae7966d9de278ac255 SHA512 31ea1222464ca53e1d16ffa10c9cc794be9b2d2deda22cd4b4aeebf7e31dc64504242559dcd0e54e508ee5b9edd5e7a001c75db98f7e4ec75042906dbd9a16d1
+EBUILD stripe-mock-0.183.0.ebuild 504 BLAKE2B 0c5bb03539d8951adf39cbd0136ba6e5030f7aa78d56c654a751b5cc64d609687b57f900f92f661d567195a1f25ae2f7ab25da886dba72190feba7298949f4fc SHA512 923f0c772ac40e8e7261f62cb3d0e7cb3aa6c400e706b6508a769ec6f7c56535d24afac724040c61430b3309ac4c25d2d0d5835e521d46b87f2555a9fd3562ab
 MISC metadata.xml 643 BLAKE2B 6a45b4c6f7e3372850e8947db71b028a32f6fc63d202b912a0fed600dd7f426984828af2f80dbfbdafb69a15a3b58b82c2b738b424727b28704aefb43f43e361 SHA512 3a1d0724f14ca0885c6dde06b9c0fed1dcf7a9dcbfb32de75682cee9ad2b29fc94f9544319a2fe5d5fe3c25afb01e0f6492616e13e3d01640af7defd0ba9c098
diff --git a/dev-util/stripe-mock/stripe-mock-0.182.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.182.0.ebuild
deleted file mode 100644
index c010548e4abc..000000000000
--- a/dev-util/stripe-mock/stripe-mock-0.182.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
-HOMEPAGE="https://github.com/stripe/stripe-mock/"
-SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT ISC BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-src_compile() {
-	emake build
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin stripe-mock
-	einstalldocs
-}
diff --git a/dev-util/stripe-mock/stripe-mock-0.183.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.183.0.ebuild
index 352d14e2ce00..c010548e4abc 100644
--- a/dev-util/stripe-mock/stripe-mock-0.183.0.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.183.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT ISC BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 src_compile() {
 	emake build
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index 7f5df5ea9ea8..1643766c5d8d 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -179,7 +179,9 @@ DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d35935
 DIST tree-sitter-0.20.8.tar.gz 2941223 BLAKE2B 158820a88b20cc96252f8bfdd257e910ca4dc79174bb45ee52623c923b8a634714c65be8f9534411865fb03aaf84bf16bf659567a74cd58141ea687fa89601e5 SHA512 30fa3f97e1a24d469a7565dc91db629accdfbe081b43d951e9751059a0c7f763d727e95efce5806cd9b1689650773bee1106f4f91ba001da57df3b0d83dda967
 DIST tree-sitter-0.20.9.tar.gz 3041304 BLAKE2B a6cf6606f75918eeab7dab0d2758cdba0922b5677cd4c8755982c077ee0a734090c8a87f7dd1fd56525b5864f94f5f19c3fd04e43773877e13968855f976d0c0 SHA512 6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a
 DIST tree-sitter-0.22.1.tar.gz 3038644 BLAKE2B f4a2cae41e6ec327c8a77380fcf531b00a4fcd75997872c73371886379f35e31431da1e175e41b3c6bee9fdad46015d29bec93a103ea1ff36a1d365dc9a04d40 SHA512 fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7
+DIST tree-sitter-0.22.2.tar.gz 3040339 BLAKE2B c18a79b4fdf553c50b4dd4c67c92d02fd341c5266c4658eb226d9ea455f23d2d22fe4ed4ca48811da2c8a59c403d8eff53dd9257468df7a9cfa640652c485c95 SHA512 a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856
 DIST tree-sitter-cli-0.22.1-crates.tar.xz 21952352 BLAKE2B 6c097ce2cd58495cb0cfb3760f0c4b59b863b2e9eb6af25a178218a82c55b80f2b98bfa18899314b078df68f252aec159d26925abce767afc039c0ee19630026 SHA512 9380762b0217a0b90c9f21c3bc680e0778c09111fc48ff73e2e51534ff62266c69978af5cb758aec353275033935607607c28d24e380d7d2a5ac5d8573c94a19
+DIST tree-sitter-cli-0.22.2-crates.tar.xz 21937812 BLAKE2B faa8e5d5627397a9f613078ab25bc12a7103ceb16ae195f687c47c222139ca27833d6ed16ffc7bafa30b7eeeb9aa206b23f0e45cd11bf34a265861ec3ea15cd9 SHA512 499dedb899a6fc3847be59d0cf5f81a4c93aacd9a12dc1420a0667842fccae5b2ad3e790e89d9b813b6dba4e1a6d7add3b0c4e7f1590402f3b49bfff07e15999
 DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST unicode-ident-1.0.8.crate 41962 BLAKE2B 3e3394a421460b0cdd56f96e1149b3816651ffd7064f9ec85c12050917d0b271eeee4bc3f6d3f0a3c1596635df3dac54bd610243d34e459743fe29b3b931a237 SHA512 8104999c6fff002c5aa109e2ca75ce3eaf772155d31dff87bcf39e3eb3da58b6cb543717be7b55acdb0cb1a4bd2a3d2e9c9974f7f75b6528668f5ef665ef4088
@@ -245,4 +247,5 @@ DIST zerocopy-derive-0.7.15.crate 527188 BLAKE2B 14f407cd48136c8a003084485de2aa7
 EBUILD tree-sitter-cli-0.20.8.ebuild 3231 BLAKE2B 42d9b3c7bbba49dd2e9efadb378394b19f2f2b6c567f811eeb20ddb50333bedfcc42623c9dd613d08fb0d8a13ed34bedad6416f4897f1106655d90c8286ef622 SHA512 37fa95719188ca6b5ac045ab4e51154493928516d914df2a435b0d6ec3c87501caf7da5b6f1b1be028a0e78cbcd7a57d1037596191f8b0a37fe80aa199e6a516
 EBUILD tree-sitter-cli-0.20.9.ebuild 4770 BLAKE2B aca22dea8174bce156a8276635ce47724bdc22eba998cff3c3ea0e1bb378cadb333670517e0a6fc3672d638b3bf95cd617e4252206eabdf2364b1c20a4b94f8b SHA512 1aab05f8512bda8e9a12538c7840cc37c7d867e31bb46dc087de8c8114e3451bded81451ac749aa800c57e6d3d4b948c22cac82d3a6d0e49d84057b4f4203735
 EBUILD tree-sitter-cli-0.22.1.ebuild 945 BLAKE2B 8b8e9bd6dd4c489e681313858e58bb1689e5ea6f6496d6e4b836487f0d187d0cd9ae234719d769dc0c094fcc6aea698f7a142cb0e829a7172368c9fef9771402 SHA512 13042e2dabde7fadcd92f8e88f46bed6cdee85c1ea08c0e24e3afe8d7972062b3ed81132e028e28e1390dd2d52f2a68445224a8823dcb77edcd523dc8853e031
+EBUILD tree-sitter-cli-0.22.2.ebuild 946 BLAKE2B c4a99c7cd5acff39d142848e74cc339e18ecf5514e22f85cefb0208ebaa2b3b341c6137016ce740118c5ea7bb0920c3bebcba0986a8e4877cc0e74da1f2d7e0d SHA512 8d15b2e7a1dd94e98142120b63baef16ecfe1bb097cd01cb17e3721bea899ff7eaf873bd9856fd62888eb1efa6b7b654590b534fdc267c5b564db8674786ec7a
 MISC metadata.xml 678 BLAKE2B e000f4502ed07b8fffcbf05a9dcf0730407d70a00ddf289b8ffdd9e6d28df6481f7e6eec3416aa1278ad9602c098bde72bcaad4f7819c9554c39baf045555dc8 SHA512 37e64d773a4b01b34208b65be600e6f46c7633571d7ad39210b7957f41f31b296565304a4dc8a4ec0518489a89b1bf7a1b204111c4d428307b562e3f6d0575f8
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.2.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.2.ebuild
new file mode 100644
index 000000000000..69ff9a50573c
--- /dev/null
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=tree-sitter
+MY_P=${MY_PN}-${PV}
+
+CRATES="
+"
+inherit cargo
+
+DESCRIPTION="Command-line tool for creating and testing tree-sitter grammars"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz
+	${CARGO_CRATE_URIS}
+	https://dev.gentoo.org/~arthurzam/distfiles/dev-util/${PN}/${P}-crates.tar.xz"
+S="${WORKDIR}"/${MY_P}/cli
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0
+	Unicode-DFS-2016
+"
+SLOT="0"
+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"
+
+BDEPEND="~dev-libs/tree-sitter-${PV}"
+RDEPEND="${BDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${MY_PN}"