commit: 0f44c54e9f5a3fe6e438879861bcad381f5b1ecb
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Wed Dec 21 15:36:27 2022 +0000
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Wed Dec 21 20:25:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=0f44c54e
dev-lang/rust: Merge ::gentoo changes
Signed-off-by: orbea <orbea <AT> riseup.net>
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
dev-lang/rust/metadata.xml | 3 +--
dev-lang/rust/rust-1.65.0.ebuild | 13 +++----------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index f64700d..e28f627 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -16,9 +16,8 @@
<flag name="nightly">Enable nightly (UNSTABLE) features (NOTE:
it does not install nightly version, just enables features marked as nightly at
time of release)</flag>
<flag name="parallel-compiler">Build a multi-threaded rustc
(experimental, not tested by upstream)</flag>
<flag name="profiler">Build the profiler runtime and
rust-demangler tool (needed for '-C profile-generate' or '-C
instrument-coverage' codegen opts)</flag>
- <flag name="rls">Install rls, Rust Language Server (used with
IDEs supporting RLS protocol)</flag>
<flag name="rustfmt">Install rustfmt, Rust code formatter</flag>
- <flag name="rust-analyzer">Install rust-analyzer, A Rust
compiler front-end for IDEs (like rls)</flag>
+ <flag name="rust-analyzer">Install rust-analyzer, A Rust
compiler front-end for IDEs (language server)</flag>
<flag name="rust-src">Install rust-src, needed by developer
tools and for build-std (cross)</flag>
<flag name="system-bootstrap">Bootstrap using installed rust
compiler</flag>
<flag name="system-llvm">Use the system LLVM installation</flag>
diff --git a/dev-lang/rust/rust-1.65.0.ebuild b/dev-lang/rust/rust-1.65.0.ebuild
index b6d95fb..1bf38e3 100644
--- a/dev-lang/rust/rust-1.65.0.ebuild
+++ b/dev-lang/rust/rust-1.65.0.ebuild
@@ -19,7 +19,7 @@ else
SLOT="stable/${ABI_VER}"
MY_P="rustc-${PV}"
SRC="${MY_P}-src.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~mips ~ppc ppc64 ~riscv sparc x86"
fi
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
@@ -41,7 +41,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-IUSE="clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly
parallel-compiler profiler rls rustfmt rust-analyzer rust-src system-bootstrap
system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
+IUSE="clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly
parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap
system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
# Please keep the LLVM dependency block separate. Since LLVM is slotted,
# we need to *really* make sure we're not pulling more than one slot
@@ -126,7 +126,6 @@ RDEPEND="${DEPEND}
REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
miri? ( nightly )
parallel-compiler? ( nightly )
- rls? ( rust-src )
rust-analyzer? ( !wasm )
test? ( ${ALL_LLVM_TARGETS[*]} )
wasm? ( llvm_targets_WebAssembly )
@@ -209,7 +208,6 @@ pre_build_checks() {
fi
M=$(( $(usex clippy 128 0) + ${M} ))
M=$(( $(usex miri 128 0) + ${M} ))
- M=$(( $(usex rls 512 0) + ${M} ))
M=$(( $(usex rustfmt 256 0) + ${M} ))
# add 2G if we compile llvm and 256M per llvm_target
if ! use system-llvm; then
@@ -339,9 +337,8 @@ src_configure() {
use clippy && tools+=',"clippy"'
use miri && tools+=',"miri"'
use profiler && tools+=',"rust-demangler"'
- use rls && tools+=',"rls","analysis"'
use rustfmt && tools+=',"rustfmt"'
- use rust-analyzer && tools+=',"rust-analyzer"'
+ use rust-analyzer && tools+=',"rust-analyzer","analysis"'
use rust-src && tools+=',"src"'
local rust_stage0_root
@@ -666,7 +663,6 @@ src_install() {
use clippy && symlinks+=( clippy-driver cargo-clippy )
use miri && symlinks+=( miri cargo-miri )
use profiler && symlinks+=( rust-demangler )
- use rls && symlinks+=( rls )
use rustfmt && symlinks+=( rustfmt cargo-fmt )
use rust-analyzer && symlinks+=( rust-analyzer )
@@ -727,9 +723,6 @@ src_install() {
if use profiler; then
echo /usr/bin/rust-demangler >> "${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}"
