[gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-bin/

[Georgy Yakovlev]

commit:     485461e3cfdd2f7a7cfcd74e2eb81b731a5c04f9
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 08:14:43 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 08:14:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=485461e3

dev-lang/rust-bin: fix rustfmt/rls/analysis error

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-lang/rust-bin/rust-bin-1.44.1.ebuild | 7 ++++---
 dev-lang/rust-bin/rust-bin-1.45.2.ebuild | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev-lang/rust-bin/rust-bin-1.44.1.ebuild 
b/dev-lang/rust-bin/rust-bin-1.44.1.ebuild
index 7165b90fd15..83070baf70e 100644
--- a/dev-lang/rust-bin/rust-bin-1.44.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.44.1.ebuild
@@ -45,13 +45,14 @@ multilib_src_install() {
 
        # start native abi install
        pushd "${S}" >/dev/null || die
-       local std
+       local analysis std
+       analysis="$(grep 'analysis' ./components)"
        std="$(grep 'std' ./components)"
        local components="rustc,cargo,${std}"
        use doc && components="${components},rust-docs"
        use clippy && components="${components},clippy-preview"
-       use rls && components="${components},rls-preview"
-       use rustfmt && components="${components},rustfmt-preview,rust-analysis"
+       use rls && components="${components},rls-preview,${analysis}"
+       use rustfmt && components="${components},rustfmt-preview"
        ./install.sh \
                --components="${components}" \
                --disable-verify \

diff --git a/dev-lang/rust-bin/rust-bin-1.45.2.ebuild 
b/dev-lang/rust-bin/rust-bin-1.45.2.ebuild
index 3e4fa110440..6e586df2fca 100644
--- a/dev-lang/rust-bin/rust-bin-1.45.2.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.45.2.ebuild
@@ -45,13 +45,14 @@ multilib_src_install() {
 
        # start native abi install
        pushd "${S}" >/dev/null || die
-       local std
+       local analysis std
+       analysis="$(grep 'analysis' ./components)"
        std="$(grep 'std' ./components)"
        local components="rustc,cargo,${std}"
        use doc && components="${components},rust-docs"
        use clippy && components="${components},clippy-preview"
-       use rls && components="${components},rls-preview"
-       use rustfmt && components="${components},rustfmt-preview,rust-analysis"
+       use rls && components="${components},rls-preview,${analysis}"
+       use rustfmt && components="${components},rustfmt-preview"
        ./install.sh \
                --components="${components}" \
                --disable-verify \