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

4 files changed, 20 insertions, 10 deletions

diff --git a/sys-apps/uutils-findutils/Manifest b/sys-apps/uutils-findutils/Manifest
index ba8972b51bf6..13e5c9723354 100644
--- a/sys-apps/uutils-findutils/Manifest
+++ b/sys-apps/uutils-findutils/Manifest
@@ -254,7 +254,7 @@ DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
-EBUILD uutils-findutils-0.4.2-r1.ebuild 5196 BLAKE2B 4457d18456ee47c91b589bb153108d98771032359f19a9b30c8f6f993f8a1748a572d1594a3d93431285a6e55e65c2ca51d9126a4a0c757af8b8e2fda8ffe50e SHA512 73140b2bf8d49a4e586e499144223c40ef4056fc1e5bef8856fcd6a6fed5adfccc4e55d8e29635d82b70a3c0c2a02b3150f9f841a5cd94d81df431607b943754
-EBUILD uutils-findutils-0.5.0.ebuild 4117 BLAKE2B 068cbaf3a5241f20078b8e760eb6dae64bb56faffc9e03041296e54673ff2f3be7a6acacf03bafc560b66abdea95a1e69a17221558b67c761b499ffc98f94dd4 SHA512 d7da2e78b03099f3253047cf535fc9f682797ce6bbb80b4f0b89349bfc0ea32642a0a9ad232a3152ff9545aec66c10b6047e16ee7cdd074fa459ac6a05687e39
-EBUILD uutils-findutils-9999.ebuild 4117 BLAKE2B 068cbaf3a5241f20078b8e760eb6dae64bb56faffc9e03041296e54673ff2f3be7a6acacf03bafc560b66abdea95a1e69a17221558b67c761b499ffc98f94dd4 SHA512 d7da2e78b03099f3253047cf535fc9f682797ce6bbb80b4f0b89349bfc0ea32642a0a9ad232a3152ff9545aec66c10b6047e16ee7cdd074fa459ac6a05687e39
+EBUILD uutils-findutils-0.4.2-r1.ebuild 5243 BLAKE2B 6204881a30389dea543f2227486582236207c096263ed178f152201878369a003699bfbf6f2220028b14b6e8a94a5f38e9c0164c1e5c1f01811a700ec411a3c8 SHA512 99e2a45fc62775f37550b818d5563a233a8e29a156d42416623eb22411abb354c09682d49019292accc3a7985d6929a7b5d341e93951c14466fa0c5d0505122b
+EBUILD uutils-findutils-0.5.0-r1.ebuild 4148 BLAKE2B d8a4d0f0e60dd75c810766c83a625fceead8387ab1b21f5374ee625ba9232cb7f971e2a5a41278a51641a7200cd117ed91e1b3b246be32d05b24e938bfb2029d SHA512 50a773ca9de468cca91c5512d3dae975b23a53f2ae3d56a259cccae1e5330362d5c84f61195afb571df5a9b29c9b801856945157d299a802e50d0e99326accc4
+EBUILD uutils-findutils-9999.ebuild 4096 BLAKE2B 0e69be23f271e3d779ad68baec9f6cbbe9a9dab790dfe472342c0b3dab1742f88c0638e55aa2aece138ba780740c8982b5d0e879ff00259a22b80031f0df198f SHA512 2bd33150b1c4f9f184e8b3d110acabd84c8ac0aff9f6d8a6b39f2d692ecd12c3724a05fe02e41e83193462b27b2a55d5bf96cf04c3b5c4c1b61aa35674d33ef8
 MISC metadata.xml 428 BLAKE2B a130660afee028d057d6efdb89665b9aaee83236fdd0823341182d27e3838ddc8b64dd57e47f6c1e9baca06cedea895eff01649a0b9ddbb50552d8bae64afcc4 SHA512 f505385ff6f1a8baa50643719eaa2cc7464f3a9e2a225532e417c1942fa711ae9b85ebeb5d71982f359d2b2555e7fddc897bd502db085355d8dd5c7479eda136
diff --git a/sys-apps/uutils-findutils/uutils-findutils-0.4.2-r1.ebuild b/sys-apps/uutils-findutils/uutils-findutils-0.4.2-r1.ebuild
index c31dd891b770..c4c8d32c12b0 100644
--- a/sys-apps/uutils-findutils/uutils-findutils-0.4.2-r1.ebuild
+++ b/sys-apps/uutils-findutils/uutils-findutils-0.4.2-r1.ebuild
@@ -176,8 +176,9 @@ declare -A GIT_CRATES=(
 	[onig_sys]="https://github.com/rust-onig/rust-onig;fa90c0e97e90a056af89f183b23cd417b59ee6a2;rust-onig-%commit%/onig_sys"
 )
 
-LLVM_MAX_SLOT=17
-inherit cargo llvm
+LLVM_COMPAT=( 17 )
+
+inherit cargo llvm-r1
 
 DESCRIPTION="GNU findutils rewritten in Rust"
 HOMEPAGE="https://uutils.github.io/findutils/ https://github.com/uutils/findutils"
@@ -208,8 +209,9 @@ fi
 RDEPEND=">=dev-libs/oniguruma-6.9.9:="
 DEPEND="${RDEPEND}"
 BDEPEND="
-	<sys-devel/clang-$((LLVM_MAX_SLOT + 1))
-	>=virtual/rust-1.56.0
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+	')
 "
 
 QA_FLAGS_IGNORED=".*"
@@ -218,6 +220,11 @@ PATCHES=(
 	"${WORKDIR}"/${PN}-0.4.2-update-crates.patch
 )
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
diff --git a/sys-apps/uutils-findutils/uutils-findutils-0.5.0.ebuild b/sys-apps/uutils-findutils/uutils-findutils-0.5.0-r1.ebuild
index 68631a51d6bf..6c03da24e81d 100644
--- a/sys-apps/uutils-findutils/uutils-findutils-0.5.0.ebuild
+++ b/sys-apps/uutils-findutils/uutils-findutils-0.5.0-r1.ebuild
@@ -166,11 +166,15 @@ BDEPEND="
 	$(llvm_gen_dep '
 		sys-devel/clang:${LLVM_SLOT}
 	')
-	>=virtual/rust-1.70
 "
 
 QA_FLAGS_IGNORED=".*"
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
diff --git a/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild b/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild
index 68631a51d6bf..f8a83a5773bb 100644
--- a/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild
+++ b/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild
@@ -133,7 +133,7 @@ CRATES="
 "
 
 LLVM_COMPAT=( {17..18} )
-inherit cargo llvm-r1
+inherit llvm-r1 cargo
 
 DESCRIPTION="GNU findutils rewritten in Rust"
 HOMEPAGE="https://uutils.github.io/findutils/ https://github.com/uutils/findutils"
@@ -166,7 +166,6 @@ BDEPEND="
 	$(llvm_gen_dep '
 		sys-devel/clang:${LLVM_SLOT}
 	')
-	>=virtual/rust-1.70
 "
 
 QA_FLAGS_IGNORED=".*"