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

3 files changed, 71 insertions, 3 deletions

diff --git a/dev-util/pkgcruft/Manifest b/dev-util/pkgcruft/Manifest
index d89bd08741e7..f230f4dbf6e4 100644
--- a/dev-util/pkgcruft/Manifest
+++ b/dev-util/pkgcruft/Manifest
@@ -1,8 +1,10 @@
 DIST pkgcruft-0.0.1.tar.xz 30144864 BLAKE2B af309ac7199640e1ee058ba9206c09ce7a054016f515d99763c40399ed8487807c908f5a5fbabc187ee88f2690cbdaa91c8b374732949b1e03334418140de65b SHA512 d02c91b7683f930eff99fa0cca01f7008c6a8808c25439a880928dc1a680f99a72f76a571bf3ec48f17a1ab337007679384993325b53a9efad1ff4ce59b382cd
 DIST pkgcruft-0.0.2.tar.xz 24861352 BLAKE2B d3e206d97c8e877727a8a659a0d59ee6a62f5a817b74143a2e68861e21023439f0b3dcf9f218da98cabe02c156949a1d1adf1a28ff3daff90da3b581458e42dc SHA512 9734413f2142b01c22ecb708ebc63109c0ce09d00e96ba4ce7d3e34e5e02699a1061bfb852e33654e834a7c403d575470b3e8715dc31184557be0b6f9f8bda1b
 DIST pkgcruft-0.0.3.tar.xz 24564836 BLAKE2B 6219898b0402e34f4d595cee26c2d659572009fb1367ede64885a98af523bac5cb1f82e49f809e82dc03a19363c135ac273ee237516505ff46b860968d88df58 SHA512 f593bd621c0caee469d89af12983e222ca5d191b0c64e3516eaa0ad6d6459a8cb89b75f5cdcfe7e44960c2518a3d3b69a7ba58f730d14f9d986e398ea16ba1a5
+DIST pkgcruft-0.0.4.tar.xz 24507420 BLAKE2B 89e127bd6f22686c4e0335817ed050bf3edcd8b0247a372531ab5daf020e526721d6e10080c8e1230026d87762e769535187d30a9ff86bbfe4c2f1865a322324 SHA512 464eef7c19313e97eac59367e286181c441e04a76deaa75f551b3866da5dcdb7bfa7703552143b6b32afee5beac85df72af48fe627f8a3838cb823f672f50d84
 EBUILD pkgcruft-0.0.1-r1.ebuild 1115 BLAKE2B 5167bcdd152a16f00343d798ffab1f8adc77be12c3bca000034f88be1397eed38caa772528ddf57c61fc8444867c3ccb216b20acd4c7bf645cc06937e60fc430 SHA512 dd0ff50cffe5121f4308c4a2074817999ef0f69a57d7d20725deed83f61800751eda49ecc548b86c0ccdebca7ec0dd3219b169b5849341ab71471e26957be48b
 EBUILD pkgcruft-0.0.2-r1.ebuild 1137 BLAKE2B c23b4cc154672507230d05b53eb112f2e48928f59d44d14777bbc7b175029391fb6113dc7d0e29e284c734a3bafbd6cc5105815f63de6f9b93f30f23483447b0 SHA512 25780993629d7d8a458768d2b01d3c068925ee658d7e5bc90763ecc27efe79c1a6de4994b9eaebc89af796a6db16cc9f14d18cc542ede2e8abfc015dfc1922b1
 EBUILD pkgcruft-0.0.3-r1.ebuild 1134 BLAKE2B aa64819880d1810ac4e101afff3b663ffa39c861a278cba839bf0ff601a27f53dd8ba460da7c1849b06b15a14126052aea13e31dc0136b5def8d6b737808611a SHA512 a733fac8f69e6740739aedc29b90964d8e6769995b1eb9bc50dc7b0c20df8f7a766f842ba76892bd50b2a4e9db3cd9eafeb1dfeda2cffacd260a28d39b6ed48e
-EBUILD pkgcruft-9999.ebuild 1134 BLAKE2B aa64819880d1810ac4e101afff3b663ffa39c861a278cba839bf0ff601a27f53dd8ba460da7c1849b06b15a14126052aea13e31dc0136b5def8d6b737808611a SHA512 a733fac8f69e6740739aedc29b90964d8e6769995b1eb9bc50dc7b0c20df8f7a766f842ba76892bd50b2a4e9db3cd9eafeb1dfeda2cffacd260a28d39b6ed48e
+EBUILD pkgcruft-0.0.4.ebuild 1246 BLAKE2B cd7c672f5ba1bacee55cb5a989dc4093a94d4a7349ae7cfd038f6e0b1ed334be9ca8bb188269bdd93de386517490c1da394cc57c35026c973ab9320f5154e9d4 SHA512 4a4fcead2bd0a2b7bc0a93a410185cb8a2f70ed5ed48dfa2a4d3a6f88b32d5ea52300c902ef3b54d19572ae1757ea1a5bf61012987caa4f6043977a5cdd687ff
+EBUILD pkgcruft-9999.ebuild 1246 BLAKE2B cd7c672f5ba1bacee55cb5a989dc4093a94d4a7349ae7cfd038f6e0b1ed334be9ca8bb188269bdd93de386517490c1da394cc57c35026c973ab9320f5154e9d4 SHA512 4a4fcead2bd0a2b7bc0a93a410185cb8a2f70ed5ed48dfa2a4d3a6f88b32d5ea52300c902ef3b54d19572ae1757ea1a5bf61012987caa4f6043977a5cdd687ff
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.4.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.4.ebuild
new file mode 100644
index 000000000000..093d941ef7b2
--- /dev/null
+++ b/dev-util/pkgcruft/pkgcruft-0.0.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=" "
+RUST_MIN_VER="1.80.0"
+
+inherit cargo edo flag-o-matic toolchain-funcs
+
+DESCRIPTION="QA library and tools based on pkgcraft"
+HOMEPAGE="https://pkgcraft.github.io/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
+	inherit git-r3
+
+	S="${WORKDIR}"/${P}/crates/${PN}
+else
+	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT MPL-2.0 Unicode-DFS-2016
+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# clang needed for bindgen
+BDEPEND+="
+	sys-devel/clang
+	test? ( dev-util/cargo-nextest )
+"
+
+QA_FLAGS_IGNORED="usr/bin/pkgcruft"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_compile() {
+	# For scallop building bash
+	tc-export AR CC
+
+	# scallop uses modified bash-5.2 which relies on unprotoyped functions
+	append-cflags -std=gnu17
+
+	cargo_src_compile
+}
+
+src_test() {
+	edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests
+}
diff --git a/dev-util/pkgcruft/pkgcruft-9999.ebuild b/dev-util/pkgcruft/pkgcruft-9999.ebuild
index 79a063178dbe..093d941ef7b2 100644
--- a/dev-util/pkgcruft/pkgcruft-9999.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-9999.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 CRATES=" "
-RUST_MIN_VER="1.76.0"
+RUST_MIN_VER="1.80.0"
 
-inherit cargo edo toolchain-funcs
+inherit cargo edo flag-o-matic toolchain-funcs
 
 DESCRIPTION="QA library and tools based on pkgcraft"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -52,6 +52,9 @@ src_compile() {
 	# For scallop building bash
 	tc-export AR CC
 
+	# scallop uses modified bash-5.2 which relies on unprotoyped functions
+	append-cflags -std=gnu17
+
 	cargo_src_compile
 }