4 files changed, 139 insertions, 37 deletions
diff --git a/dev-util/pkgcruft/Manifest b/dev-util/pkgcruft/Manifest
index e2a596b4cccb..fb9d00993815 100644
--- a/dev-util/pkgcruft/Manifest
+++ b/dev-util/pkgcruft/Manifest
@@ -1,8 +1,10 @@
 DIST pkgcruft-0.0.10.tar.xz 32193612 BLAKE2B d0f28f63e0b4f1d1309156309331feb0daa0cd52c6f0491f918d49f76c425b36a47fd02060554cd4398ac3490d6e21009b7421cb0ca14a821093fca7f57087bc SHA512 14812be27345a737d91281c869bc8149581bf3802b3bddca19908bfb687013cd1ee751213e86c7c277850f07eff2b58358930c74cbe2e3f4b370929de518097e
 DIST pkgcruft-0.0.11.tar.xz 40812256 BLAKE2B 6afbc3750d99d715a01d644413b4e5c407d902cbb1761b5017dae0cf5b868a48f6fe5a8ee845bb8e4484cc9ea154d954afc85cd81d53480eee1233598a07a044 SHA512 b4ba070b811e1a94795bd8e90452b4e2db6fba53a563b828c8f8c6b938727ed6aff35e969c88a22b961ded1bd51847f52f1d285863a27b76715fe1ec72979934
 DIST pkgcruft-0.0.12.tar.xz 41392836 BLAKE2B 0d04f3451b87f3e888bd471b8b06248b68e6929ace6922f01e4ba5e010e9b0a91ff4c94d4629a473dec6ae5229507dab216f98c02b4a47f454c75098543b0b13 SHA512 17542836ec659703f02a92c5afbd297006db8d3a58cb8b51d876f47592a0a155d85acf2a9661055f42d301d10806d3d30ed658cf4a20aa8748fd9f85222d353a
+DIST pkgcruft-0.0.13.tar.xz 30200436 BLAKE2B 85ed531a79d4261c65dcda41d6a238398fb36b8e93c1698444b866f6c930544bf19c85046ad9ab651bd0f5460ad174b47d468274de169a458083198b084205e2 SHA512 d53713d0f14d965e3b069fe2902af9aac1fac56b565e93b502c081adf0ada99336a43f5af697ec522ce4e6d49eff5b1fb20c375ffa90dcf417ae396c2dc81c2b
 EBUILD pkgcruft-0.0.10.ebuild 2928 BLAKE2B 965b6a456af8285664f46960b5ddfd7690944259e17bd7575cb4972da57a99528133658ba2c99d59029e9c977b8c563a6163619e268126c66c0845824de1e180 SHA512 c9fde1ae0a1ca37d1dfa751cac12c215a1baef620368ac1fa123ece0e6653cf54d8e4eed09c5a20bac5a6a48b7a37055b184ea3507224eee1bbce2f7181913f0
 EBUILD pkgcruft-0.0.11.ebuild 2929 BLAKE2B 0be9d003042d52aa73c7ede8464bba3728091582dea8b741a27a8b70dd61f506cad5d566f106806f3b6b5bd24e97a4e322ee41c52425d3c508fc8d8528cb24d0 SHA512 0f66f5744e6b7cc570c97c0479429808c9e29f8b45b5feafc484fd18b262aef8dd61863f209a4d6378a189b90a2a016eaa51d5b4984402c07e8c7cf29d6a045a
-EBUILD pkgcruft-0.0.12.ebuild 2929 BLAKE2B 09fd8ed880898a2fb513c46621c7bba2fbe776bd127dec787162995971ec0b02bb2b31cedc0e653e90cb52523d5dc88f382e90edf61c94ddf225a9420ef13dc3 SHA512 4fa9e3c1fa7254071963faafed935f854e44f007adc7fe343b3b6d1abea1d4943a78b923b0a598acf5bea5ba93888ef1f4241d410e0a50d85a02cec9770015c6
-EBUILD pkgcruft-9999.ebuild 2929 BLAKE2B 09fd8ed880898a2fb513c46621c7bba2fbe776bd127dec787162995971ec0b02bb2b31cedc0e653e90cb52523d5dc88f382e90edf61c94ddf225a9420ef13dc3 SHA512 4fa9e3c1fa7254071963faafed935f854e44f007adc7fe343b3b6d1abea1d4943a78b923b0a598acf5bea5ba93888ef1f4241d410e0a50d85a02cec9770015c6
+EBUILD pkgcruft-0.0.12.ebuild 2928 BLAKE2B 4f5988b55b470b78b8b20bf0fd98cdc453881ba4bc981422aa8c84ea45f40096b933897c0642a56ad750f503138c3b2ef3e34ec85c20b987461a25c8974680b1 SHA512 6da073b6ba0680edef7ddabc96fbb689c77fb8576da22de0787770ddab080e0e9bd5a57770ddc36c0c816f321600311f1084ec496a1d55ed8777c3e94a7f3d2b
+EBUILD pkgcruft-0.0.13.ebuild 3091 BLAKE2B 43bc761c9262549a81c8eb351fe55ae7d4b4ea56ed827160dbe76e31e2d334ddfea17cb1ba809b54848d5a4c535d417046f86677245da298a68425da56b39e97 SHA512 77bd324837767bd9a2ba07c87eb581d9f9daad3c3724d5edd5b8d498b0000ff30c98f3c63ffc8b7c94e7acb5f3d5af8670eacbacd2c573ac242349f36a274bd9
+EBUILD pkgcruft-9999.ebuild 1983 BLAKE2B 0d5ef4d6cc861320d6ff3bb0fba7e6568f257997ae0193af78a49b133285590ce6484213019a469ef00d2fa3759532f21c5d7b5d3a58e2a76c7a68f250d047fa SHA512 955cf216772a228bd19ad84c986c59fd097ec7058aae7f30fc21543c8bb99510055fbaaeaf81d72e70bf39b7b977e4c49d4c19df43ca525e2bf776c996a54951
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.12.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.12.ebuild
index dff52cd906d4..c161c18cdef2 100644
--- a/dev-util/pkgcruft/pkgcruft-0.0.12.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-0.0.12.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.13.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.13.ebuild
new file mode 100644
index 000000000000..66c1aeee6244
--- /dev/null
+++ b/dev-util/pkgcruft/pkgcruft-0.0.13.ebuild
@@ -0,0 +1,126 @@
+# 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.84.0"
+
+inherit cargo edo llvm-r2 multiprocessing 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
+
+	if [[ ${PV} == 9999 ]] ; then
+		einfo "Generating shell completions"
+		mkdir shell || die
+		local BIN="${WORKDIR}/${P}/$(cargo_target_dir)/pkgcruft"
+		"${BIN}" completion bash > shell/pkgcruft.bash || die
+		"${BIN}" completion zsh > shell/_pkgcruft || die
+		"${BIN}" completion fish > shell/pkgcruft.fish || die
+	fi
+}
+
+src_test() {
+	unset CLICOLOR CLICOLOR_FORCE
+
+	# 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() {
+	cargo_src_install
+
+	newbashcomp shell/pkgcruft.bash pkgcruft
+	dozshcomp shell/_pkgcruft
+	dofishcomp shell/pkgcruft.fish
+}
diff --git a/dev-util/pkgcruft/pkgcruft-9999.ebuild b/dev-util/pkgcruft/pkgcruft-9999.ebuild
index dff52cd906d4..94a826b3e470 100644
--- a/dev-util/pkgcruft/pkgcruft-9999.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-9999.ebuild
@@ -63,8 +63,12 @@ src_compile() {
 	cargo_src_compile
 
 	if [[ ${PV} == 9999 ]] ; then
-		# https://github.com/pkgcraft/pkgcraft/issues/258
-		edo cargo run --features shell --bin pkgcruft-shell-comp -p pkgcruft
+		einfo "Generating shell completions"
+		mkdir shell || die
+		local BIN="${WORKDIR}/${P}/$(cargo_target_dir)/pkgcruft"
+		"${BIN}" completion bash > shell/pkgcruft.bash || die
+		"${BIN}" completion zsh > shell/_pkgcruft || die
+		"${BIN}" completion fish > shell/pkgcruft.fish || die
 	fi
 }
 
@@ -80,43 +84,13 @@ src_test() {
 		--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'
+		--no-fail-fast
 }
 
 src_install() {
 	cargo_src_install
 
-	newbashcomp shell/pkgcruft.bash ${PN}
+	newbashcomp shell/pkgcruft.bash pkgcruft
 	dozshcomp shell/_pkgcruft
 	dofishcomp shell/pkgcruft.fish
 }