gentoo auto-resync : 01:01:2025 - 06:30:57

3 files changed, 91 insertions, 3 deletions

diff --git a/sys-apps/pkgcraft-tools/Manifest b/sys-apps/pkgcraft-tools/Manifest
index ad71f0b3c0ff..77fc53a4d749 100644
--- a/sys-apps/pkgcraft-tools/Manifest
+++ b/sys-apps/pkgcraft-tools/Manifest
@@ -1,6 +1,8 @@
 DIST pkgcraft-tools-0.0.17.tar.xz 20947804 BLAKE2B d574536965680ff5b41848a36e2fa05008d93048d16a1f9932e618c4bd9ef7cf1a3bd918eca8d2c9d189bc88fd112e2aeb999f9b565f7864d7241ba9e825ed22 SHA512 c136a1b2c7e7c1104ff52838afe40b007c7ff6182f3a8a7a9276ccbcd77ec94a1192e61b40c6030fe7ecc44cdfd1ced960c6d4368f43671ce45364435efca9c0
 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
 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-9999.ebuild 1304 BLAKE2B a67ec0399a8d63ecda861c99f85f20fe2494e795df0decb2244f43bef06420b02e9286ee0c25ca51c49cd7a2c872fe37bdbc061cc3c762575cccffd9525a84b9 SHA512 fa52973a6b960532ab62a5afaa04f9def0f5f08eb0c5c36f37512029ce9ac3482b6685ffc0db9cc7275676f336757915755f39875b8de33aaf3970f77cf7205c
+EBUILD pkgcraft-tools-0.0.21.ebuild 1469 BLAKE2B ee924d71184ad506502e5b1d94f1ffccdddd0e69f0ba0e948e36a2837cf4e94b3344e74501276ade2a0ea74e136e8a52094d8b2cc906156a4b330e21ebae8660 SHA512 c42b3051380bd970ba850193aa8fb38da4d307d54b7afea15ca6fe63921445cf26a8d0367254142a72326d6bd68bf9ccbb44ea97eca849cedc3e2bdefac730ba
+EBUILD pkgcraft-tools-9999.ebuild 1469 BLAKE2B ee924d71184ad506502e5b1d94f1ffccdddd0e69f0ba0e948e36a2837cf4e94b3344e74501276ade2a0ea74e136e8a52094d8b2cc906156a4b330e21ebae8660 SHA512 c42b3051380bd970ba850193aa8fb38da4d307d54b7afea15ca6fe63921445cf26a8d0367254142a72326d6bd68bf9ccbb44ea97eca849cedc3e2bdefac730ba
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.21.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.21.ebuild
new file mode 100644
index 000000000000..e90118f5495a
--- /dev/null
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.21.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2023-2024 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-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_configure() {
+	# scallop uses modified bash-5.2 which relies on unprotoyped functions
+	append-cflags -std=gnu17
+
+	cargo_src_configure
+}
+
+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/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 7c3a0cb714ec..e90118f5495a 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 CRATES=" "
 LLVM_COMPAT=( {17..19} )
-RUST_MIN_VER="1.80.0"
+RUST_MIN_VER="1.82.0"
 
-inherit cargo edo flag-o-matic llvm-r1
+inherit cargo edo flag-o-matic llvm-r1 shell-completion
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -62,5 +62,15 @@ src_configure() {
 }
 
 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/pk.bash pk
+	dozshcomp shell/_pk
+	dofishcomp shell/pk.fish
+}