commit:     25baf2a66c5e0b0b08094573aa74031a103bea08
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 22:53:06 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 20 22:55:01 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25baf2a6

dev-lang/rust: don't try to delete new JSON target file

etc/target-spec-json-schema.json now gets installed by Rust but gets
caught by the sanity check we have for cleaning up bash-completion (which
gets handled by dev-lang/rust-common). It's now expected to have something
left in etc/, so cleanup the rmdir accordingly to just kill the bash-completion
dir.

Note that this JSON file doesn't seem appropriate for rust-common because:
1) it's generated (so would require us to build something to install it);
2) per the commit introducing it:
> Because the schema is subject to change, you should always use the schema
> from the version of rustc which you are passing the target to.
>
> The existence and name of this schema is, just like the properties of the
> JSON specification, not stable and subject to change.

Closes: https://bugs.gentoo.org/964416
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/rust/rust-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/rust/rust-9999.ebuild b/dev-lang/rust/rust-9999.ebuild
index 2785c6a986c3..d493dffdab8c 100644
--- a/dev-lang/rust/rust-9999.ebuild
+++ b/dev-lang/rust/rust-9999.ebuild
@@ -735,7 +735,7 @@ src_install() {
        # bash-completion files are installed by dev-lang/rust-common instead
        # bug #689562, #689160.
        rm -v "${ED}/usr/lib/${PN}/${SLOT}/etc/bash_completion.d/cargo" || die
-       rmdir -v "${ED}/usr/lib/${PN}/${SLOT}"/etc{/bash_completion.d,} || die
+       rmdir -v "${ED}/usr/lib/${PN}/${SLOT}/etc/bash_completion.d" || die
 
        local symlinks=(
                cargo

Reply via email to