gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-06 02:17:34 -08:00
Code Issues Projects Releases Wiki Activity

dev-lang/rust{,-bin}: update SLOT back to ${PV}

Browse Source 
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@gentoo.org>
This commit is contained in:
Arthur Zamarin 2025-04-13 18:36:25 +03:00
parent 28b4efc4cc
commit 3ab7539f2f
No known key found for this signature in database
GPG Key ID: 02A0AF503D120504
5 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-lang/rust-bin/rust-bin-1.86.0.ebuild → dev-lang/rust-bin/rust-bin-1.86.0-r1.ebuild
View File

@ -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="

5
dev-lang/rust/rust-1.86.0.ebuild → dev-lang/rust/rust-1.86.0-r1.ebuild
View File

@ -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

4
eclass/rust.eclass
View File

@ -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"

4
profiles/base/package.use.force
View File

@ -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

6
profiles/package.mask
View File

@ -45,12 +45,6 @@
# Removal on 2025-05-09. Bug #909900.
app-text/nfoview
# Arthur Zamarin <arthurzam@gentoo.org> (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 <mattst88@gentoo.org> (2025-04-04)
# Package is dead (last release in 1999).
# Not relevant today: purpose is to not overload a very slow system with