diff --git a/sys-apps/pkgcraft-tools/Manifest b/sys-apps/pkgcraft-tools/Manifest
index 102d1e6f35ca3..346c5c83ed0eb 100644
--- a/sys-apps/pkgcraft-tools/Manifest
+++ b/sys-apps/pkgcraft-tools/Manifest
@@ -1 +1,2 @@
 DIST pkgcraft-tools-0.0.23.tar.xz 31798292 BLAKE2B 04b858acd0b452c60d2149c21026ba991c70a85d8efe5ce444a3cff07ebbfa1c3713da96c70c3f49f660669b219d87897daba6bd9024dff6d3dd6e2f885d9e3e SHA512 0fec5a93a29ef87a651ce8b36421027f9b2668bd93b09437923bf83c37ca21eb579d000aee1bbe176ff00d3e95d0dd95d024d0acd3636b110746de38984e40a7
+DIST pkgcraft-tools-0.0.24.tar.xz 40438364 BLAKE2B 46f1f356b8fc8f55853028605188ef9a6f92417b8ea4bc48164d37c92922b0536f51113acbae0140833eeb161b645e6ea3def34b8eab84cacc729c3009567c04 SHA512 3b903679dbbc6fb11c16c0f44567b539fdef091c04a8848b46d00206b9a3cb07b339e076c0f22e407f11098df002421ea66a02c1c806802ddfd5dc06aceee37a
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.24.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.24.ebuild
new file mode 100644
index 0000000000000..7fa50ce169a10
--- /dev/null
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.24.ebuild
@@ -0,0 +1,78 @@
+# 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
+
+	if [[ ${PV} != 9999 ]] ; then
+		newbashcomp shell/pk.bash pk
+		dozshcomp shell/_pk
+		dofishcomp shell/pk.fish
+	fi
+}