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 6C4F4138359 for ; Mon, 24 Aug 2020 23:02:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEC43E087C; Mon, 24 Aug 2020 23:02:05 +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 612D4E087C for ; Mon, 24 Aug 2020 23:02:05 +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 71025340D77 for ; Mon, 24 Aug 2020 23:02:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F0328331 for ; Mon, 24 Aug 2020 23:02:02 +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: <1598310035.4a6b4bc49d24bc5f7e27dc249557d42cf0873cdb.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/metadata.xml 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: 4a6b4bc49d24bc5f7e27dc249557d42cf0873cdb X-VCS-Branch: master Date: Mon, 24 Aug 2020 23:02:02 +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: 2e662c6a-b7da-4b40-a52d-0a26e4b067a2 X-Archives-Hash: 0f42c5b0f85502e3ba0884687c865802 commit: 4a6b4bc49d24bc5f7e27dc249557d42cf0873cdb Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Aug 24 22:52:36 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Aug 24 23:00:35 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a6b4bc4 dev-lang/rust-bin: add rls useflag to 1.45.2 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust-bin/metadata.xml | 1 + dev-lang/rust-bin/rust-bin-1.45.2.ebuild | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dev-lang/rust-bin/metadata.xml b/dev-lang/rust-bin/metadata.xml index 01ce1ade6f0..7cdd68d01d1 100644 --- a/dev-lang/rust-bin/metadata.xml +++ b/dev-lang/rust-bin/metadata.xml @@ -7,6 +7,7 @@ Install clippy, Rust code linter + Install rls, Rust Language Server (used with IDEs supporting RLS protocol) Install rustfmt, Rust code formatter 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 b36387480c9..3e4fa110440 100644 --- a/dev-lang/rust-bin/rust-bin-1.45.2.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.45.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})" LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" SLOT="stable" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="clippy cpu_flags_x86_sse2 doc rustfmt" +IUSE="clippy cpu_flags_x86_sse2 doc rls rustfmt" DEPEND="" RDEPEND=">=app-eselect/eselect-rust-20190311" @@ -50,7 +50,8 @@ multilib_src_install() { local components="rustc,cargo,${std}" use doc && components="${components},rust-docs" use clippy && components="${components},clippy-preview" - use rustfmt && components="${components},rustfmt-preview" + use rls && components="${components},rls-preview" + use rustfmt && components="${components},rustfmt-preview,rust-analysis" ./install.sh \ --components="${components}" \ --disable-verify \ @@ -98,6 +99,13 @@ multilib_src_install() { dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}" dosym "../../opt/${P}/bin/${cargo_clippy}" "/usr/bin/${cargo_clippy}" fi + if use rls; then + local rls=rls-bin-${PV} + mv "${ED}/opt/${P}/bin/rls" "${ED}/opt/${P}/bin/${rls}" || die + + dosym "${rls}" "/opt/${P}/bin/rls" + dosym "../../opt/${P}/bin/${rls}" "/usr/bin/${rls}" + fi if use rustfmt; then local rustfmt=rustfmt-bin-${PV} local cargo_fmt=cargo-fmt-bin-${PV} @@ -127,6 +135,9 @@ multilib_src_install() { echo /usr/bin/clippy-driver >> "${T}/provider-${P}" echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" fi + if use rls; then + echo /usr/bin/rls >> "${T}/provider-${P}" + fi if use rustfmt; then echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"