gentoo auto-resync : 14:01:2025 - 06:41:37

6 files changed, 76 insertions, 12 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 23b66a7d1e08..a6b5d4e3da8d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dcfldd/Manifest b/sys-apps/dcfldd/Manifest
index 14ac81f9a1d9..3dcdee5987d8 100644
--- a/sys-apps/dcfldd/Manifest
+++ b/sys-apps/dcfldd/Manifest
@@ -2,6 +2,6 @@ AUX dcfldd-1.9.1-miscompile.patch 1897 BLAKE2B 3f8fc6e328042537bd6f34070d21b510a
 DIST dcfldd-1.9.1.tar.gz 90536 BLAKE2B 644a96ba193ab0275a805c5bad1bc64fcfc2386c2aace4be1d523d6adb52ded6dc02ec2b0c40f1427772e00f6bef285f0fa515e99fa1793a0e1341916a41bd3a SHA512 bef5dfaa25a51889efcadec101948c4d0e3cbf6ee4a624e4818502bbc78b458310f7b67538946dff927713b7ce6294d269dd3ddba0685fb367988eec582d1f02
 DIST dcfldd-1.9.2.tar.gz 92556 BLAKE2B 8d5e5d5698ce4818d00c035708904483190b5d0f4968d466a19e57053d659809519e9ae0f1d9e98f577799be61c73c6c16442b7c95405313bcd5c1587286a842 SHA512 860199fc9d295ae71c868db67825b58496fb60fe74d58b7827ec115e05463cd69e96b037e159ab5ff65ada3a6a46cc67dc8b2ea7811443d3dc45a95d1c674c7d
 EBUILD dcfldd-1.9.1-r2.ebuild 711 BLAKE2B d3a0aff2efd2918cbddbd1dc593ec2cbc6d6820cdfbdb5fcb1a4f539cc12972afc29f6412a6647618df3e1614d2293aa28032b20b9e909c545488a785a06bd6e SHA512 8d57a404efba0d6363f029c7abe3a6703eef4646ed76b86a56dca60dfbf3667efae9e24bc3becb94b6960f12e97bb454ea045cc695cc9baf4afe88c64f382fe0
-EBUILD dcfldd-1.9.2-r1.ebuild 1258 BLAKE2B 395bbc793dfb95793ed4f8b3ef8ee93a58fa3c1ad07a87d7d8283b926090038d351f92d703657ae914f85ec531079782f794d8dcc5f29e18d1fb1b8b33f5322f SHA512 c3df8fff9028ad6eaeca8772b4376a73ed98cb9ce42a54e18bfe7fa7c8ccb7cc935c29221de87f15562d70f7c00b1fb5092475ad032ad3190abe42676a04030a
+EBUILD dcfldd-1.9.2-r1.ebuild 1262 BLAKE2B 7f73c165cdfe5595e9a9420587cd7254b65cfb8a61f3a1b19d0b6496a4acf2c0aa4b52c589d169f2ae4862662e4cc68459c3785ef3cdbb5751917edb03876ea6 SHA512 b9b6b680cae5ec108ef977589f3b13c284224abbb795808362aeaf553f8cdf128703c2231fc695575d16566de78a87337543ca6e4d6cb16914b97a5219dfc4a6
 EBUILD dcfldd-1.9.2.ebuild 760 BLAKE2B 407289cc1df6cf871c4eef5df0b3f1b8666ba802e13fab6225ac32ba1a5c286e1d17ab18aaec01f683dec5545c3c67e9265d3630367524d5e684c634321e04ec SHA512 35ecbc35402412e3d5a04cb99f0dbf6c7c69741e3a3fc3cdb765e8961892dfded254b7c62c69596bfa68629e903863d08016dab5a4ef891c38439e4fb4d7827c
 MISC metadata.xml 406 BLAKE2B 4b3f919fe88a08eafae29fa536a35c8776adde46ac0243cf1191eef5a2523a96a7f6bedee749b0bc9ba2a32aab79bcaf781497b2f92fe0a7afa6c3b645dca10f SHA512 19bb9687b9bd30914b6f6f1554eaae34dcd48415c022c6b90df7cec8fb85d010dad1edcc4a9299343afe1577ffcb30a23c3cc536eb933ef8066f6b7de112af2f
diff --git a/sys-apps/dcfldd/dcfldd-1.9.2-r1.ebuild b/sys-apps/dcfldd/dcfldd-1.9.2-r1.ebuild
index 3a9a2897ec46..20a75c5ac003 100644
--- a/sys-apps/dcfldd/dcfldd-1.9.2-r1.ebuild
+++ b/sys-apps/dcfldd/dcfldd-1.9.2-r1.ebuild
@@ -45,7 +45,7 @@ src_test() {
 	# Smoke test for Gentoo bug #930996
 	# Inspired by https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114698#c0
 	expected_sha256sum="$(sha256sum <<<TestInput | awk '{print $1}')"
-	actual_sha256sum="$(dcfldd hash=sha256 2>&1 <<<TestInput \
+	actual_sha256sum="$(src/dcfldd hash=sha256 2>&1 <<<TestInput \
 		| grep -F sha256 | awk '{print $3}')"
 	[[ ${actual_sha256sum} = ${expected_sha256sum} ]] \
 		|| die "dcfldd produced \"${actual_sha256sum}\" instead of expected \"${expected_sha256sum}\"."
diff --git a/sys-apps/pkgcraft-tools/Manifest b/sys-apps/pkgcraft-tools/Manifest
index 77fc53a4d749..901eb9795542 100644
--- a/sys-apps/pkgcraft-tools/Manifest
+++ b/sys-apps/pkgcraft-tools/Manifest
@@ -1,8 +1,10 @@
 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
+DIST pkgcraft-tools-0.0.22.tar.xz 30423796 BLAKE2B 629aa46a6d11deda0115837b711868956d5d8eb504437c5811feb248c8dd05b494bb2fc610041ba3b8a6a9fd892e576ec58a17f0e67c645114f9cfaed88135ab SHA512 53bde64ff94c23c7f4c149843573fba7a294869fa486631a1cac46fe9dc3560d4fe337d6b242b2709106f6a5da798718a8244349bd058de92856c6d7c0b457ad
 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-0.0.21.ebuild 1469 BLAKE2B ee924d71184ad506502e5b1d94f1ffccdddd0e69f0ba0e948e36a2837cf4e94b3344e74501276ade2a0ea74e136e8a52094d8b2cc906156a4b330e21ebae8660 SHA512 c42b3051380bd970ba850193aa8fb38da4d307d54b7afea15ca6fe63921445cf26a8d0367254142a72326d6bd68bf9ccbb44ea97eca849cedc3e2bdefac730ba
-EBUILD pkgcraft-tools-9999.ebuild 1469 BLAKE2B ee924d71184ad506502e5b1d94f1ffccdddd0e69f0ba0e948e36a2837cf4e94b3344e74501276ade2a0ea74e136e8a52094d8b2cc906156a4b330e21ebae8660 SHA512 c42b3051380bd970ba850193aa8fb38da4d307d54b7afea15ca6fe63921445cf26a8d0367254142a72326d6bd68bf9ccbb44ea97eca849cedc3e2bdefac730ba
+EBUILD pkgcraft-tools-0.0.22.ebuild 1315 BLAKE2B eed00afcdc34ef5033857fed2d41edc84da6d34c8b83009e9d4a7ecc3b7859876a904cc785488a9ef1b124ea12aae7cec3fab8538457319a3dacb86425c00465 SHA512 db75ada55e8ea2efbc421b4f61277ce1cc0f32b9d12b9e470fb908f8a47deacb4b3bf9d7f62d2d42f411189b1a655ff49bc622c76af97c6fc56f50dfea201996
+EBUILD pkgcraft-tools-9999.ebuild 1315 BLAKE2B eed00afcdc34ef5033857fed2d41edc84da6d34c8b83009e9d4a7ecc3b7859876a904cc785488a9ef1b124ea12aae7cec3fab8538457319a3dacb86425c00465 SHA512 db75ada55e8ea2efbc421b4f61277ce1cc0f32b9d12b9e470fb908f8a47deacb4b3bf9d7f62d2d42f411189b1a655ff49bc622c76af97c6fc56f50dfea201996
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.22.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.22.ebuild
new file mode 100644
index 000000000000..c5968bc757d6
--- /dev/null
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.22.ebuild
@@ -0,0 +1,69 @@
+# 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-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
+
+	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 e90118f5495a..c5968bc757d6 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ CRATES=" "
 LLVM_COMPAT=( {17..19} )
 RUST_MIN_VER="1.82.0"
 
-inherit cargo edo flag-o-matic llvm-r1 shell-completion
+inherit cargo edo llvm-r1 shell-completion
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -54,13 +54,6 @@ 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