7 files changed, 44 insertions, 314 deletions
diff --git a/dev-util/pkgcruft/Manifest b/dev-util/pkgcruft/Manifest
index db161a8387e8..4fc47e9693e9 100644
--- a/dev-util/pkgcruft/Manifest
+++ b/dev-util/pkgcruft/Manifest
@@ -1,12 +1,4 @@
 DIST pkgcruft-0.0.10.tar.xz 32193612 BLAKE2B d0f28f63e0b4f1d1309156309331feb0daa0cd52c6f0491f918d49f76c425b36a47fd02060554cd4398ac3490d6e21009b7421cb0ca14a821093fca7f57087bc SHA512 14812be27345a737d91281c869bc8149581bf3802b3bddca19908bfb687013cd1ee751213e86c7c277850f07eff2b58358930c74cbe2e3f4b370929de518097e
-DIST pkgcruft-0.0.4.tar.xz 24507420 BLAKE2B 89e127bd6f22686c4e0335817ed050bf3edcd8b0247a372531ab5daf020e526721d6e10080c8e1230026d87762e769535187d30a9ff86bbfe4c2f1865a322324 SHA512 464eef7c19313e97eac59367e286181c441e04a76deaa75f551b3866da5dcdb7bfa7703552143b6b32afee5beac85df72af48fe627f8a3838cb823f672f50d84
-DIST pkgcruft-0.0.6.tar.xz 24528884 BLAKE2B 88b476920661076dbe70bd0ba0fd84d355dc77d579496702c43f8e55384ea6dce3fe305ef861ecc5c4bcd4e1046d8b672ce1ca0dbc83c7560191c1818761e63a SHA512 f978e1d398c00580990a8026ea6cec5d32825e2e0e831ea059462a3a808899b7a94064bcc91ee6901f55d1085641ccb96211603cac3a30e32a8567706f339fd1
-DIST pkgcruft-0.0.8.tar.xz 30828500 BLAKE2B 1e20bd2029d03f56d7454daccbf06e327a5f95b56dbec52c12713f3b32b3423aac89d40c6bb7a0677b5977a06bb2a708bcea669056d78664f605278a0253c82e SHA512 4f791b2d1570fd0b68ca16cd4dd129b6fcfec825a748e2bf80c731eb2f70689ca515b640ca2f65c61673b0d5b766eae64ecbff05e8ad629b65ed38cf43590820
-DIST pkgcruft-0.0.9.tar.xz 30898984 BLAKE2B 72b3a86f58b7e2d15fff933a34e99462d58a29041120bef5bcfcdd50582127c2a35e432546bbd6513512b328cc6bec6ca2f5cd4aa57db97f1249b71ce9766668 SHA512 9d39d4db90ca1b8be7a1b6712f6ff731f4bfd681022d8f91a200f3563a6c5c0db3432b8dec8e09f912e2dbe2bfba82cf524107d83a6c26660da8e062140186dd
-EBUILD pkgcruft-0.0.10.ebuild 2929 BLAKE2B 0be9d003042d52aa73c7ede8464bba3728091582dea8b741a27a8b70dd61f506cad5d566f106806f3b6b5bd24e97a4e322ee41c52425d3c508fc8d8528cb24d0 SHA512 0f66f5744e6b7cc570c97c0479429808c9e29f8b45b5feafc484fd18b262aef8dd61863f209a4d6378a189b90a2a016eaa51d5b4984402c07e8c7cf29d6a045a
-EBUILD pkgcruft-0.0.4.ebuild 1367 BLAKE2B 4275680972e21d9a218fa2409b44401bedb7cda325b678830257e04f636cab0db1c4e43c3f55285352753ad97c1295122e4f01070c5c0c03b6268632c25f7e2c SHA512 021c31e0f618882a854679bc9ae49ba34b48fa3b3de555906044ac9344f747b6a6ab729ecd5e4a161d69bc09e89bf4e5f251bea737407eb331ae34cef4b2106c
-EBUILD pkgcruft-0.0.6.ebuild 1367 BLAKE2B 4275680972e21d9a218fa2409b44401bedb7cda325b678830257e04f636cab0db1c4e43c3f55285352753ad97c1295122e4f01070c5c0c03b6268632c25f7e2c SHA512 021c31e0f618882a854679bc9ae49ba34b48fa3b3de555906044ac9344f747b6a6ab729ecd5e4a161d69bc09e89bf4e5f251bea737407eb331ae34cef4b2106c
-EBUILD pkgcruft-0.0.8.ebuild 1553 BLAKE2B 2e13539e2c9959257c759b29d42db588fab51926b9bfbc8da37cc177ccb2a131f17dd66b14cdbd6824114e675a94b9e0b33ee397d5ddbeec9708a0398631ef3a SHA512 2cc4ffb8d0a9ae5635b5e7553ca36849cfe09c0185c1a9a2469b54742c8cd62fec39f04b4c840ce806b97016e7eb438f8afae178a4edc813f53d3946c93d9a00
-EBUILD pkgcruft-0.0.9.ebuild 1441 BLAKE2B 927bda94771290019115b9670a4d27c0f5e410164d86673edddfdbacd586368134f56c56e0e87e7183a38f98a2a8027c8b92a91f7345396fb3e6f7fa37a6f638 SHA512 d665583fd88897452d7f59ebf67c9b1573d6d324ed954def02f982aa1a78aa60d3701151b41924fc8fea4267d20317cb488119309f4ee14ff70821526ff91375
-EBUILD pkgcruft-9999.ebuild 1600 BLAKE2B 9cc9faa33cdd27a53ba9276a88363e5963950a4fe2a4107b74c2c359164426fc45e8256c351cfed2e2673fab4a66753cb7b6e0730817c6a6196e110ddd9e1ad6 SHA512 d02f2da34a431f2d519478358ccc206aeeceed3a1d22e6053e8ece9859e61aa86e17d9f38c1790d4d917f52110c89c576f5c060790ce78930a1ca0d671a9b827
+EBUILD pkgcruft-0.0.10.ebuild 2928 BLAKE2B 965b6a456af8285664f46960b5ddfd7690944259e17bd7575cb4972da57a99528133658ba2c99d59029e9c977b8c563a6163619e268126c66c0845824de1e180 SHA512 c9fde1ae0a1ca37d1dfa751cac12c215a1baef620368ac1fa123ece0e6653cf54d8e4eed09c5a20bac5a6a48b7a37055b184ea3507224eee1bbce2f7181913f0
+EBUILD pkgcruft-9999.ebuild 2929 BLAKE2B 0be9d003042d52aa73c7ede8464bba3728091582dea8b741a27a8b70dd61f506cad5d566f106806f3b6b5bd24e97a4e322ee41c52425d3c508fc8d8528cb24d0 SHA512 0f66f5744e6b7cc570c97c0479429808c9e29f8b45b5feafc484fd18b262aef8dd61863f209a4d6378a189b90a2a016eaa51d5b4984402c07e8c7cf29d6a045a
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.10.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.10.ebuild
index 911e226eef4d..043b137eb86e 100644
--- a/dev-util/pkgcruft/pkgcruft-0.0.10.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-0.0.10.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="MIT"
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.4.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.4.ebuild
deleted file mode 100644
index 7e174520f16f..000000000000
--- a/dev-util/pkgcruft/pkgcruft-0.0.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.80.0"
-
-inherit cargo edo flag-o-matic llvm-r2 toolchain-funcs
-
-DESCRIPTION="QA library and tools based on pkgcraft"
-HOMEPAGE="https://pkgcraft.github.io/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
-	inherit git-r3
-
-	S="${WORKDIR}"/${P}/crates/${PN}
-else
-	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz"
-
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT MPL-2.0 Unicode-DFS-2016
-"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# clang needed for bindgen
-BDEPEND+="
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-	')
-	test? ( dev-util/cargo-nextest )
-"
-
-QA_FLAGS_IGNORED="usr/bin/pkgcruft"
-
-pkg_setup() {
-	llvm-r2_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_compile() {
-	# For scallop building bash
-	tc-export AR CC
-
-	# scallop uses modified bash-5.2 which relies on unprotoyped functions
-	append-cflags -std=gnu17
-
-	cargo_src_compile
-}
-
-src_test() {
-	edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests
-}
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.6.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.6.ebuild
deleted file mode 100644
index 7e174520f16f..000000000000
--- a/dev-util/pkgcruft/pkgcruft-0.0.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.80.0"
-
-inherit cargo edo flag-o-matic llvm-r2 toolchain-funcs
-
-DESCRIPTION="QA library and tools based on pkgcraft"
-HOMEPAGE="https://pkgcraft.github.io/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
-	inherit git-r3
-
-	S="${WORKDIR}"/${P}/crates/${PN}
-else
-	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz"
-
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT MPL-2.0 Unicode-DFS-2016
-"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# clang needed for bindgen
-BDEPEND+="
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-	')
-	test? ( dev-util/cargo-nextest )
-"
-
-QA_FLAGS_IGNORED="usr/bin/pkgcruft"
-
-pkg_setup() {
-	llvm-r2_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_compile() {
-	# For scallop building bash
-	tc-export AR CC
-
-	# scallop uses modified bash-5.2 which relies on unprotoyped functions
-	append-cflags -std=gnu17
-
-	cargo_src_compile
-}
-
-src_test() {
-	edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests
-}
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.8.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.8.ebuild
deleted file mode 100644
index f48c110f0cab..000000000000
--- a/dev-util/pkgcruft/pkgcruft-0.0.8.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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 flag-o-matic llvm-r2 shell-completion toolchain-funcs
-
-DESCRIPTION="QA library and tools based on pkgcraft"
-HOMEPAGE="https://pkgcraft.github.io/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
-	inherit git-r3
-
-	S="${WORKDIR}"/${P}/crates/${PN}
-else
-	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz"
-
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT MPL-2.0 Unicode-DFS-2016
-"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# clang needed for bindgen
-BDEPEND+="
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-	')
-	test? ( dev-util/cargo-nextest )
-"
-
-QA_FLAGS_IGNORED="usr/bin/pkgcruft"
-
-pkg_setup() {
-	llvm-r2_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_compile() {
-	# For scallop building bash
-	tc-export AR CC
-
-	# scallop uses modified bash-5.2 which relies on unprotoyped functions
-	append-cflags -std=gnu17
-
-	cargo_src_compile
-}
-
-src_test() {
-	unset CLICOLOR CLICOLOR_FORCE
-
-	edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests
-}
-
-src_install() {
-	cargo_src_install
-
-	newbashcomp shell/pkgcruft.bash ${PN}
-	dozshcomp shell/_pkgcruft
-	dofishcomp shell/pkgcruft.fish
-}
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.9.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.9.ebuild
deleted file mode 100644
index 77a30535553a..000000000000
--- a/dev-util/pkgcruft/pkgcruft-0.0.9.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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 llvm-r2 shell-completion toolchain-funcs
-
-DESCRIPTION="QA library and tools based on pkgcraft"
-HOMEPAGE="https://pkgcraft.github.io/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
-	inherit git-r3
-
-	S="${WORKDIR}"/${P}/crates/${PN}
-else
-	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz"
-
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT MPL-2.0 Unicode-DFS-2016
-"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# clang needed for bindgen
-BDEPEND+="
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-	')
-	test? ( dev-util/cargo-nextest )
-"
-
-QA_FLAGS_IGNORED="usr/bin/pkgcruft"
-
-pkg_setup() {
-	llvm-r2_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_compile() {
-	# For scallop building bash
-	tc-export AR CC
-
-	cargo_src_compile
-}
-
-src_test() {
-	unset CLICOLOR CLICOLOR_FORCE
-
-	edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests
-}
-
-src_install() {
-	cargo_src_install
-
-	newbashcomp shell/pkgcruft.bash ${PN}
-	dozshcomp shell/_pkgcruft
-	dofishcomp shell/pkgcruft.fish
-}
diff --git a/dev-util/pkgcruft/pkgcruft-9999.ebuild b/dev-util/pkgcruft/pkgcruft-9999.ebuild
index 736d076f4caa..911e226eef4d 100644
--- a/dev-util/pkgcruft/pkgcruft-9999.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-9999.ebuild
@@ -7,7 +7,7 @@ CRATES=" "
 LLVM_COMPAT=( {17..19} )
 RUST_MIN_VER="1.82.0"
 
-inherit cargo edo llvm-r2 shell-completion toolchain-funcs
+inherit cargo edo llvm-r2 multiprocessing shell-completion toolchain-funcs
 
 DESCRIPTION="QA library and tools based on pkgcraft"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -71,7 +71,46 @@ src_compile() {
 src_test() {
 	unset CLICOLOR CLICOLOR_FORCE
 
-	edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests
+	# TODO: Maybe move into eclass (and maybe have a cargo_enable_tests
+	# helper)
+	local -x NEXTEST_TEST_THREADS="$(makeopts_jobs)"
+
+	# The test failures appear ebuild-related
+	edo cargo nextest run $(usev !debug '--release') \
+		--color always \
+		--all-features \
+		--tests \
+		--no-fail-fast \
+		-- \
+		--skip 'commands::tests::check' \
+		--skip 'dependency::tests::check' \
+		--skip 'dependency_slot_missing::tests::check' \
+		--skip 'eapi_stale::tests::check' \
+		--skip 'eapi_status::tests::check' \
+		--skip 'ebuild_name::tests::check' \
+		--skip 'eclass::tests::check' \
+		--skip 'filesdir::tests::check' \
+		--skip 'header::tests::check' \
+		--skip 'homepage::tests::check' \
+		--skip 'ignore::tests::check' \
+		--skip 'iuse::tests::check' \
+		--skip 'keywords::tests::check' \
+		--skip 'keywords_dropped::tests::check' \
+		--skip 'license::tests::check' \
+		--skip 'live::tests::check' \
+		--skip 'manifest::tests::check' \
+		--skip 'metadata::tests::check' \
+		--skip 'properties::tests::check' \
+		--skip 'python_update::tests::check' \
+		--skip 'repo_layout::tests::check' \
+		--skip 'restrict::tests::check' \
+		--skip 'restrict_test_missing::tests::check' \
+		--skip 'ruby_update::tests::check' \
+		--skip 'src_uri::tests::check' \
+		--skip 'unstable_only::tests::check' \
+		--skip 'use_local::tests::check' \
+		--skip 'variable_order::tests::check' \
+		--skip 'whitespace::tests::check'
 }
 
 src_install() {