From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C5EED138359 for ; Tue, 25 Aug 2020 08:15:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8267E0837; Tue, 25 Aug 2020 08:15:17 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB7BDE0837 for ; Tue, 25 Aug 2020 08:15:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A4C7340BBD for ; Tue, 25 Aug 2020 08:15:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 49C4926 for ; Tue, 25 Aug 2020 08:15:14 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1598343283.485461e3cfdd2f7a7cfcd74e2eb81b731a5c04f9.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust-bin/rust-bin-1.44.1.ebuild dev-lang/rust-bin/rust-bin-1.45.2.ebuild X-VCS-Directories: dev-lang/rust-bin/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 485461e3cfdd2f7a7cfcd74e2eb81b731a5c04f9 X-VCS-Branch: master Date: Tue, 25 Aug 2020 08:15:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0c9be773-4256-472d-99b6-4056e247f0d1 X-Archives-Hash: 15c8fc986df142d71131429f32a50b67 commit: 485461e3cfdd2f7a7cfcd74e2eb81b731a5c04f9 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Aug 25 08:14:43 2020 +0000 Commit: Georgy Yakovlev gentoo 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 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 \