12 files changed, 94 insertions, 241 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 20afbcd416e8..e393e841cf26 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index a424eb40047c..19a35acc9070 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,12 +1,5 @@
 AUX bolt-0.9.8-sockaddr.patch 2983 BLAKE2B c920e37e0929aba68cf600c9c46845ac39f93b313a22ffe7879ba512e655bcb8fa707678049482976ae11d5fdaa41daa27e1ed8bb3996f0c2a9d9680c1a3d750 SHA512 8524b546ea1b1ee8343cdb0b874dce5805a4592ee88ea076c22202004b9e0a06e9eaaf02bf01a416add21d44a6a4df563cbebd101f09ecfa612955d5ed26cd51
-AUX bolt.openrc 362 BLAKE2B 1cefc0db24bcd6dca7483a582f89a68800e13651330d8873c2b9f3042c70e0f8d8a2b7c363ceeae5ec63fa4b736b42e129f9e90ea4a576e5419af7e0e26d848e SHA512 59616543c6cd101373249b06bcbc0b7dd13fb2c8e45d6dc61a56088434cdf0a6b57630471bd2d788dd6253b66bcbfc3ec60b11ba8442043e837119130344216e
 AUX bolt.openrc-r1 374 BLAKE2B 91dcbfb842166837d4a89c12e7c8b39db9810ba1ffd18eb1ee61798f3634952440b1bb79118d1486819c34916b266a8c47b4398df42ba8f0c3411d482e2e4874 SHA512 3731459efce91c89e5a601b649acc7ed4faee4d08d2a52a5784dc53b914a15113003516e8fed64e532dc703e019ed53b37ec9a4414b770165c1e46813392f9d3
-DIST bolt-0.9.3.tar.gz 253085 BLAKE2B 7547a35aa16a7681737989c72dfd2e13245eb50c7b814de979974750e3c8805156fd22054308d715299baab3ebd4144923aacc04ef301ee039e84b6370cbcba7 SHA512 2160831011090e75cf54408525f53ead6c0e7797de8a4afdd07ef5a035f8e1aa58f34efb9bd52e6e7cd93ac17751e72ff27e99f2b372a5720b2cbadd6abb3c26
-DIST bolt-0.9.6.tar.bz2 192324 BLAKE2B 88e5b94e75833bb5cef090650158ffd26e642188e876cf54407fee7535498faa7ff138b7d47911ea85cacf2bb6ac778b32c23d5cd942c27d1edacc395ec6c9a3 SHA512 7a72b17dbb02917fd55cc480bc4c3ec948577b61aab2ffb366608e82ca65add4e7b402c3b89fd3f98f660165b335ebc9564444bbae3ab55bd6a63c4e0019266a
-DIST bolt-0.9.7.tar.gz 255976 BLAKE2B c7764cb1334f2df96856cb9a92fe6c0ba97ed81340690537fe4567f81bbbf1ee4fbfc659c8b43716f6756d53ab21c71a5c8c9952aea19d1c3f0c14386d327331 SHA512 a9ae0425cdba8932356ec4dcf3f6b3469478c01d47ef3b741c0a841117c81b354f35860be6011ea3b43b28ae10164909a82e2bdbcf92e8541c637cf44277a36c
 DIST bolt-0.9.8.tar.bz2 192836 BLAKE2B 7a06572562af5586d479fee58fb2469b8d804d6eafb41a52c5a575ef2acf616fb684b4e92181430444d67d9889c836bd6d96e1a6d3460cd01300f80d99876c04 SHA512 e9b2ccca66930ee40fd283b09e4bd2bffe1f496e4f898a9d4e069e673a2c9320d456b9ad4b33c4e3e26d25f363985a798c6c860c4c0b103558dbbab78f02ba2b
-EBUILD bolt-0.9.3.ebuild 1510 BLAKE2B e4bb0dc43a908819536be8f6bfef2192b0bd91bdb7709591a7d6ec6456ea5c4acd26321853827991ef06c3132881a0dca72a8d2bfc934dc38b7205e6489ea7cf SHA512 f1aa444fc9b97175c4835e25bd680ec25e4a84dc3f68dd1c3987f2125cd68f93f2be639f13b2d1cf0b868be33906ca082c26c151a2dbe1cf06c6237b2c038d2d
-EBUILD bolt-0.9.6.ebuild 1513 BLAKE2B 0e226e6df150925b5959cb2152e9d4916a428a120fe9fb70a8fdcd3362b03c58332e9e3ae6739d95437de6c9cb2438430715ec4b458b4fe3f06cff0314955d50 SHA512 df6053b1cac9ced5343215ead505d856c591174d56198acdf215eba3d080c702e6eaeb8ecdf5b2208d251dd101505dbeb93f3e7d2807ae6df72526baf944bc18
-EBUILD bolt-0.9.7.ebuild 1512 BLAKE2B caaa983eafc672942494982a5625ca9132abe5b0e3b3e81425b23c173b1e7aef84c6b637bcf29d3304eef284ecf01653d74e638f572e960b163a2e4e91b39849 SHA512 3c348403e36266a8f2cf6203f7e34e76830791c7d1d6507f522b2fb53c82c841e607eef078494b0c2f7be459f4ea73daf08dfff4c3967262f5b40ee27f62d91c
 EBUILD bolt-0.9.8-r1.ebuild 1857 BLAKE2B e3790fbcd41e03ecd1ff357206e77e3a5f78fe9c60a6201340618bf71bd351aa579a954b8310adaf75274a4fa563944675dae851393508c74d22b406a3a89c82 SHA512 8f9b05699e833ee05fb5db7783a883ab4704ab288568a370ba4e43364ee27e779b1eb1ffb430b2885280628d356c56d39069a5be09605890d03ea2fe3b9bed6a
 MISC metadata.xml 451 BLAKE2B 94c6636aad24b94547fb550df1140079bb97aabbbeb4834f60760926f5ca21b5da7617621afb2f27744dd1fc93110e0f13cf7b1190dff0d5c9593e730aa69d0a SHA512 0f136a7526bfa3c8edf6ca2c6e065cfff5fc591d5be4f3bfbc68886b8e880ea870b7505a342098a9406eb942fb11dc2b34f0f8c7da53c5514640f508c95658db
diff --git a/sys-apps/bolt/bolt-0.9.3.ebuild b/sys-apps/bolt/bolt-0.9.3.ebuild
deleted file mode 100644
index 16e2be81e05b..000000000000
--- a/sys-apps/bolt/bolt-0.9.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info meson udev
-
-DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
-HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~loong ~riscv x86"
-IUSE="selinux test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.56.0:2
-	virtual/libudev:=
-	virtual/udev
-	sys-auth/polkit[introspection]
-	selinux? ( sec-policy/selinux-thunderbolt )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/umockdev )
-"
-BDEPEND="
-	app-text/asciidoc
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	if use kernel_linux && kernel_is lt 5 6; then
-		CONFIG_CHECK="~THUNDERBOLT"
-		ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver."
-	else
-		CONFIG_CHECK="~USB4"
-		ERROR_USB4="This package requires the USB4 kernel driver for Thunderbolt support."
-	fi
-	CONFIG_CHECK+=" ~HOTPLUG_PCI"
-	ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support."
-
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman=true
-		--sysconfdir="${EPREFIX}"/etc
-		--localstatedir="${EPREFIX}"/var
-		--sharedstatedir="${EPREFIX}"/var/lib
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	newinitd "${FILESDIR}"/${PN}.openrc-r1 boltd
-	keepdir /var/lib/boltd
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-apps/bolt/bolt-0.9.6.ebuild b/sys-apps/bolt/bolt-0.9.6.ebuild
deleted file mode 100644
index eceef5e6be77..000000000000
--- a/sys-apps/bolt/bolt-0.9.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info meson udev
-
-DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
-HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~riscv ~x86"
-IUSE="selinux test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.56.0:2
-	virtual/libudev:=
-	virtual/udev
-	sys-auth/polkit[introspection]
-	selinux? ( sec-policy/selinux-thunderbolt )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/umockdev )
-"
-BDEPEND="
-	app-text/asciidoc
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	if use kernel_linux && kernel_is lt 5 6; then
-		CONFIG_CHECK="~THUNDERBOLT"
-		ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver."
-	else
-		CONFIG_CHECK="~USB4"
-		ERROR_USB4="This package requires the USB4 kernel driver for Thunderbolt support."
-	fi
-	CONFIG_CHECK+=" ~HOTPLUG_PCI"
-	ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support."
-
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman=true
-		--sysconfdir="${EPREFIX}"/etc
-		--localstatedir="${EPREFIX}"/var
-		--sharedstatedir="${EPREFIX}"/var/lib
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	newinitd "${FILESDIR}"/${PN}.openrc-r1 boltd
-	keepdir /var/lib/boltd
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-apps/bolt/bolt-0.9.7.ebuild b/sys-apps/bolt/bolt-0.9.7.ebuild
deleted file mode 100644
index 3fc4a5615f8e..000000000000
--- a/sys-apps/bolt/bolt-0.9.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info meson udev
-
-DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
-HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~riscv ~x86"
-IUSE="selinux test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.56.0:2
-	virtual/libudev:=
-	virtual/udev
-	sys-auth/polkit[introspection]
-	selinux? ( sec-policy/selinux-thunderbolt )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/umockdev )
-"
-BDEPEND="
-	app-text/asciidoc
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	if use kernel_linux && kernel_is lt 5 6; then
-		CONFIG_CHECK="~THUNDERBOLT"
-		ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver."
-	else
-		CONFIG_CHECK="~USB4"
-		ERROR_USB4="This package requires the USB4 kernel driver for Thunderbolt support."
-	fi
-	CONFIG_CHECK+=" ~HOTPLUG_PCI"
-	ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support."
-
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman=true
-		--sysconfdir="${EPREFIX}"/etc
-		--localstatedir="${EPREFIX}"/var
-		--sharedstatedir="${EPREFIX}"/var/lib
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	newinitd "${FILESDIR}"/${PN}.openrc-r1 boltd
-	keepdir /var/lib/boltd
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-apps/bolt/files/bolt.openrc b/sys-apps/bolt/files/bolt.openrc
deleted file mode 100644
index b80a7b31b26e..000000000000
--- a/sys-apps/bolt/files/bolt.openrc
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-name="Thunderbolt Security Daemon"
-description="Userspace system daemon to enable security levels for Thunderbolt 3"
-command="/usr/libexec/boltd"
-command_background="true"
-pidfile="/var/run/boltd.pid"
-
-depend() {
-	need dbus
-	before xdm
-}
diff --git a/sys-apps/pkgcraft-tools/Manifest b/sys-apps/pkgcraft-tools/Manifest
index 901eb9795542..7b1317094112 100644
--- a/sys-apps/pkgcraft-tools/Manifest
+++ b/sys-apps/pkgcraft-tools/Manifest
@@ -2,9 +2,11 @@ DIST pkgcraft-tools-0.0.17.tar.xz 20947804 BLAKE2B d574536965680ff5b41848a36e2fa
 DIST pkgcraft-tools-0.0.19.tar.xz 20944764 BLAKE2B f7584359f1f3b853b11186eee7f2a2a189e94540d8efbe27d1f624a42d30a03e834ad585b91247f8796676869ff51539ed67ed254437891407eacb1331785599 SHA512 7a4421568693496c2a5185bdf7430cc7f8c2739a2a47512cf31c2696f4f3c7faf1f4d9f523ae4685daa5a14de6f812a3320f24522765ae6004829ec357a9bb8c
 DIST pkgcraft-tools-0.0.21.tar.xz 30344180 BLAKE2B cdbe238ca7b69b25e4abb57594f1c5e837b3bf18a5057005f9e4455e53cd9c7320b34bbef922b96a718e65b28d478d92e3f124e39ad6db86e9e6f0b261e0bbd8 SHA512 4e7e4f3109b53c74e0974968c6839c115da2ea57985c45b44b7e99ca7ef7b79739aa36c7bc57159a78ec65bbea71471fa64c52aa3fd6a612d1b9915f0d3ea51e
 DIST pkgcraft-tools-0.0.22.tar.xz 30423796 BLAKE2B 629aa46a6d11deda0115837b711868956d5d8eb504437c5811feb248c8dd05b494bb2fc610041ba3b8a6a9fd892e576ec58a17f0e67c645114f9cfaed88135ab SHA512 53bde64ff94c23c7f4c149843573fba7a294869fa486631a1cac46fe9dc3560d4fe337d6b242b2709106f6a5da798718a8244349bd058de92856c6d7c0b457ad
+DIST pkgcraft-tools-0.0.23.tar.xz 31798292 BLAKE2B 04b858acd0b452c60d2149c21026ba991c70a85d8efe5ce444a3cff07ebbfa1c3713da96c70c3f49f660669b219d87897daba6bd9024dff6d3dd6e2f885d9e3e SHA512 0fec5a93a29ef87a651ce8b36421027f9b2668bd93b09437923bf83c37ca21eb579d000aee1bbe176ff00d3e95d0dd95d024d0acd3636b110746de38984e40a7
 EBUILD pkgcraft-tools-0.0.17.ebuild 1304 BLAKE2B a67ec0399a8d63ecda861c99f85f20fe2494e795df0decb2244f43bef06420b02e9286ee0c25ca51c49cd7a2c872fe37bdbc061cc3c762575cccffd9525a84b9 SHA512 fa52973a6b960532ab62a5afaa04f9def0f5f08eb0c5c36f37512029ce9ac3482b6685ffc0db9cc7275676f336757915755f39875b8de33aaf3970f77cf7205c
 EBUILD pkgcraft-tools-0.0.19.ebuild 1304 BLAKE2B a67ec0399a8d63ecda861c99f85f20fe2494e795df0decb2244f43bef06420b02e9286ee0c25ca51c49cd7a2c872fe37bdbc061cc3c762575cccffd9525a84b9 SHA512 fa52973a6b960532ab62a5afaa04f9def0f5f08eb0c5c36f37512029ce9ac3482b6685ffc0db9cc7275676f336757915755f39875b8de33aaf3970f77cf7205c
 EBUILD pkgcraft-tools-0.0.21.ebuild 1469 BLAKE2B ee924d71184ad506502e5b1d94f1ffccdddd0e69f0ba0e948e36a2837cf4e94b3344e74501276ade2a0ea74e136e8a52094d8b2cc906156a4b330e21ebae8660 SHA512 c42b3051380bd970ba850193aa8fb38da4d307d54b7afea15ca6fe63921445cf26a8d0367254142a72326d6bd68bf9ccbb44ea97eca849cedc3e2bdefac730ba
 EBUILD pkgcraft-tools-0.0.22.ebuild 1315 BLAKE2B eed00afcdc34ef5033857fed2d41edc84da6d34c8b83009e9d4a7ecc3b7859876a904cc785488a9ef1b124ea12aae7cec3fab8538457319a3dacb86425c00465 SHA512 db75ada55e8ea2efbc421b4f61277ce1cc0f32b9d12b9e470fb908f8a47deacb4b3bf9d7f62d2d42f411189b1a655ff49bc622c76af97c6fc56f50dfea201996
-EBUILD pkgcraft-tools-9999.ebuild 1315 BLAKE2B eed00afcdc34ef5033857fed2d41edc84da6d34c8b83009e9d4a7ecc3b7859876a904cc785488a9ef1b124ea12aae7cec3fab8538457319a3dacb86425c00465 SHA512 db75ada55e8ea2efbc421b4f61277ce1cc0f32b9d12b9e470fb908f8a47deacb4b3bf9d7f62d2d42f411189b1a655ff49bc622c76af97c6fc56f50dfea201996
+EBUILD pkgcraft-tools-0.0.23.ebuild 1489 BLAKE2B 881de42664c9fd49b97832be42434f2816b3cec7e08eeab432a112ad0313e5e8fd7b603cfaf7f4ba7bb0cb7924f631b91b42e2efeb93096ba91f9bcb09e49b1a SHA512 caf98d4a043eb514ff9de6afcf548ff2246dc43eeeeeb13fd73cd6b3a9939b115b5993aaec61774e30ebfee96f3f78a25636f9f9ed3dcc45c19ab2c069401314
+EBUILD pkgcraft-tools-9999.ebuild 1489 BLAKE2B 881de42664c9fd49b97832be42434f2816b3cec7e08eeab432a112ad0313e5e8fd7b603cfaf7f4ba7bb0cb7924f631b91b42e2efeb93096ba91f9bcb09e49b1a SHA512 caf98d4a043eb514ff9de6afcf548ff2246dc43eeeeeb13fd73cd6b3a9939b115b5993aaec61774e30ebfee96f3f78a25636f9f9ed3dcc45c19ab2c069401314
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.23.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.23.ebuild
new file mode 100644
index 000000000000..76d67f13b66c
--- /dev/null
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.23.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=" "
+LLVM_COMPAT=( {17..19} )
+RUST_MIN_VER="1.82.0"
+
+inherit cargo edo multiprocessing llvm-r1 shell-completion
+
+DESCRIPTION="pkgcraft-based tools for Gentoo"
+HOMEPAGE="https://pkgcraft.github.io/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
+	inherit git-r3
+
+	S="${WORKDIR}"/${P}/crates/pkgcraft-tools
+else
+	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz"
+
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT Unicode-DFS-2016"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test ) "
+
+QA_FLAGS_IGNORED="usr/bin/pk"
+
+# Clang needed for bindgen
+BDEPEND="
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+	')
+	test? ( dev-util/cargo-nextest )
+"
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_test() {
+	unset CLICOLOR CLICOLOR_FORCE
+
+	local -x NEXTEST_TEST_THREADS="$(makeopts_jobs)"
+
+	# pkg::env::current_dir is likely sensitive to ebuild env
+	edo ${CARGO} nextest run $(usev !debug '--release') \
+		--color always \
+		--all-features \
+		--tests \
+		-- --skip pkg::env::current_dir
+}
+
+src_install() {
+	cargo_src_install
+
+	newbashcomp shell/pk.bash pk
+	dozshcomp shell/_pk
+	dofishcomp shell/pk.fish
+}
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
index c5968bc757d6..76d67f13b66c 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
@@ -7,7 +7,7 @@ CRATES=" "
 LLVM_COMPAT=( {17..19} )
 RUST_MIN_VER="1.82.0"
 
-inherit cargo edo llvm-r1 shell-completion
+inherit cargo edo multiprocessing llvm-r1 shell-completion
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -57,7 +57,14 @@ src_unpack() {
 src_test() {
 	unset CLICOLOR CLICOLOR_FORCE
 
-	edo ${CARGO} nextest run $(usev !debug '--release') --color always --all-features --tests
+	local -x NEXTEST_TEST_THREADS="$(makeopts_jobs)"
+
+	# pkg::env::current_dir is likely sensitive to ebuild env
+	edo ${CARGO} nextest run $(usev !debug '--release') \
+		--color always \
+		--all-features \
+		--tests \
+		-- --skip pkg::env::current_dir
 }
 
 src_install() {
diff --git a/sys-apps/uutils-coreutils/Manifest b/sys-apps/uutils-coreutils/Manifest
index 5f34044dbaf9..15d637628e7d 100644
--- a/sys-apps/uutils-coreutils/Manifest
+++ b/sys-apps/uutils-coreutils/Manifest
@@ -469,6 +469,6 @@ DIST zip-1.1.4.crate 77910 BLAKE2B 1c6a0e14becbb43faa9510d303ab254486e97730bc741
 DIST zip-2.2.2.crate 108809 BLAKE2B e6d7792b70ab397ef340d37167266b87538d2e0ad422d02b053f6b492c8ed13535ea18d5d4077350286b3c2f79623a01ec89544f6334eddd07c87b0d443f19ae SHA512 0255079792b786a55dd18587daf178456f2b79f83d767ba42504f8b7163eebc152c02500097edd78bb37916444c9ad9905779367c6d743489502468258f1706e
 DIST zopfli-0.8.1.crate 50972 BLAKE2B 27cde48858dc65ec8082d4e0d81e2758f92d3dcc7a1c1f08aa6448e99f2995a865ac3259353b26e787f108c2f88ce3c7610413ea9d3daae6f864900d74565de6 SHA512 799e25c0cc9f0bf2119a7c03225b11ed94e7c3ac83f872a27da8ae15c90206245121c38f5e2b78fece131f5bb428f01fabbfd1b1e18ea456957940042d38f38d
 EBUILD uutils-coreutils-0.0.28.ebuild 8418 BLAKE2B 841dd712e01d48d7686b75f733aeddfb01a695c3f9e4f57ce330b90603347dad43ce373aa491516b5003d0a9e068b3deb94f53732a56a2ba4def899da0ef7737 SHA512 f8d9fbb8a72e416af66ad259051094f8712aef7f0c936171f978f0dad4a3972a76eee77fa24894aec1e5a7cfe40b25599177a87631b522c1bbda836f35b13958
-EBUILD uutils-coreutils-0.0.29.ebuild 8139 BLAKE2B 535d44e72ee7c9a661dc013b06c005290f9359ffa7966b66e3c40084e06b5da0235345ec437280f015af3e4255a8851b54457211bbeb2e1d0a698d18a867b6da SHA512 7474519b8d4068e7a7d16514b98c4849855b729fd49a738f361a26e5265792f3efba0c171c07fdc8eecb45d9635def323412105ee4bcd47dfe8854c9c23a69b2
-EBUILD uutils-coreutils-9999.ebuild 8139 BLAKE2B 535d44e72ee7c9a661dc013b06c005290f9359ffa7966b66e3c40084e06b5da0235345ec437280f015af3e4255a8851b54457211bbeb2e1d0a698d18a867b6da SHA512 7474519b8d4068e7a7d16514b98c4849855b729fd49a738f361a26e5265792f3efba0c171c07fdc8eecb45d9635def323412105ee4bcd47dfe8854c9c23a69b2
+EBUILD uutils-coreutils-0.0.29.ebuild 8205 BLAKE2B 4b491c760606a0d946bb91a923cfe9a4009fce1ee63a9609b849418958815a1d2fbf1797c51ef7cbd6de01838afcdd423547ef12416981452b1233d9b78db033 SHA512 e8b530accd6e12e0465ca51c04aee716aa9d6d33db58e4a40600647646a2f47ce472e7daf4ac690c3e13208a6ffad7bbfe2cf1bbe53460a3477c506ebaf069f1
+EBUILD uutils-coreutils-9999.ebuild 8205 BLAKE2B 4b491c760606a0d946bb91a923cfe9a4009fce1ee63a9609b849418958815a1d2fbf1797c51ef7cbd6de01838afcdd423547ef12416981452b1233d9b78db033 SHA512 e8b530accd6e12e0465ca51c04aee716aa9d6d33db58e4a40600647646a2f47ce472e7daf4ac690c3e13208a6ffad7bbfe2cf1bbe53460a3477c506ebaf069f1
 MISC metadata.xml 626 BLAKE2B 4a7a3c7683c6c0260951085755d6b6942213612b1bd4d58228d88e18f260b18d53eb2c3e0169b991ed60b3ef8213f59a7d2bc484c5c9940cb7f68a9862b75f96 SHA512 5d358e0e1248090fe494c26aba98a7e4d881c4cf9361bd5ae97cf88f79e89a98faa01b32c4199e39cd0104a2862dda9130323c24cf7d022b8ada774b93b86a50
diff --git a/sys-apps/uutils-coreutils/uutils-coreutils-0.0.29.ebuild b/sys-apps/uutils-coreutils/uutils-coreutils-0.0.29.ebuild
index e62645b6edfa..89cac79fa4c6 100644
--- a/sys-apps/uutils-coreutils/uutils-coreutils-0.0.29.ebuild
+++ b/sys-apps/uutils-coreutils/uutils-coreutils-0.0.29.ebuild
@@ -312,7 +312,7 @@ CRATES="
 	zopfli@0.8.1
 "
 
-inherit cargo flag-o-matic
+inherit cargo flag-o-matic multiprocessing
 
 DESCRIPTION="GNU coreutils rewritten in Rust"
 HOMEPAGE="https://uutils.github.io/coreutils/ https://github.com/uutils/coreutils"
@@ -400,6 +400,7 @@ src_compile() {
 
 src_test() {
 	local -x RUST_BACKTRACE=full
+	local -x NEXTEST_TEST_THREADS="$(makeopts_jobs)"
 
 	# Nicer output for nextest vs test
 	emake "${makeargs[@]}" \
diff --git a/sys-apps/uutils-coreutils/uutils-coreutils-9999.ebuild b/sys-apps/uutils-coreutils/uutils-coreutils-9999.ebuild
index e62645b6edfa..89cac79fa4c6 100644
--- a/sys-apps/uutils-coreutils/uutils-coreutils-9999.ebuild
+++ b/sys-apps/uutils-coreutils/uutils-coreutils-9999.ebuild
@@ -312,7 +312,7 @@ CRATES="
 	zopfli@0.8.1
 "
 
-inherit cargo flag-o-matic
+inherit cargo flag-o-matic multiprocessing
 
 DESCRIPTION="GNU coreutils rewritten in Rust"
 HOMEPAGE="https://uutils.github.io/coreutils/ https://github.com/uutils/coreutils"
@@ -400,6 +400,7 @@ src_compile() {
 
 src_test() {
 	local -x RUST_BACKTRACE=full
+	local -x NEXTEST_TEST_THREADS="$(makeopts_jobs)"
 
 	# Nicer output for nextest vs test
 	emake "${makeargs[@]}" \