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

["Georgy Yakovlev" <gyakovlev@gentoo.org>]

commit:     6d2920b58c3171f0cc114b553ae70722e94f88dc
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 20:32:59 2023 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 21:10:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d2920b5

dev-lang/rust: revbump 1.69.0, adjust component list.

analysis is gone.
rustdoc no longer being pulled by 'rustc' component.

https://releases.rs/docs/1.69.0/#compatibility-notes

Closes: https://bugs.gentoo.org/904730
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Thanks-to: Tee KOBAYASHI <xtkoba <AT> gmail.com>

 dev-lang/rust/{rust-1.69.0.ebuild => rust-1.69.0-r1.ebuild} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-lang/rust/rust-1.69.0.ebuild b/dev-lang/rust/rust-1.69.0-r1.ebuild
similarity index 99%
rename from dev-lang/rust/rust-1.69.0.ebuild
rename to dev-lang/rust/rust-1.69.0-r1.ebuild
index ee784a354649..1dd71ce737db 100644
--- a/dev-lang/rust/rust-1.69.0.ebuild
+++ b/dev-lang/rust/rust-1.69.0-r1.ebuild
@@ -312,12 +312,13 @@ src_configure() {
 	fi
 	rust_targets="${rust_targets#,}"
 
-	local tools='"cargo"'
+	# cargo and rustdoc are mandatory and should always be included
+	local tools='"cargo","rustdoc"'
 	use clippy && tools+=',"clippy"'
 	use miri && tools+=',"miri"'
 	use profiler && tools+=',"rust-demangler"'
 	use rustfmt && tools+=',"rustfmt"'
-	use rust-analyzer && tools+=',"rust-analyzer","analysis"'
+	use rust-analyzer && tools+=',"rust-analyzer"'
 	use rust-src && tools+=',"src"'
 
 	local rust_stage0_root