gentoo auto-resync : 10:11:2024 - 03:03:09

5 files changed, 40 insertions, 19 deletions

diff --git a/sys-apps/pkgcraft-tools/Manifest b/sys-apps/pkgcraft-tools/Manifest
index 318ddb49c7ea..7bd642cd9ea7 100644
--- a/sys-apps/pkgcraft-tools/Manifest
+++ b/sys-apps/pkgcraft-tools/Manifest
@@ -1,8 +1,8 @@
 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
-EBUILD pkgcraft-tools-0.0.14.ebuild 1143 BLAKE2B db8d072ac5674edd8de492a4df64c9da5b3e87c288159e71e5376bfb11776129e70f69c979d03a60f5a780d30b940800f16d924881cb93fa69ede13af750c5ec SHA512 1441db25715bdf6ded23ceb9fde80e53bcd66b349fb6d588a524236751a64e9676235b1ddbd54c4cda66919b49b107f4e759e25a710419c1570cda4c91ffa8c6
-EBUILD pkgcraft-tools-0.0.15.ebuild 1093 BLAKE2B 4addd2b956f6b7b293e4f54c3b9211da7d27319256066daa27fc629abae4924b6c29976462e591dbc3534456557df0c92f746a522b9df186070a03c553d235cf SHA512 74eb328c077066cba08a6bc032dd815d2a1c510cf71c7ddaf66485037a5c4fe427f0b004f859e4a587c11af91886d523e930fbbb74ece877d5d994fb76c849fd
-EBUILD pkgcraft-tools-0.0.16.ebuild 1093 BLAKE2B 4addd2b956f6b7b293e4f54c3b9211da7d27319256066daa27fc629abae4924b6c29976462e591dbc3534456557df0c92f746a522b9df186070a03c553d235cf SHA512 74eb328c077066cba08a6bc032dd815d2a1c510cf71c7ddaf66485037a5c4fe427f0b004f859e4a587c11af91886d523e930fbbb74ece877d5d994fb76c849fd
-EBUILD pkgcraft-tools-9999.ebuild 1093 BLAKE2B 4addd2b956f6b7b293e4f54c3b9211da7d27319256066daa27fc629abae4924b6c29976462e591dbc3534456557df0c92f746a522b9df186070a03c553d235cf SHA512 74eb328c077066cba08a6bc032dd815d2a1c510cf71c7ddaf66485037a5c4fe427f0b004f859e4a587c11af91886d523e930fbbb74ece877d5d994fb76c849fd
+EBUILD pkgcraft-tools-0.0.14-r1.ebuild 1122 BLAKE2B c3aac0d6c0e54d2456a9542fcd18382a1ace2ae2872415e3f14d95f22cdea3fddbc5adbc22e12cd955592313960cfea7452611cccb6415e87c9ac6edcddc0c36 SHA512 f5f70ef14cbe10b72bb4f8adb81adb93d0908355787f9cbe1468c510e95f88b4f303f4660417cc8a96b49d3c2183c0e32aad8756dbcfc1fdaa0dd49b1d5d84ce
+EBUILD pkgcraft-tools-0.0.15-r1.ebuild 1150 BLAKE2B 904338d0029273f9c4390340ac375110d5213b3b94f1a9df80a3d14e2f2bd3c6cb0122b988952b57918d3ce808e2049b2b4c7cfd11cc8777834092f248a042f1 SHA512 7cb513e9ff31fcc1bb796b48c710ebeb4f80b8ae9b2c8cfbc1b495aeedfa80dc4c4b260529fce46752d4749e6b30db5c692ed6a3c74511c33d8b59d80c2fa998
+EBUILD pkgcraft-tools-0.0.16-r1.ebuild 1150 BLAKE2B 904338d0029273f9c4390340ac375110d5213b3b94f1a9df80a3d14e2f2bd3c6cb0122b988952b57918d3ce808e2049b2b4c7cfd11cc8777834092f248a042f1 SHA512 7cb513e9ff31fcc1bb796b48c710ebeb4f80b8ae9b2c8cfbc1b495aeedfa80dc4c4b260529fce46752d4749e6b30db5c692ed6a3c74511c33d8b59d80c2fa998
+EBUILD pkgcraft-tools-9999.ebuild 1147 BLAKE2B cc5182863e59f2a6cd6939bed9e2323bec55e8f270b3fb74d6ff9776e09ddc612d22e63d1e9570446dc923923fd10b28e921b7eb6e9cfbc6a4d7f601b8f16402 SHA512 1ea142928a26a51f44d88b4aa7bd86768ae02acb1d8d1e1cbf90230cb8d05b896e894d69a26649e9ebb52c4c5d632b0d8d3ab3a88ef2d658a5c172b15d6cf383
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.14-r1.ebuild
index e12a623430f6..6ae730a05105 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.14-r1.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 CRATES=" "
-LLVM_COMPAT=( {17..18} )
+LLVM_COMPAT=( 17 )
+
 inherit edo cargo llvm-r1
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
@@ -35,10 +36,14 @@ BDEPEND="
 	$(llvm_gen_dep '
 		sys-devel/clang:${LLVM_SLOT}
 	')
-	>=virtual/rust-1.76
 	test? ( dev-util/cargo-nextest )
 "
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
@@ -49,5 +54,5 @@ src_unpack() {
 }
 
 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
 }
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.16.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15-r1.ebuild
index e12a623430f6..4dd6b1e8e90e 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.16.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15-r1.ebuild
@@ -5,7 +5,9 @@ EAPI=8
 
 CRATES=" "
 LLVM_COMPAT=( {17..18} )
-inherit edo cargo llvm-r1
+RUST_MIN_VER="1.77.1"
+
+inherit edo llvm-r1 cargo
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -35,10 +37,14 @@ BDEPEND="
 	$(llvm_gen_dep '
 		sys-devel/clang:${LLVM_SLOT}
 	')
-	>=virtual/rust-1.76
 	test? ( dev-util/cargo-nextest )
 "
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
@@ -49,5 +55,5 @@ src_unpack() {
 }
 
 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
 }
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.14.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.16-r1.ebuild
index fa06a1993399..4dd6b1e8e90e 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.14.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.16-r1.ebuild
@@ -4,8 +4,10 @@
 EAPI=8
 
 CRATES=" "
-LLVM_MAX_SLOT=17
-inherit edo cargo llvm
+LLVM_COMPAT=( {17..18} )
+RUST_MIN_VER="1.77.1"
+
+inherit edo llvm-r1 cargo
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -32,13 +34,15 @@ QA_FLAGS_IGNORED="usr/bin/pk"
 
 # Clang needed for bindgen
 BDEPEND="
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
-	>=virtual/rust-1.71
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+	')
 	test? ( dev-util/cargo-nextest )
 "
 
-llvm_check_deps() {
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
 }
 
 src_unpack() {
@@ -51,5 +55,5 @@ src_unpack() {
 }
 
 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
 }
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
index e12a623430f6..3739b1a925c3 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
@@ -5,7 +5,9 @@ EAPI=8
 
 CRATES=" "
 LLVM_COMPAT=( {17..18} )
-inherit edo cargo llvm-r1
+RUST_MIN_VER="1.77.1"
+
+inherit edo llvm-r1 cargo
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -35,10 +37,14 @@ BDEPEND="
 	$(llvm_gen_dep '
 		sys-devel/clang:${LLVM_SLOT}
 	')
-	>=virtual/rust-1.76
 	test? ( dev-util/cargo-nextest )
 "
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack