commit:     210f53fc147a7a9cf90e79891e426766c0a659e9
Author:     Hendrik Klug <hendrik.klug <AT> gmail <DOT> com>
AuthorDate: Fri Sep 19 17:44:26 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 19 17:58:30 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=210f53fc

dev-lang/rust-bin: fix patchelf for prefix

Was already partly fixed in d9b69b495e07f21b8a49f38f87fed5babd3a9476

[sam: Add bug tag. I was going to revbump for this given rust-bin takes
no time at all to install and the failure mode is non-obvious here, but
we use the revision for the alt arches in SRC_URI... :/]

Bug: https://bugs.gentoo.org/955343
Signed-off-by: Hendrik Klug <hendrik.klug <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43851
Closes: https://github.com/gentoo/gentoo/pull/43851
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild | 4 ++--
 dev-lang/rust-bin/rust-bin-1.85.1.ebuild    | 4 ++--
 dev-lang/rust-bin/rust-bin-1.86.0-r1.ebuild | 4 ++--
 dev-lang/rust-bin/rust-bin-1.88.0.ebuild    | 4 ++--
 dev-lang/rust-bin/rust-bin-1.89.0.ebuild    | 4 ++--
 dev-lang/rust-bin/rust-bin-9999.ebuild      | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild 
b/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild
index eefb28154549..851b72b12015 100644
--- a/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild
@@ -204,8 +204,8 @@ rust_native_abi_install() {
 
        if use prefix; then
                local interpreter=$(patchelf --print-interpreter 
"${EPREFIX}"/bin/bash)
-               ebegin "Changing interpreter to ${interpreter} for Gentoo 
prefix at ${ED}/opt/${SLOT}/bin"
-               find "${ED}/opt/${SLOT}/bin" -type f -print0 | \
+               ebegin "Changing interpreter to ${interpreter} for Gentoo 
prefix at ${ED}/opt/rust-bin-${SLOT}/bin"
+               find "${ED}/opt/rust-bin-${SLOT}/bin" -type f -print0 | \
                        while IFS=  read -r -d '' filename; do
                                patchelf_for_bin ${filename} ${interpreter} \; 
|| die
                        done

diff --git a/dev-lang/rust-bin/rust-bin-1.85.1.ebuild 
b/dev-lang/rust-bin/rust-bin-1.85.1.ebuild
index 85b9dd682cbd..06f21e8aa5f2 100644
--- a/dev-lang/rust-bin/rust-bin-1.85.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.85.1.ebuild
@@ -204,8 +204,8 @@ rust_native_abi_install() {
 
        if use prefix; then
                local interpreter=$(patchelf --print-interpreter 
"${EPREFIX}"/bin/bash)
-               ebegin "Changing interpreter to ${interpreter} for Gentoo 
prefix at ${ED}/opt/${SLOT}/bin"
-               find "${ED}/opt/${SLOT}/bin" -type f -print0 | \
+               ebegin "Changing interpreter to ${interpreter} for Gentoo 
prefix at ${ED}/opt/rust-bin-${SLOT}/bin"
+               find "${ED}/opt/rust-bin-${SLOT}/bin" -type f -print0 | \
                        while IFS=  read -r -d '' filename; do
                                patchelf_for_bin ${filename} ${interpreter} \; 
|| die
                        done

diff --git a/dev-lang/rust-bin/rust-bin-1.86.0-r1.ebuild 
b/dev-lang/rust-bin/rust-bin-1.86.0-r1.ebuild
index 422a3a67727f..a210bc4536ee 100644
--- a/dev-lang/rust-bin/rust-bin-1.86.0-r1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.86.0-r1.ebuild
@@ -205,8 +205,8 @@ rust_native_abi_install() {
 
        if use prefix; then
                local interpreter=$(patchelf --print-interpreter 
"${EPREFIX}"/bin/bash)
-               ebegin "Changing interpreter to ${interpreter} for Gentoo 
prefix at ${ED}/opt/${SLOT}/bin"
-               find "${ED}/opt/${SLOT}/bin" -type f -print0 | \
+               ebegin "Changing interpreter to ${interpreter} for Gentoo 
prefix at ${ED}/opt/rust-bin-${SLOT}/bin"
+               find "${ED}/opt/rust-bin-${SLOT}/bin" -type f -print0 | \
                        while IFS=  read -r -d '' filename; do
                                patchelf_for_bin ${filename} ${interpreter} \; 
|| die
                        done

diff --git a/dev-lang/rust-bin/rust-bin-1.88.0.ebuild 
b/dev-lang/rust-bin/rust-bin-1.88.0.ebuild
index 85712c9835fc..bb5432955974 100644
--- a/dev-lang/rust-bin/rust-bin-1.88.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.88.0.ebuild
@@ -206,8 +206,8 @@ rust_native_abi_install() {
 
        if use prefix; then
                local interpreter=$(patchelf --print-interpreter 
"${EPREFIX}"/bin/bash)
-               ebegin "Changing interpreter to ${interpreter} for Gentoo 
prefix at ${ED}/opt/${SLOT}/bin"
-               find "${ED}/opt/${SLOT}/bin" -type f -print0 | \
+               ebegin "Changing interpreter to ${interpreter} for Gentoo 
prefix at ${ED}/opt/rust-bin-${SLOT}/bin"
+               find "${ED}/opt/rust-bin-${SLOT}/bin" -type f -print0 | \
                        while IFS=  read -r -d '' filename; do
                                patchelf_for_bin ${filename} ${interpreter} \; 
|| die
                        done

diff --git a/dev-lang/rust-bin/rust-bin-1.89.0.ebuild 
b/dev-lang/rust-bin/rust-bin-1.89.0.ebuild
index dc0db7eb749c..2cdda8de6b6e 100644
--- a/dev-lang/rust-bin/rust-bin-1.89.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.89.0.ebuild
@@ -206,8 +206,8 @@ rust_native_abi_install() {
 
        if use prefix; then
                local interpreter=$(patchelf --print-interpreter 
"${EPREFIX}"/bin/bash)
-               ebegin "Changing interpreter to ${interpreter} for Gentoo 
prefix at ${ED}/opt/${SLOT}/bin"
-               find "${ED}/opt/${SLOT}/bin" -type f -print0 | \
+               ebegin "Changing interpreter to ${interpreter} for Gentoo 
prefix at ${ED}/opt/rust-bin-${SLOT}/bin"
+               find "${ED}/opt/rust-bin-${SLOT}/bin" -type f -print0 | \
                        while IFS=  read -r -d '' filename; do
                                patchelf_for_bin ${filename} ${interpreter} \; 
|| die
                        done

diff --git a/dev-lang/rust-bin/rust-bin-9999.ebuild 
b/dev-lang/rust-bin/rust-bin-9999.ebuild
index 3a22a3109ef4..fed93d0b117a 100644
--- a/dev-lang/rust-bin/rust-bin-9999.ebuild
+++ b/dev-lang/rust-bin/rust-bin-9999.ebuild
@@ -202,8 +202,8 @@ rust_native_abi_install() {
 
        if use prefix; then
                local interpreter=$(patchelf --print-interpreter 
"${EPREFIX}"/bin/bash)
-               ebegin "Changing interpreter to ${interpreter} for Gentoo 
prefix at ${ED}/opt/${SLOT}/bin"
-               find "${ED}/opt/${SLOT}/bin" -type f -print0 | \
+               ebegin "Changing interpreter to ${interpreter} for Gentoo 
prefix at ${ED}/opt/rust-bin-${SLOT}/bin"
+               find "${ED}/opt/rust-bin-${SLOT}/bin" -type f -print0 | \
                        while IFS=  read -r -d '' filename; do
                                patchelf_for_bin ${filename} ${interpreter} \; 
|| die
                        done

Reply via email to