gentoo auto-resync : 22:11:2024 - 03:03:01

3 files changed, 80 insertions, 5 deletions

diff --git a/sys-apps/pkgcraft-tools/Manifest b/sys-apps/pkgcraft-tools/Manifest
index befa2750c1e2..e9e7430b9234 100644
--- a/sys-apps/pkgcraft-tools/Manifest
+++ b/sys-apps/pkgcraft-tools/Manifest
@@ -1,8 +1,10 @@
 DIST pkgcraft-tools-0.0.14.tar.xz 30138240 BLAKE2B b9d0b238f26d980f032cfad26602348dabe574e3968e8adf5172e91efeea051b9720b158941a1bea53e2c1fa8180d516b1bb9668d9178f17c789fb5ba76b7bd9 SHA512 ca7c0f429228567c91a18db793b2fa81f6918cde54f302269deb6a1d2f6445756fbc73e3957ad7b29c8a0e8e000c1b939290c6bbc34bb693cc54b87841fef06c
 DIST pkgcraft-tools-0.0.15.tar.xz 23029344 BLAKE2B 7e5f6e119a98bc061578bcfad954bc286bef2bfa93687d16daab615e17ede1512bb0fcbd7ce342c915f4494397169a05b7846029c1c59f2f5f0565ef34ae1bb3 SHA512 6009582531f21c3896441a04ad462fc6d06b509bc4faaa3944ae3696b7b67a0d492ec6345cc6bedc7388b20d558a01bb8a24f3c439da3972c01fcae9277d2c2c
 DIST pkgcraft-tools-0.0.16.tar.xz 21332400 BLAKE2B 09385a94980a62dcf312161d51d94549cc36247a0e96c001b7b7790d2f879d0c780310d89aa46760ed0312ec935b1c9e0100b3e2e29f94114ae92724aff8b953 SHA512 e37d296474c847a06191c314b95dfdb99f05c7cc655dda7b8cfa4a03659fd7bf5ab83ddc51d19cef93f2a28ad919282edf5d34bf264807292773d4aa21aa35dc
+DIST pkgcraft-tools-0.0.17.tar.xz 20947804 BLAKE2B d574536965680ff5b41848a36e2fa05008d93048d16a1f9932e618c4bd9ef7cf1a3bd918eca8d2c9d189bc88fd112e2aeb999f9b565f7864d7241ba9e825ed22 SHA512 c136a1b2c7e7c1104ff52838afe40b007c7ff6182f3a8a7a9276ccbcd77ec94a1192e61b40c6030fe7ecc44cdfd1ced960c6d4368f43671ce45364435efca9c0
 EBUILD pkgcraft-tools-0.0.14-r1.ebuild 1122 BLAKE2B c3aac0d6c0e54d2456a9542fcd18382a1ace2ae2872415e3f14d95f22cdea3fddbc5adbc22e12cd955592313960cfea7452611cccb6415e87c9ac6edcddc0c36 SHA512 f5f70ef14cbe10b72bb4f8adb81adb93d0908355787f9cbe1468c510e95f88b4f303f4660417cc8a96b49d3c2183c0e32aad8756dbcfc1fdaa0dd49b1d5d84ce
 EBUILD pkgcraft-tools-0.0.15-r1.ebuild 1150 BLAKE2B ba86e1a4a9d65467230bd9f77808f356037e7c4f3a98cd555645bce9d92432a802f3609948f46df8c5d8efa59f1e60766c5b4d49b9a53a11013f2fd83473bbf4 SHA512 8770b424f9dad0c28a22f69be39a1fb734bfe9f0c4dd6842f9bf84ad37e61cbe18b7ef613cfaa42ab69d6a4dc48367b01128b50513b709b605fba71453fd512c
 EBUILD pkgcraft-tools-0.0.16-r1.ebuild 1150 BLAKE2B ba86e1a4a9d65467230bd9f77808f356037e7c4f3a98cd555645bce9d92432a802f3609948f46df8c5d8efa59f1e60766c5b4d49b9a53a11013f2fd83473bbf4 SHA512 8770b424f9dad0c28a22f69be39a1fb734bfe9f0c4dd6842f9bf84ad37e61cbe18b7ef613cfaa42ab69d6a4dc48367b01128b50513b709b605fba71453fd512c
-EBUILD pkgcraft-tools-9999.ebuild 1147 BLAKE2B ecd73a78d98c60a66d64e92e956e6fe62d9c7b88d00b0c899bcbb6adaed60f3b64b5358b14e3227d30baa48563f5bda013a85fb65924feeee6c7325f2cbdd0f3 SHA512 bd642942230c851a6b151ea45447444baf8f2b3f5a4f148ab37ff2e33bcb3fd4537a7a5f1a65e5b98d58a0abecdf3e6f9a041a9074b7b6a4e9ccb43f07c09498
+EBUILD pkgcraft-tools-0.0.17.ebuild 1304 BLAKE2B 49ec9a1190d70e8802726762259d7ef11b62e11372da9841d6af48651b9a62b538ccb35270121123bb60be36e105f4c17a0f1b3d61fca45e2fbf1581ce719e4f SHA512 3ec87ad9ff2fb226f082311124a8dde9e08b9a0be28df007f5eb0a63a657afcc01d0b94339117ed4d2722888feac9b9fc08abeef6fe4aa9f86023a6102795286
+EBUILD pkgcraft-tools-9999.ebuild 1304 BLAKE2B 49ec9a1190d70e8802726762259d7ef11b62e11372da9841d6af48651b9a62b538ccb35270121123bb60be36e105f4c17a0f1b3d61fca45e2fbf1581ce719e4f SHA512 3ec87ad9ff2fb226f082311124a8dde9e08b9a0be28df007f5eb0a63a657afcc01d0b94339117ed4d2722888feac9b9fc08abeef6fe4aa9f86023a6102795286
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.17.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.17.ebuild
new file mode 100644
index 000000000000..f4d93db4e500
--- /dev/null
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.17.ebuild
@@ -0,0 +1,66 @@
+# 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.80.0"
+
+inherit cargo edo flag-o-matic llvm-r1
+
+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 '
+		sys-devel/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() {
+	edo ${CARGO} nextest run $(usev !debug '--release') --color always --all-features --tests
+}
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
index f2ec46605d6d..f4d93db4e500 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
@@ -4,10 +4,10 @@
 EAPI=8
 
 CRATES=" "
-LLVM_COMPAT=( {17..18} )
-RUST_MIN_VER="1.77.1"
+LLVM_COMPAT=( {17..19} )
+RUST_MIN_VER="1.80.0"
 
-inherit cargo edo llvm-r1
+inherit cargo edo flag-o-matic llvm-r1
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -54,6 +54,13 @@ 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() {
-	edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests
+	edo ${CARGO} nextest run $(usev !debug '--release') --color always --all-features --tests
 }