commit: 3c5d0b8b9c4a593d6766e10c98b05975119a7028
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 08:47:18 2024 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 09:00:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c5d0b8b
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 <AT> gentoo.org>
eclass/rust.eclass | 4 ++--
1 file 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
