commit:     e32fcad7249eb81367a58cc24ecbdc8aa5400537
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 18 03:25:16 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 18 03:25:16 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e32fcad7

dev-lang/rust: restore old behaviour for betas

In 1ed80ee338b1a315a8f31dca05b004d39cf2fb10, I changed from PV->RUST_PV
but in doing so, I changed the behaviour for betas. Restore that.

Fixes: 1ed80ee338b1a315a8f31dca05b004d39cf2fb10
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/rust/rust-1.92.0_p1-r1.ebuild | 2 +-
 dev-lang/rust/rust-9999.ebuild         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/rust/rust-1.92.0_p1-r1.ebuild 
b/dev-lang/rust/rust-1.92.0_p1-r1.ebuild
index 2c871a58fd3d..f5073db6688b 100644
--- a/dev-lang/rust/rust-1.92.0_p1-r1.ebuild
+++ b/dev-lang/rust/rust-1.92.0_p1-r1.ebuild
@@ -782,7 +782,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}-${RUST_PV}"
+               local ver_i="${i}-${RUST_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

diff --git a/dev-lang/rust/rust-9999.ebuild b/dev-lang/rust/rust-9999.ebuild
index 2c871a58fd3d..f5073db6688b 100644
--- a/dev-lang/rust/rust-9999.ebuild
+++ b/dev-lang/rust/rust-9999.ebuild
@@ -782,7 +782,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}-${RUST_PV}"
+               local ver_i="${i}-${RUST_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

Reply via email to