diff options
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/rust-bin/rust-bin-1.86.0-r1.ebuild (renamed from dev-lang/rust-bin/rust-bin-1.86.0.ebuild) | 2 | ||||
| -rw-r--r-- | dev-lang/rust/rust-1.86.0-r1.ebuild (renamed from dev-lang/rust/rust-1.86.0.ebuild) | 5 |
2 files changed, 3 insertions, 4 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 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 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 |
