From 02111f37a0db57f955927ae3213f906e6a23cc91 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sun, 21 Dec 2025 10:28:28 +0000
Subject: [PATCH] sys-apps/pkgcraft-tools: add 0.0.31

Signed-off-by: Sam James <sam@gentoo.org>
---
 sys-apps/pkgcraft-tools/Manifest              |  1 +
 .../pkgcraft-tools-0.0.31.ebuild              | 95 +++++++++++++++++++
 .../pkgcraft-tools/pkgcraft-tools-9999.ebuild |  1 +
 3 files changed, 97 insertions(+)
 create mode 100644 sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.31.ebuild

diff --git a/sys-apps/pkgcraft-tools/Manifest b/sys-apps/pkgcraft-tools/Manifest
index 491ce73e3785..d92120f96432 100644
--- a/sys-apps/pkgcraft-tools/Manifest
+++ b/sys-apps/pkgcraft-tools/Manifest
@@ -1 +1,2 @@
 DIST pkgcraft-tools-0.0.29.tar.xz 43544852 BLAKE2B b6207a9900951ac4543881d3c267c497ce2c2e37f4c8e8dd69dcb1d7f114279826dd06fc9751da84b87e0045bfd0f666630041a678187ad56684914a00f83b30 SHA512 7ccdd6ae2fa69ca383e79663a24faa1ba8b0fe79998815774f0308010b335f8199087478cf3341712c4032a14a678ec5eef07e19b4a0a2abe37982d295533e8e
+DIST pkgcraft-tools-0.0.31.tar.xz 36348236 BLAKE2B b647018a80867df7ab3ca9fcc5514fe84000103e8677f2b6b1213394a6c14c69dec32b449faadb47dcf8a053e87a08dfa49090bae30a6ca92354490d55acfd14 SHA512 cfeb4cdac3274ee57fc4ce7dd0820926d9ccd4397aab79fcf30669d1185d373892173bd9d3366f750640bcd6d0979e17c49920db1264636f4c0ee4d27644a584
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.31.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.31.ebuild
new file mode 100644
index 000000000000..a7d9c044af3a
--- /dev/null
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.31.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=" "
+LLVM_COMPAT=( {17..21} )
+RUST_MIN_VER="1.90.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 CDLA-Permissive-2.0 ISC MIT MPL-2.0
+	Unicode-3.0
+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test ) "
+
+QA_FLAGS_IGNORED="usr/bin/pk"
+
+RDEPEND="
+	dev-libs/libgit2:0/1.9
+	dev-libs/openssl:=
+	net-libs/libssh2:=
+"
+DEPEND="${RDEPEND}"
+# 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_compile() {
+	# TODO: Package scallop
+	export LIBSSH2_SYS_USE_PKG_CONFIG=1
+	export LIBGIT2_NO_VENDOR=1
+	cargo_src_compile
+
+	if [[ ${PV} == 9999 ]] ; then
+		einfo "Generating shell completions"
+		local BIN="${WORKDIR}/${P}/$(cargo_target_dir)/pk"
+		"${BIN}" completion --dir shell || die
+	fi
+}
+
+src_test() {
+	unset CLICOLOR CLICOLOR_FORCE
+
+	local -x NEXTEST_TEST_THREADS="$(makeopts_jobs)"
+
+	edo ${CARGO} nextest run $(usev !debug '--release') \
+		--color always \
+		--tests
+}
+
+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 8ae374a75622..a7d9c044af3a 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
@@ -64,6 +64,7 @@ src_unpack() {
 }
 
 src_compile() {
+	# TODO: Package scallop
 	export LIBSSH2_SYS_USE_PKG_CONFIG=1
 	export LIBGIT2_NO_VENDOR=1
 	cargo_src_compile