summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Jolly <kangie@gentoo.org>2024-11-09 18:47:18 +1000
committerMatt Jolly <kangie@gentoo.org>2024-11-09 19:00:39 +1000
commit3c5d0b8b9c4a593d6766e10c98b05975119a7028 (patch)
tree6b32e3f3a57fc83487f121dbbde97a974a4e8713 /eclass/rust.eclass
parentdev-python/types-psutil: Stabilize 6.1.0.20241102 ALLARCHES, #943108 (diff)
downloadgentoo-3c5d0b8b9c4a593d6766e10c98b05975119a7028.tar.gz
gentoo-3c5d0b8b9c4a593d6766e10c98b05975119a7028.tar.bz2
gentoo-3c5d0b8b9c4a593d6766e10c98b05975119a7028.zip
rust.eclass: dependency strings: dev-lang/rust-bin first
To better match the behaviour of the legacy virtual/rust package, update generated dependency strings so that dev-lang/rust-bin is output before dev-lang/rust. In the longer term it is expected that this will be reverted to the original order (prefer dev-lang/rust) as users that particularly care about this also have the option of selecting an appropriate binpkg. When selecting an installed Rust to use the non-bin package is still preferred over the -bin if both are installed. Signed-off-by: Matt Jolly <kangie@gentoo.org>
Diffstat (limited to 'eclass/rust.eclass')
-rw-r--r--eclass/rust.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/rust.eclass b/eclass/rust.eclass
index e91048a6f193..08f935a821a8 100644
--- a/eclass/rust.eclass
+++ b/eclass/rust.eclass
@@ -196,8 +196,8 @@ _rust_set_globals() {
for slot in "${_RUST_SLOTS[@]}"; do
usedep="${RUST_USEDEP+[${RUST_USEDEP}]}"
rust_dep+=(
- "dev-lang/rust:${slot}${usedep}"
"dev-lang/rust-bin:${slot}${usedep}"
+ "dev-lang/rust:${slot}${usedep}"
)
done
rust_dep+=( ")" )
@@ -215,8 +215,8 @@ _rust_set_globals() {
for rust_slot in "${_RUST_SLOTS[@]}"; do
if [[ "${_RUST_LLVM_MAP[${rust_slot}]}" == "${llvm_slot}" ]]; then
slot_dep_content+=(
- "dev-lang/rust:${rust_slot}${usedep}"
"dev-lang/rust-bin:${rust_slot}${usedep}"
+ "dev-lang/rust:${rust_slot}${usedep}"
)
fi
done