6 files changed, 172 insertions, 2 deletions
diff --git a/dev-util/cargo-nextest/Manifest b/dev-util/cargo-nextest/Manifest
index 71f92bfe445a..dc2a1a1066b8 100644
--- a/dev-util/cargo-nextest/Manifest
+++ b/dev-util/cargo-nextest/Manifest
@@ -2,7 +2,9 @@ DIST cargo-nextest-0.9.132.tar.gz 8425779 BLAKE2B 1f83424b858273c333b537aed0d74d
 DIST cargo-nextest-0.9.133.tar.gz 8443828 BLAKE2B 9d75d41195fd65636eb1cb86a91f081d7a3014ca7a4e978fa584f5d3f773bbda502c98d85e160167f1fe841dc295ff2e423948dcb3e1c25f980e459e44bb0f71 SHA512 b5938e9660790cb19853752158a71726181b8a16865bb42970ea292f975f2496f01f3afe06315455af01ae2009060515fd4f046d6611c9d4babef6ada3148d8c
 DIST cargo-nextest-0.9.135.tar.gz 8991115 BLAKE2B af190141a6711bd484bfbfd2ebd70d63759421df9324c88f87e7260edb45e06e3334156d33948183175f5d402b2717cc4a7a6cf55974d083cb7eb2ca8e36e5dc SHA512 2741c6c2196f4e4fa07b5d05aa1a848141dccee9e85e444656c4276f23fb99cf1d187a4a693eca9c56ba9e46b8662f83878df0ee8b8e8c86d42e18b7eb53b5db
 DIST cargo-nextest-0.9.137.tar.gz 9004735 BLAKE2B 7467d6f0c573016f44fcd8d07666b1889a0b023a0954193b9c6b51c3f1fb463902a8e2d37296fc630985892f733737e1c6364a2c47c7b530fca452a411b401e8 SHA512 e6e276d2dc718469af82dc9d971ff123c8237b8881f4b4123fd57552d7aaa7d3cf604c171658c34c9f04d71720535abacf9db35fef607be5e2d433790a0d8cf3
+DIST cargo-nextest-0.9.138.tar.gz 9007048 BLAKE2B 4646889d0314a4635679e5bd6d36c372642c14a371123d5c2de27738cc1c670f163285c230241ce6af97835ffcd7582638bcedf473251b465f128936ad190a6e SHA512 3a4d3c36b66486cc913b80b051afd411bde43b64aed9ab6de0c8a40f5dfc1f3be60667d2d29b8316cd0ba0a29365a7bff8739042fa4c8ff77484be6f573f3a22
 DIST nextest-cargo-nextest-0.9.132-crates.tar.xz 41050612 BLAKE2B df50c64936d49977407d04a8303209a780719aae5bbd08dcaf27cbf876458c5aadfcf259decc86627e2c283a57aa5475685534eaa982a50f2741102e8110d3e5 SHA512 9f2e670f7a6d358b4c3dbac6824c4a532181772f17ff7f23e57f3ad7c1bac0e4b70185c3ed49f7de41bbf6e71518bc1fae8ee4767f82c7371ce9dd2fd59d6daa
 DIST nextest-cargo-nextest-0.9.133-crates.tar.xz 41880468 BLAKE2B bb504f042ea3bcb5470ef82e1cc137bb06a7841f8a7d683a00ab410426c571476fc36f10b5345b9311e59d16db3dbfcd1ab4375c98d48cfa0d1e9d7f10ecd140 SHA512 13020161282ce2fa23e820d119cc63d7e1df84dc661616941d4ab951339e9fcde903cd25e56669f3b648ea14b218688d1ef47c237ce6d26f30e23a9da09f0b64
 DIST nextest-cargo-nextest-0.9.135-crates.tar.xz 43510388 BLAKE2B 6d3f80e40805c060584f2c09f69ef2faf557ba165692f0c6360242d5be558adc3faea0c1315e4d03a167aef56b151180fb39140803a52a8ccd7ee4c8611875db SHA512 eb7d4045684beb86dddc80c75264ed3b641e38593e0f80484aefca43ddd9035ba3b3a3725d65cec434ed01eb61e6f786ab00e239ca19787c651b246873a2a17e
 DIST nextest-cargo-nextest-0.9.137-crates.tar.xz 43524284 BLAKE2B 130c0eede4e9bee25a18d0484d9571b6de640fea5bd06afa65303b4a80f052107e145b82448ba222c2381e21e8c41771404d4d5078bb29c19eca93356ee4ad7a SHA512 401ed9825e92690a2c83b8c4f9a1abc59770521ab95791018e66360fe6a2a6c2dedd971ee7470837238d62ad0f510d8deda3863809f0eaddfb46a51a159911a4
+DIST nextest-cargo-nextest-0.9.138-crates.tar.xz 43553040 BLAKE2B 352634d2a1250b208f11756b3463400278b9db8e10c82515570ba8e701b6392140f5f3f4f045e4ae30a0f8eb6b10bff0e549093025b5e68a07343033e2bfd4ff SHA512 f2948c3e9b7411246e0e1aa04c77a749e0c7fa7fb850278af5224256d247be9fcd4dafdb5f71c91d7af69ad4b507acf2b5c8c7255c1cb43af5f71e5dcac492ac
diff --git a/dev-util/cargo-nextest/cargo-nextest-0.9.138.ebuild b/dev-util/cargo-nextest/cargo-nextest-0.9.138.ebuild
new file mode 100644
index 000000000000..e41c53dd2a2e
--- /dev/null
+++ b/dev-util/cargo-nextest/cargo-nextest-0.9.138.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2023-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+RUST_MIN_VER="1.91.0"
+
+inherit cargo
+
+DESCRIPTION="Next-generation test runner for Rust"
+HOMEPAGE="https://nexte.st/"
+SRC_URI="
+	https://github.com/nextest-rs/nextest/archive/refs/tags/${P}.tar.gz
+	https://github.com/gentoo-crate-dist/nextest/releases/download/${P}/nextest-${P}-crates.tar.xz
+"
+S="${WORKDIR}"/nextest-${P}/${PN}
+
+LICENSE="|| ( Apache-2.0 MIT )"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0
+	CDLA-Permissive-2.0 ISC MIT MIT-0 MPL-2.0 Unicode-3.0
+	Unicode-DFS-2016 WTFPL-2 ZLIB
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-arch/zstd-1.5.7:="
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+pkg_setup() {
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	rust_pkg_setup
+}
+
+src_configure() {
+	local myfeatures=( default-no-update )
+	cargo_src_configure --no-default-features
+}
diff --git a/dev-util/mesa_clc/Manifest b/dev-util/mesa_clc/Manifest
index ef9190da443c..06e17cce2c54 100644
--- a/dev-util/mesa_clc/Manifest
+++ b/dev-util/mesa_clc/Manifest
@@ -3,3 +3,4 @@ DIST mesa-26.0.7.tar.xz 43957380 BLAKE2B c4925b0e42660441ed5ee791e9b13a0222e971e
 DIST mesa-26.0.8.tar.xz 44001316 BLAKE2B 525d35e0c224631bb8a74b31485625de3d0e9575873ce5298d9ae84e01e445de22e4ee30dacacca6552b2c6584aaeaaf6242c59a696435ddc2e037e046bb6c25 SHA512 3a43648a86c1bc48161a1669733b6c6a9294bf27ffb529f2ce078c2daa3b90b8c53b9cc06312197fb3a0830303d0b326d7535fb15849e6c26fad58009f3a6112
 DIST mesa-26.1.1.tar.xz 77544276 BLAKE2B 2acad90126cc381f29024f46f32ee324fef9497ef47ec504d561cbd6580200b6b66e5da3b6d7038bcc801af6690b03844d336dbb2508dd8b0d0cc10dd551382d SHA512 384a7db33d2f06e287337329f2f17503082ba6b1cd876a1884e940fdb6193ffae6d6b14344625256f3b3b39972ad697130a4d2ea25c40979f7aa76c2176f7988
 DIST mesa-26.1.2.tar.xz 77620608 BLAKE2B d78778c2905db11f95d09a0b29eb35fe0fe4eb83cf64746d423b28047720c11f9bae9cdac50dea5c3b22889a7bda137a6a44e2a9db6c71621266ee6929210ab9 SHA512 08e7b6357c27bf6e13f59e6fb0f84b73ec25c2d1a01cd09ffcc35ab263f278f10f3bd36fde419f60e78e781abcb315a432d0d5ceb3bab0bca26b8a2a39758e03
+DIST mesa-26.1.3.tar.xz 77608344 BLAKE2B faccf9aeb76b0920c1746cf911e9d4de2d0b1a41eb1efe5f74a3f5957700e098acf8ef379149a8f844cc39c0e49503223cda7a2a164bb382e8b65480c0626921 SHA512 6dd452e8c7f2e7e9a26733f53dd0daf4df824f82de3d37c171581854dd419f519e104212aacdf8bdf94042a845d9ba5c45a1605d7cba1dc491570a9e72a91f83
diff --git a/dev-util/mesa_clc/mesa_clc-26.1.3.ebuild b/dev-util/mesa_clc/mesa_clc-26.1.3.ebuild
new file mode 100644
index 000000000000..94f8a643e951
--- /dev/null
+++ b/dev-util/mesa_clc/mesa_clc-26.1.3.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2023-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {18..22} )
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit llvm-r2 meson python-any-r1
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="mesa_clc tool used for building OpenCL C to SPIR-V"
+HOMEPAGE="https://mesa3d.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/mesa_clc-${MY_PV}"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/mesa-${MY_PV}"
+	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+VIDEO_CARDS="asahi panfrost"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+IUSE="${IUSE_VIDEO_CARDS} debug"
+
+RDEPEND="
+	dev-util/spirv-tools
+	$(llvm_gen_dep '
+		dev-util/spirv-llvm-translator:${LLVM_SLOT}
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/llvm:${LLVM_SLOT}=
+		=llvm-runtimes/libclc-${LLVM_SLOT}*
+	')
+"
+DEPEND="${RDEPEND}
+	dev-libs/expat
+	>=virtual/zlib-1.2.8:=
+	x11-libs/libdrm
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep "
+		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
+		dev-python/packaging[\${PYTHON_USEDEP}]
+		dev-python/pyyaml[\${PYTHON_USEDEP}]
+	")
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
+}
+
+pkg_setup() {
+	llvm-r2_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	tools_enable video_cards_asahi asahi
+	tools_enable video_cards_panfrost panfrost
+
+	tools_list() {
+		local tools="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${tools//$'\n'/,}"
+	}
+
+	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
+
+	use debug && EMESON_BUILDTYPE=debug
+
+	local emesonargs=(
+		-Dallow-broken-lto=true
+		-Dllvm=enabled
+		-Dshared-llvm=enabled
+		-Dmesa-clc=enabled
+		-Dinstall-mesa-clc=true
+		-Dprecomp-compiler=enabled
+		-Dinstall-precomp-compiler=true
+		-Dtools=$(tools_list "${TOOLS[*]}")
+
+		-Dgallium-drivers=''
+		-Dvulkan-drivers=''
+
+		# Set platforms empty to avoid the default "auto" setting. If
+		# platforms is empty meson.build will add surfaceless.
+		-Dplatforms=''
+
+		-Dglx=disabled
+		-Dlibunwind=disabled
+		-Dzstd=disabled
+
+		-Db_ndebug=$(usex debug false true)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/compiler/clc/mesa_clc
+	dobin "${BUILD_DIR}"/src/compiler/spirv/vtn_bindgen2
+	use video_cards_asahi && dobin "${BUILD_DIR}"/src/asahi/clc/asahi_clc
+	use video_cards_panfrost && dobin "${BUILD_DIR}"/src/panfrost/clc/panfrost_compile
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of tools to enable
+tools_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		TOOLS+=("$@")
+	fi
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.40.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.40-r1.ebuild
index 1e6e95f70e8c..a2379e445d21 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.40.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.40-r1.ebuild
@@ -35,7 +35,7 @@ fi
 RDEPEND+="
 	app-arch/zstd
 	>=dev-libs/tree-sitter-bash-0.25.1[python,${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/charset-normalizer[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
 	>=dev-python/tree-sitter-0.25.2[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 1e6e95f70e8c..a2379e445d21 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -35,7 +35,7 @@ fi
 RDEPEND+="
 	app-arch/zstd
 	>=dev-libs/tree-sitter-bash-0.25.1[python,${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/charset-normalizer[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
 	>=dev-python/tree-sitter-0.25.2[${PYTHON_USEDEP}]