commit: 3ab7539f2f0bf97b90c22d860a91bcbe321f4a0e
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 13 15:36:25 2025 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 13 15:38:57 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab7539f
dev-lang/rust{,-bin}: update SLOT back to ${PV}
We have issues and breakage with the shorter SLOT. Currently Rust
project has no capacty to fix it. For more details see the frist bug.
Bug: https://bugs.gentoo.org/953747
Closes: https://bugs.gentoo.org/953103
Closes: https://bugs.gentoo.org/953127
Closes: https://bugs.gentoo.org/953130
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../rust-bin/{rust-bin-1.86.0.ebuild => rust-bin-1.86.0-r1.ebuild} | 2 +-
dev-lang/rust/{rust-1.86.0.ebuild => rust-1.86.0-r1.ebuild} | 5 ++---
eclass/rust.eclass | 4 ++--
profiles/base/package.use.force | 4 ++--
profiles/package.mask | 6 ------
5 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/dev-lang/rust-bin/rust-bin-1.86.0.ebuild
b/dev-lang/rust-bin/rust-bin-1.86.0-r1.ebuild
similarity index 99%
rename from dev-lang/rust-bin/rust-bin-1.86.0.ebuild
rename to dev-lang/rust-bin/rust-bin-1.86.0-r1.ebuild
index 9f30d1dcc234..d4f1a5db1a71 100644
--- a/dev-lang/rust-bin/rust-bin-1.86.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.86.0-r1.ebuild
@@ -57,7 +57,7 @@ if [[ ${PV} != *9999* && ${PV} != *beta* ]] ; then
fi
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
-SLOT="$(ver_cut 1-2)"
+SLOT="${PV%%_*}" # Beta releases get to share the same SLOT as the eventual
stable
IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src
rustfmt"
RDEPEND="
diff --git a/dev-lang/rust/rust-1.86.0.ebuild
b/dev-lang/rust/rust-1.86.0-r1.ebuild
similarity index 99%
rename from dev-lang/rust/rust-1.86.0.ebuild
rename to dev-lang/rust/rust-1.86.0-r1.ebuild
index 084e4f9e03f5..a5a82e00ca6a 100644
--- a/dev-lang/rust/rust-1.86.0.ebuild
+++ b/dev-lang/rust/rust-1.86.0-r1.ebuild
@@ -68,7 +68,7 @@ for _x in "${_ALL_RUST_EXPERIMENTAL_TARGETS[@]}"; do
done
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
-SLOT="$(ver_cut 1-2)"
+SLOT="${PV%%_*}" # Beta releases get to share the same SLOT as the eventual
stable
IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto
rustfmt rust-analyzer rust-src +system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
@@ -719,7 +719,7 @@ src_install() {
# we need realpath on /usr/bin/* symlink return
version-appended binary path.
# so /usr/bin/rustc should point to
/usr/lib/rust/<ver>/bin/rustc-<ver>
# need to fix eselect-rust to remove this hack.
- local ver_i="${i}-${SLOT}"
+ local ver_i="${i}-${PV%%_*}"
if [[ -f "${ED}/usr/lib/${PN}/${SLOT}/bin/${i}" ]]; then
einfo "Installing ${i} symlink"
ln -v "${ED}/usr/lib/${PN}/${SLOT}/bin/${i}"
"${ED}/usr/lib/${PN}/${SLOT}/bin/${ver_i}" || die
@@ -728,7 +728,6 @@ src_install() {
ewarn "please report this"
fi
dosym "../lib/${PN}/${SLOT}/bin/${ver_i}" "/usr/bin/${ver_i}"
- dosym "../lib/${PN}/${SLOT}/bin/${ver_i}"
"/usr/bin/${i}-${PV%%_*}"
done
# symlinks to switch components to active rust in eselect
diff --git a/eclass/rust.eclass b/eclass/rust.eclass
index ae590284db33..a9ccfed4cf8f 100644
--- a/eclass/rust.eclass
+++ b/eclass/rust.eclass
@@ -68,7 +68,7 @@ fi
# Definitive list of Rust slots and the associated LLVM slot, newest first.
declare -A -g -r _RUST_LLVM_MAP=(
["9999"]=20
- ["1.86"]=19
+ ["1.86.0"]=19
["1.85.1"]=19
["1.85.0"]=19
["1.84.1"]=19
@@ -94,7 +94,7 @@ declare -A -g -r _RUST_LLVM_MAP=(
# this array is used to store the Rust slots in a more convenient order for
iteration.
declare -a -g -r _RUST_SLOTS_ORDERED=(
"9999"
- "1.86"
+ "1.86.0"
"1.85.1"
"1.85.0"
"1.84.1"
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index e5f1d455a653..1b5b62934d84 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -35,8 +35,8 @@ llvm-runtimes/libcxxabi clang
# echo "dev-lang/rust:${slot} llvm_slot_${_RUST_LLVM_MAP[${slot}]}"
# echo "dev-lang/rust-bin:${slot} llvm_slot_${_RUST_LLVM_MAP[${slot}]}"
# done
-dev-lang/rust:1.86 llvm_slot_19
-dev-lang/rust-bin:1.86 llvm_slot_19
+dev-lang/rust:1.86.0 llvm_slot_19
+dev-lang/rust-bin:1.86.0 llvm_slot_19
dev-lang/rust:1.85.1 llvm_slot_19
dev-lang/rust-bin:1.85.1 llvm_slot_19
dev-lang/rust:1.85.0 llvm_slot_19
diff --git a/profiles/package.mask b/profiles/package.mask
index 46610944bf9c..5b7aa9296052 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -45,12 +45,6 @@
# Removal on 2025-05-09. Bug #909900.
app-text/nfoview
-# Arthur Zamarin <[email protected]> (2025-04-04)
-# Temporary mask until handled the usage of shorter SLOT.
-# Bugs #953127, #953103.
-dev-lang/rust:1.86
-dev-lang/rust-bin:1.86
-
# Matt Turner <[email protected]> (2025-04-04)
# Package is dead (last release in 1999).
# Not relevant today: purpose is to not overload a very slow system with
