31 files changed, 274 insertions, 236 deletions
diff --git a/sys-apps/amdgpu_top/amdgpu_top-0.7.0.ebuild b/sys-apps/amdgpu_top/amdgpu_top-0.7.0-r1.ebuild
index 1387d046786c..a034f5667aa6 100644
--- a/sys-apps/amdgpu_top/amdgpu_top-0.7.0.ebuild
+++ b/sys-apps/amdgpu_top/amdgpu_top-0.7.0-r1.ebuild
@@ -364,6 +364,9 @@ declare -A GIT_CRATES=(
 	[libdrm_amdgpu_sys]='https://github.com/Umio-Yasuno/libdrm-amdgpu-sys-rs;6852a973c639385988ce0454b59dddcf40ebcd2f;libdrm-amdgpu-sys-rs-%commit%'
 )
 
+# Box Time T 1.80 stuff
+RUST_MAX_VER="1.79.0"
+
 inherit desktop cargo
 
 DESCRIPTION="Tool to displays AMDGPU usage."
diff --git a/sys-apps/amdgpu_top/amdgpu_top-0.9.1.ebuild b/sys-apps/amdgpu_top/amdgpu_top-0.9.1-r1.ebuild
index c8949104ff02..c8949104ff02 100644
--- a/sys-apps/amdgpu_top/amdgpu_top-0.9.1.ebuild
+++ b/sys-apps/amdgpu_top/amdgpu_top-0.9.1-r1.ebuild
diff --git a/sys-apps/asahi-bless/asahi-bless-0.3.0.ebuild b/sys-apps/asahi-bless/asahi-bless-0.3.0-r1.ebuild
index 7cb997d40f69..c9a4d40bfb75 100644
--- a/sys-apps/asahi-bless/asahi-bless-0.3.0.ebuild
+++ b/sys-apps/asahi-bless/asahi-bless-0.3.0-r1.ebuild
@@ -89,6 +89,11 @@ LICENSE+=" MIT Unicode-DFS-2016 ZLIB"
 SLOT="0"
 KEYWORDS="~arm64"
 
+pkg_setup() {
+	linux-info_pkg_setup
+	rust_pkg_setup
+}
+
 pkg_pretend() {
 	if use kernel_linux; then
 		linux_config_exists || die "No suitable kernel configuration could be found"
diff --git a/sys-apps/asahi-nvram/asahi-nvram-0.2.1.ebuild b/sys-apps/asahi-nvram/asahi-nvram-0.2.1-r1.ebuild
index 99e80c6bc1bd..e901a4943328 100644
--- a/sys-apps/asahi-nvram/asahi-nvram-0.2.1.ebuild
+++ b/sys-apps/asahi-nvram/asahi-nvram-0.2.1-r1.ebuild
@@ -89,6 +89,11 @@ LICENSE+=" MIT Unicode-DFS-2016 ZLIB"
 SLOT="0"
 KEYWORDS="~arm64"
 
+pkg_setup() {
+	linux-info_pkg_setup
+	rust_pkg_setup
+}
+
 pkg_pretend() {
 	if use kernel_linux; then
 		linux_config_exists || die "No suitable kernel configuration could be found"
diff --git a/sys-apps/asahi-startup-disk/asahi-startup-disk-0.1.3.ebuild b/sys-apps/asahi-startup-disk/asahi-startup-disk-0.1.3-r1.ebuild
index 021770dd5ac2..021770dd5ac2 100644
--- a/sys-apps/asahi-startup-disk/asahi-startup-disk-0.1.3.ebuild
+++ b/sys-apps/asahi-startup-disk/asahi-startup-disk-0.1.3-r1.ebuild
diff --git a/sys-apps/bat/bat-0.23.0-r1.ebuild b/sys-apps/bat/bat-0.23.0-r2.ebuild
index 0a4601f4acbf..0a4601f4acbf 100644
--- a/sys-apps/bat/bat-0.23.0-r1.ebuild
+++ b/sys-apps/bat/bat-0.23.0-r2.ebuild
diff --git a/sys-apps/bat/bat-0.24.0-r1.ebuild b/sys-apps/bat/bat-0.24.0-r2.ebuild
index 19f0e337f7a3..19f0e337f7a3 100644
--- a/sys-apps/bat/bat-0.24.0-r1.ebuild
+++ b/sys-apps/bat/bat-0.24.0-r2.ebuild
diff --git a/sys-apps/cyme/cyme-2.0.0.ebuild b/sys-apps/cyme/cyme-2.0.0-r1.ebuild
index 253de8e929b4..253de8e929b4 100644
--- a/sys-apps/cyme/cyme-2.0.0.ebuild
+++ b/sys-apps/cyme/cyme-2.0.0-r1.ebuild
diff --git a/sys-apps/cyme/cyme-2.1.0.ebuild b/sys-apps/cyme/cyme-2.1.0-r1.ebuild
index 916284d52d4c..916284d52d4c 100644
--- a/sys-apps/cyme/cyme-2.1.0.ebuild
+++ b/sys-apps/cyme/cyme-2.1.0-r1.ebuild
diff --git a/sys-apps/eza/eza-0.18.16.ebuild b/sys-apps/eza/eza-0.18.16-r1.ebuild
index f8a9cd311cc1..254b0371aec5 100644
--- a/sys-apps/eza/eza-0.18.16.ebuild
+++ b/sys-apps/eza/eza-0.18.16-r1.ebuild
@@ -208,7 +208,6 @@ IUSE="+git"
 
 DEPEND="git? ( >=dev-libs/libgit2-1.7.0:= )"
 RDEPEND="${DEPEND}"
-BDEPEND=">=virtual/rust-1.70.0"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
diff --git a/sys-apps/eza/eza-0.19.0.ebuild b/sys-apps/eza/eza-0.19.0-r1.ebuild
index 6ad5bd48c0fa..608385c2d834 100644
--- a/sys-apps/eza/eza-0.19.0.ebuild
+++ b/sys-apps/eza/eza-0.19.0-r1.ebuild
@@ -209,7 +209,6 @@ IUSE="+git"
 
 DEPEND="git? ( >=dev-libs/libgit2-1.8.1:= )"
 RDEPEND="${DEPEND}"
-BDEPEND=">=virtual/rust-1.70.0"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
diff --git a/sys-apps/eza/eza-0.19.2.ebuild b/sys-apps/eza/eza-0.19.2-r1.ebuild
index 7c748f4db104..5cae0cd643de 100644
--- a/sys-apps/eza/eza-0.19.2.ebuild
+++ b/sys-apps/eza/eza-0.19.2-r1.ebuild
@@ -221,7 +221,6 @@ IUSE="+git"
 
 DEPEND="git? ( >=dev-libs/libgit2-1.8.1:= )"
 RDEPEND="${DEPEND}"
-BDEPEND=">=virtual/rust-1.70.0"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
diff --git a/sys-apps/eza/eza-0.20.0.ebuild b/sys-apps/eza/eza-0.20.0-r1.ebuild
index 6fcea33029cc..1d56ac890116 100644
--- a/sys-apps/eza/eza-0.20.0.ebuild
+++ b/sys-apps/eza/eza-0.20.0-r1.ebuild
@@ -229,7 +229,6 @@ IUSE="+git"
 
 DEPEND="git? ( >=dev-libs/libgit2-1.8.1:= )"
 RDEPEND="${DEPEND}"
-BDEPEND=">=virtual/rust-1.70.0"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
diff --git a/sys-apps/fd/fd-10.2.0.ebuild b/sys-apps/fd/fd-10.2.0-r1.ebuild
index 7aebdb798a90..0435d37a069f 100644
--- a/sys-apps/fd/fd-10.2.0.ebuild
+++ b/sys-apps/fd/fd-10.2.0-r1.ebuild
@@ -119,6 +119,8 @@ CRATES="
 	windows_x86_64_msvc@0.52.6
 "
 
+RUST_MIN_VER="1.79.0"
+
 inherit bash-completion-r1 cargo
 
 DESCRIPTION="Alternative to find that provides sensible defaults for 80% of the use cases"
@@ -141,9 +143,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
-BDEPEND="
-	>=virtual/rust-1.77.2
-"
 
 QA_FLAGS_IGNORED="/usr/bin/fd"
 
diff --git a/sys-apps/ipmi-fan-control/ipmi-fan-control-0.4.0-r1.ebuild b/sys-apps/ipmi-fan-control/ipmi-fan-control-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..9a64306f99e0
--- /dev/null
+++ b/sys-apps/ipmi-fan-control/ipmi-fan-control-0.4.0-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick@0.7.19
+	atty@0.2.14
+	autocfg@1.1.0
+	bindgen@0.60.1
+	bitflags@1.3.2
+	bytes@1.2.1
+	cexpr@0.6.0
+	cfg-if@1.0.0
+	clang-sys@1.3.3
+	clap@3.2.22
+	clap_derive@3.2.18
+	clap_lex@0.2.4
+	either@1.8.0
+	env_logger@0.9.1
+	futures@0.3.24
+	futures-channel@0.3.24
+	futures-core@0.3.24
+	futures-executor@0.3.24
+	futures-io@0.3.24
+	futures-macro@0.3.24
+	futures-sink@0.3.24
+	futures-task@0.3.24
+	futures-util@0.3.24
+	getrandom@0.2.7
+	glob@0.3.0
+	hashbrown@0.12.3
+	heck@0.4.0
+	hermit-abi@0.1.19
+	humantime@2.1.0
+	indexmap@1.9.1
+	itoa@1.0.3
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	libc@0.2.132
+	libloading@0.7.3
+	lock_api@0.4.8
+	log@0.4.17
+	memchr@2.5.0
+	minimal-lexical@0.2.1
+	mio@0.8.4
+	nom@7.1.1
+	num_cpus@1.13.1
+	once_cell@1.14.0
+	os_str_bytes@6.3.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.3
+	peeking_take_while@0.1.2
+	pin-project-lite@0.2.9
+	pin-utils@0.1.0
+	pkg-config@0.3.25
+	ppv-lite86@0.2.16
+	proc-macro-error@1.0.4
+	proc-macro-error-attr@1.0.4
+	proc-macro2@1.0.43
+	quote@1.0.21
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	redox_syscall@0.2.16
+	regex@1.6.0
+	regex-syntax@0.6.27
+	retry@2.0.0
+	rustc-hash@1.1.0
+	ryu@1.0.11
+	scopeguard@1.1.0
+	serde@1.0.144
+	serde_derive@1.0.144
+	serde_json@1.0.85
+	shlex@1.1.0
+	signal-hook-registry@1.4.0
+	slab@0.4.7
+	smallvec@1.9.0
+	socket2@0.4.7
+	strsim@0.10.0
+	syn@1.0.99
+	termcolor@1.1.3
+	textwrap@0.15.1
+	thiserror@1.0.35
+	thiserror-impl@1.0.35
+	tokio@1.21.1
+	tokio-macros@1.8.0
+	tokio-stream@0.1.10
+	toml@0.5.9
+	unicode-ident@1.0.4
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	which@4.3.0
+	winapi@0.3.9
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	windows-sys@0.36.1
+	windows_aarch64_msvc@0.36.1
+	windows_i686_gnu@0.36.1
+	windows_i686_msvc@0.36.1
+	windows_x86_64_gnu@0.36.1
+	windows_x86_64_msvc@0.36.1
+"
+
+inherit cargo optfeature systemd
+
+DESCRIPTION="SuperMicro IPMI fan control daemon"
+HOMEPAGE="https://github.com/chenxiaolong/ipmi-fan-control"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/chenxiaolong/${PN}"
+else
+	SRC_URI="https://github.com/chenxiaolong/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		${CARGO_CRATE_URIS}"
+	# supported boards are x86_64 only, do not keyword elsewhere
+	# technically it could run on remote host and issue commands via ipmitool lanplus, but that's very edgy case
+	KEYWORDS="-* ~amd64"
+fi
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 GPL-3+ ISC MIT Unicode-DFS-2016 Unlicense"
+SLOT="0"
+
+BDEPEND="
+	sys-devel/clang
+	virtual/pkgconfig
+"
+
+RDEPEND="sys-libs/freeipmi"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_install() {
+	cargo_src_install
+
+	sed -i \
+		-e "s|@BINDIR@|${EPREFIX}/usr/bin|" \
+		-e "s|@SYSCONFDIR@|${EPREFIX}/etc|" \
+		dist/ipmi-fan-control.service.in || die
+
+	# TODO: add openrc service
+	systemd_newunit dist/ipmi-fan-control.service.in ipmi-fan-control.service
+
+	insinto /etc
+	newins config.sample.toml "${PN}".toml
+}
+
+pkg_postinst() {
+	optfeature "S.M.A.R.T. drive temperature support" sys-apps/smartmontools
+}
diff --git a/sys-apps/ipmi-fan-control/ipmi-fan-control-0.4.0.ebuild b/sys-apps/ipmi-fan-control/ipmi-fan-control-0.4.0.ebuild
deleted file mode 100644
index d5ac89808170..000000000000
--- a/sys-apps/ipmi-fan-control/ipmi-fan-control-0.4.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	aho-corasick-0.7.19
-	atty-0.2.14
-	autocfg-1.1.0
-	bindgen-0.60.1
-	bitflags-1.3.2
-	bytes-1.2.1
-	cexpr-0.6.0
-	cfg-if-1.0.0
-	clang-sys-1.3.3
-	clap-3.2.22
-	clap_derive-3.2.18
-	clap_lex-0.2.4
-	either-1.8.0
-	env_logger-0.9.1
-	futures-0.3.24
-	futures-channel-0.3.24
-	futures-core-0.3.24
-	futures-executor-0.3.24
-	futures-io-0.3.24
-	futures-macro-0.3.24
-	futures-sink-0.3.24
-	futures-task-0.3.24
-	futures-util-0.3.24
-	getrandom-0.2.7
-	glob-0.3.0
-	hashbrown-0.12.3
-	heck-0.4.0
-	hermit-abi-0.1.19
-	humantime-2.1.0
-	indexmap-1.9.1
-	itoa-1.0.3
-	lazy_static-1.4.0
-	lazycell-1.3.0
-	libc-0.2.132
-	libloading-0.7.3
-	lock_api-0.4.8
-	log-0.4.17
-	memchr-2.5.0
-	minimal-lexical-0.2.1
-	mio-0.8.4
-	nom-7.1.1
-	num_cpus-1.13.1
-	once_cell-1.14.0
-	os_str_bytes-6.3.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.3
-	peeking_take_while-0.1.2
-	pin-project-lite-0.2.9
-	pin-utils-0.1.0
-	pkg-config-0.3.25
-	ppv-lite86-0.2.16
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.43
-	quote-1.0.21
-	rand-0.8.5
-	rand_chacha-0.3.1
-	rand_core-0.6.4
-	redox_syscall-0.2.16
-	regex-1.6.0
-	regex-syntax-0.6.27
-	retry-2.0.0
-	rustc-hash-1.1.0
-	ryu-1.0.11
-	scopeguard-1.1.0
-	serde-1.0.144
-	serde_derive-1.0.144
-	serde_json-1.0.85
-	shlex-1.1.0
-	signal-hook-registry-1.4.0
-	slab-0.4.7
-	smallvec-1.9.0
-	socket2-0.4.7
-	strsim-0.10.0
-	syn-1.0.99
-	termcolor-1.1.3
-	textwrap-0.15.1
-	thiserror-1.0.35
-	thiserror-impl-1.0.35
-	tokio-1.21.1
-	tokio-macros-1.8.0
-	tokio-stream-0.1.10
-	toml-0.5.9
-	unicode-ident-1.0.4
-	version_check-0.9.4
-	wasi-0.11.0+wasi-snapshot-preview1
-	which-4.3.0
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.36.1
-	windows_aarch64_msvc-0.36.1
-	windows_i686_gnu-0.36.1
-	windows_i686_msvc-0.36.1
-	windows_x86_64_gnu-0.36.1
-	windows_x86_64_msvc-0.36.1
-"
-
-inherit cargo optfeature systemd
-
-DESCRIPTION="SuperMicro IPMI fan control daemon"
-HOMEPAGE="https://github.com/chenxiaolong/ipmi-fan-control"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/chenxiaolong/${PN}"
-else
-	SRC_URI="https://github.com/chenxiaolong/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		$(cargo_crate_uris)"
-	# supported boards are x86_64 only, do not keyword elsewhere
-	# technically it could run on remote host and issue commands via ipmitool lanplus, but that's very edgy case
-	KEYWORDS="-* ~amd64"
-fi
-
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 GPL-3+ ISC MIT Unicode-DFS-2016 Unlicense"
-SLOT="0"
-
-BDEPEND="
-	sys-devel/clang
-	virtual/pkgconfig
-"
-
-RDEPEND="sys-libs/freeipmi"
-DEPEND="${RDEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_install() {
-	cargo_src_install
-
-	sed -i \
-		-e "s|@BINDIR@|${EPREFIX}/usr/bin|" \
-		-e "s|@SYSCONFDIR@|${EPREFIX}/etc|" \
-		dist/ipmi-fan-control.service.in || die
-
-	# TODO: add openrc service
-	systemd_newunit dist/ipmi-fan-control.service.in ipmi-fan-control.service
-
-	insinto /etc
-	newins config.sample.toml "${PN}".toml
-}
-
-pkg_postinst() {
-	optfeature "S.M.A.R.T. drive temperature support" sys-apps/smartmontools
-}
diff --git a/sys-apps/ipmi-fan-control/ipmi-fan-control-9999.ebuild b/sys-apps/ipmi-fan-control/ipmi-fan-control-9999.ebuild
index 9edc0bc051d8..b54b1009b6a3 100644
--- a/sys-apps/ipmi-fan-control/ipmi-fan-control-9999.ebuild
+++ b/sys-apps/ipmi-fan-control/ipmi-fan-control-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/chenxiaolong/${PN}"
 else
 	SRC_URI="https://github.com/chenxiaolong/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		$(cargo_crate_uris)"
+		${CARGO_CRATE_URIS}"
 	# supported boards are x86_64 only, do not keyword elsewhere
 	# technically it could run on remote host and issue commands via ipmitool lanplus, but that's very edgy case
 	KEYWORDS="-* ~amd64"
diff --git a/sys-apps/lsd/lsd-1.1.3.ebuild b/sys-apps/lsd/lsd-1.1.3-r1.ebuild
index c152363a432b..c152363a432b 100644
--- a/sys-apps/lsd/lsd-1.1.3.ebuild
+++ b/sys-apps/lsd/lsd-1.1.3-r1.ebuild
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.16.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.16.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.15.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.15.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
diff --git a/sys-apps/ripgrep/ripgrep-14.1.1.ebuild b/sys-apps/ripgrep/ripgrep-14.1.1-r1.ebuild
index 85eb70fa4749..3b365db8e3c0 100644
--- a/sys-apps/ripgrep/ripgrep-14.1.1.ebuild
+++ b/sys-apps/ripgrep/ripgrep-14.1.1-r1.ebuild
@@ -57,6 +57,8 @@ CRATES="
 	windows_x86_64_msvc@0.52.6
 "
 
+RUST_MIN_VER="1.74.1"
+
 inherit cargo bash-completion-r1
 
 DESCRIPTION="Search tool that combines the usability of ag with the raw speed of grep"
@@ -79,7 +81,6 @@ IUSE="+pcre"
 RDEPEND="pcre? ( dev-libs/libpcre2:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	>=virtual/rust-1.72
 	virtual/pkgconfig
 "
 
diff --git a/sys-apps/systemctl-tui/systemctl-tui-0.3.4.ebuild b/sys-apps/systemctl-tui/systemctl-tui-0.3.4-r1.ebuild
index 5d4095fe4bfe..5d4095fe4bfe 100644
--- a/sys-apps/systemctl-tui/systemctl-tui-0.3.4.ebuild
+++ b/sys-apps/systemctl-tui/systemctl-tui-0.3.4-r1.ebuild
diff --git a/sys-apps/uutils-coreutils/uutils-coreutils-0.0.25.ebuild b/sys-apps/uutils-coreutils/uutils-coreutils-0.0.25-r1.ebuild
index 54d71a2f8c9c..48add188ba43 100644
--- a/sys-apps/uutils-coreutils/uutils-coreutils-0.0.25.ebuild
+++ b/sys-apps/uutils-coreutils/uutils-coreutils-0.0.25-r1.ebuild
@@ -320,7 +320,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	>=virtual/rust-1.70.0
 	test? ( dev-util/cargo-nextest )
 "
 
diff --git a/sys-apps/uutils-coreutils/uutils-coreutils-0.0.27.ebuild b/sys-apps/uutils-coreutils/uutils-coreutils-0.0.27-r1.ebuild
index 81d874fa698b..983444b96327 100644
--- a/sys-apps/uutils-coreutils/uutils-coreutils-0.0.27.ebuild
+++ b/sys-apps/uutils-coreutils/uutils-coreutils-0.0.27-r1.ebuild
@@ -350,7 +350,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	>=virtual/rust-1.70.0
 	test? ( dev-util/cargo-nextest )
 "
 
diff --git a/sys-apps/uutils-coreutils/uutils-coreutils-9999.ebuild b/sys-apps/uutils-coreutils/uutils-coreutils-9999.ebuild
index 81d874fa698b..983444b96327 100644
--- a/sys-apps/uutils-coreutils/uutils-coreutils-9999.ebuild
+++ b/sys-apps/uutils-coreutils/uutils-coreutils-9999.ebuild
@@ -350,7 +350,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	>=virtual/rust-1.70.0
 	test? ( dev-util/cargo-nextest )
 "
 
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=".*"
diff --git a/sys-apps/zram-generator/zram-generator-1.1.2.ebuild b/sys-apps/zram-generator/zram-generator-1.1.2-r1.ebuild
index e9c8dc4ca9ff..3d422cd75d43 100644
--- a/sys-apps/zram-generator/zram-generator-1.1.2.ebuild
+++ b/sys-apps/zram-generator/zram-generator-1.1.2-r1.ebuild
@@ -4,44 +4,44 @@
 EAPI=8
 
 CRATES="
-	ahash-0.4.7
-	anyhow-1.0.45
-	autocfg-1.0.1
-	bitflags-1.2.1
-	cc-1.0.72
-	cfg-if-1.0.0
-	clap-2.33.3
-	ctor-0.1.21
-	dlv-list-0.2.3
-	fasteval-0.2.4
-	fs_extra-1.2.0
-	getrandom-0.2.3
-	hashbrown-0.9.1
-	libc-0.2.107
-	liboverdrop-0.0.2
-	log-0.4.14
-	memoffset-0.6.4
-	nix-0.22.2
-	ordered-multimap-0.3.1
-	ppv-lite86-0.2.15
-	proc-macro2-1.0.32
-	quote-1.0.10
-	rand-0.8.4
-	rand_chacha-0.3.1
-	rand_core-0.6.3
-	rand_hc-0.3.1
-	redox_syscall-0.2.10
-	remove_dir_all-0.5.3
-	rust-ini-0.17.0
-	syn-1.0.81
-	tempfile-3.2.0
-	textwrap-0.11.0
-	unicode-width-0.1.9
-	unicode-xid-0.2.2
-	wasi-0.10.2+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
+	ahash@0.4.7
+	anyhow@1.0.45
+	autocfg@1.0.1
+	bitflags@1.2.1
+	cc@1.0.72
+	cfg-if@1.0.0
+	clap@2.33.3
+	ctor@0.1.21
+	dlv-list@0.2.3
+	fasteval@0.2.4
+	fs_extra@1.2.0
+	getrandom@0.2.3
+	hashbrown@0.9.1
+	libc@0.2.107
+	liboverdrop@0.0.2
+	log@0.4.14
+	memoffset@0.6.4
+	nix@0.22.2
+	ordered-multimap@0.3.1
+	ppv-lite86@0.2.15
+	proc-macro2@1.0.32
+	quote@1.0.10
+	rand@0.8.4
+	rand_chacha@0.3.1
+	rand_core@0.6.3
+	rand_hc@0.3.1
+	redox_syscall@0.2.10
+	remove_dir_all@0.5.3
+	rust-ini@0.17.0
+	syn@1.0.81
+	tempfile@3.2.0
+	textwrap@0.11.0
+	unicode-width@0.1.9
+	unicode-xid@0.2.2
+	wasi@0.10.2+wasi-snapshot-preview1
+	winapi@0.3.9
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
 "
 
 inherit cargo systemd toolchain-funcs
@@ -49,16 +49,17 @@ inherit cargo systemd toolchain-funcs
 DESCRIPTION="Systemd unit generator for zram swap devices"
 HOMEPAGE="https://github.com/systemd/zram-generator"
 SRC_URI="https://github.com/systemd/zram-generator/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	  $(cargo_crate_uris ${CRATES})"
+	  ${CARGO_CRATE_URIS}"
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="+man"
 
-BDEPEND="virtual/rust
+BDEPEND="
 	virtual/pkgconfig
-	man? ( app-text/ronn-ng )"
+	man? ( app-text/ronn-ng )
+"
 
 QA_FLAGS_IGNORED="lib/systemd/system-generators/zram-generator"