summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Jolly <kangie@gentoo.org>2024-11-04 17:24:14 +1000
committerMatt Jolly <kangie@gentoo.org>2024-11-09 16:25:41 +1000
commit01ba4dc61965ef7658a24728841c04c9a1ce4871 (patch)
treea2a6b927779e5990ff87ec4589373d1d89129a63 /sys-kernel
parentprofiles: mask dev-lang/starlark-rust (diff)
downloadgentoo-01ba4dc61965ef7658a24728841c04c9a1ce4871.tar.gz
gentoo-01ba4dc61965ef7658a24728841c04c9a1ce4871.tar.bz2
gentoo-01ba4dc61965ef7658a24728841c04c9a1ce4871.zip
*/*: update for slotted Rust
Tidyups: - $(cargo_crate_uris) - Rust BDEPENDS come from the eclass except in very rare circumstances (RUST_OPTIONAL=1) - RUST_M{AX,IN}_VER where required. - Suboptimal crate separator (`-` -> `@`) Signed-off-by: Matt Jolly <kangie@gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/39218 Signed-off-by: Matt Jolly <kangie@gentoo.org>
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/scx/scx-1.0.5-r2.ebuild (renamed from sys-kernel/scx/scx-1.0.5-r1.ebuild)6
-rw-r--r--sys-kernel/scx/scx-1.0.6-r1.ebuild (renamed from sys-kernel/scx/scx-1.0.6.ebuild)6
2 files changed, 8 insertions, 4 deletions
diff --git a/sys-kernel/scx/scx-1.0.5-r1.ebuild b/sys-kernel/scx/scx-1.0.5-r2.ebuild
index 6956284d3b74..b2528d6fa81e 100644
--- a/sys-kernel/scx/scx-1.0.5-r1.ebuild
+++ b/sys-kernel/scx/scx-1.0.5-r2.ebuild
@@ -294,7 +294,9 @@ CRATES="
zvariant_utils@2.1.0
"
-inherit linux-info cargo rust-toolchain llvm-r1 meson
+RUST_MIN_VER="1.74.1"
+
+inherit llvm-r1 cargo linux-info meson rust-toolchain
DESCRIPTION="sched_ext schedulers and tools"
HOMEPAGE="https://github.com/sched-ext/scx"
@@ -329,7 +331,6 @@ BDEPEND="
$(llvm_gen_dep '
sys-devel/clang:${LLVM_SLOT}=[llvm_targets_BPF(-)]
')
- >=virtual/rust-1.72
"
CONFIG_CHECK="
@@ -345,6 +346,7 @@ CONFIG_CHECK="
pkg_setup() {
linux-info_pkg_setup
llvm-r1_pkg_setup
+ rust_pkg_setup
}
src_prepare() {
diff --git a/sys-kernel/scx/scx-1.0.6.ebuild b/sys-kernel/scx/scx-1.0.6-r1.ebuild
index 9d15161ace1f..4b40f8f109f9 100644
--- a/sys-kernel/scx/scx-1.0.6.ebuild
+++ b/sys-kernel/scx/scx-1.0.6-r1.ebuild
@@ -298,7 +298,9 @@ CRATES="
zvariant_utils@2.1.0
"
-inherit linux-info cargo rust-toolchain llvm-r1 meson
+RUST_MIN_VER="1.74.1"
+
+inherit llvm-r1 linux-info cargo rust-toolchain meson
DESCRIPTION="sched_ext schedulers and tools"
HOMEPAGE="https://github.com/sched-ext/scx"
@@ -333,7 +335,6 @@ BDEPEND="
$(llvm_gen_dep '
sys-devel/clang:${LLVM_SLOT}=[llvm_targets_BPF(-)]
')
- >=virtual/rust-1.72
"
CONFIG_CHECK="
@@ -349,6 +350,7 @@ CONFIG_CHECK="
pkg_setup() {
linux-info_pkg_setup
llvm-r1_pkg_setup
+ rust_pkg_setup
}
src_prepare() {