From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8FF0315827B for ; Thu, 28 Aug 2025 15:35:16 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 780DC340D24 for ; Thu, 28 Aug 2025 15:35:16 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 5096C110560; Thu, 28 Aug 2025 15:35:15 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 42332110560 for ; Thu, 28 Aug 2025 15:35:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2A2E340D02 for ; Thu, 28 Aug 2025 15:35:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8890534FB for ; Thu, 28 Aug 2025 15:35:13 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1756395301.31931d763c9f50d60e2b771d6c94f6be8c85fad2.arthurzam@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.88.0.ebuild dev-lang/rust-bin/rust-bin-1.89.0.ebuild dev-lang/rust-bin/rust-bin-9999.ebuild X-VCS-Directories: dev-lang/rust-bin/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 31931d763c9f50d60e2b771d6c94f6be8c85fad2 X-VCS-Branch: master Date: Thu, 28 Aug 2025 15:35:13 +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: 9a8cdf57-17d4-464d-aab0-294380a98b7d X-Archives-Hash: ba3d883e1b403bc2e2efffec8090f098 commit: 31931d763c9f50d60e2b771d6c94f6be8c85fad2 Author: Arthur Zamarin gentoo org> AuthorDate: Thu Aug 28 15:34:38 2025 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Thu Aug 28 15:35:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31931d76 dev-lang/rust-bin: fix ignore rust-analysis bin on arches blocking rust-analyzer Closes: https://bugs.gentoo.org/961746 Signed-off-by: Arthur Zamarin gentoo.org> dev-lang/rust-bin/rust-bin-1.88.0.ebuild | 6 ++++-- dev-lang/rust-bin/rust-bin-1.89.0.ebuild | 6 ++++-- dev-lang/rust-bin/rust-bin-9999.ebuild | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dev-lang/rust-bin/rust-bin-1.88.0.ebuild b/dev-lang/rust-bin/rust-bin-1.88.0.ebuild index 047f7b9fcd66..10e3620bcfd8 100644 --- a/dev-lang/rust-bin/rust-bin-1.88.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.88.0.ebuild @@ -169,13 +169,15 @@ patchelf_for_bin() { rust_native_abi_install() { pushd "${S}" >/dev/null || die - local analysis="$(grep 'analysis' ./components || die "analysis not found in components")" local std="$(grep 'std' ./components || die "std not found in components")" local components=( "rustc" "cargo" "${std}" ) use doc && components+=( "rust-docs" ) use clippy && components+=( "clippy-preview" ) use rustfmt && components+=( "rustfmt-preview" ) - use rust-analyzer && components+=( "rust-analyzer-preview" "${analysis}" ) + if use rust-analyzer; then + local analysis="$(grep 'analysis' ./components || die "analysis not found in components")" + components+=( "rust-analyzer-preview" "${analysis}" ) + fi # Rust component 'rust-src' is extracted from separate archive if use rust-src; then einfo "Combining rust and rust-src installers" diff --git a/dev-lang/rust-bin/rust-bin-1.89.0.ebuild b/dev-lang/rust-bin/rust-bin-1.89.0.ebuild index cd80f2761b1b..1a557be53866 100644 --- a/dev-lang/rust-bin/rust-bin-1.89.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.89.0.ebuild @@ -169,13 +169,15 @@ patchelf_for_bin() { rust_native_abi_install() { pushd "${S}" >/dev/null || die - local analysis="$(grep 'analysis' ./components || die "analysis not found in components")" local std="$(grep 'std' ./components || die "std not found in components")" local components=( "rustc" "cargo" "${std}" ) use doc && components+=( "rust-docs" ) use clippy && components+=( "clippy-preview" ) use rustfmt && components+=( "rustfmt-preview" ) - use rust-analyzer && components+=( "rust-analyzer-preview" "${analysis}" ) + if use rust-analyzer; then + local analysis="$(grep 'analysis' ./components || die "analysis not found in components")" + components+=( "rust-analyzer-preview" "${analysis}" ) + fi # Rust component 'rust-src' is extracted from separate archive if use rust-src; then einfo "Combining rust and rust-src installers" diff --git a/dev-lang/rust-bin/rust-bin-9999.ebuild b/dev-lang/rust-bin/rust-bin-9999.ebuild index ef8fe8615c5c..3a22a3109ef4 100644 --- a/dev-lang/rust-bin/rust-bin-9999.ebuild +++ b/dev-lang/rust-bin/rust-bin-9999.ebuild @@ -165,13 +165,15 @@ patchelf_for_bin() { rust_native_abi_install() { pushd "${S}" >/dev/null || die - local analysis="$(grep 'analysis' ./components || die "analysis not found in components")" local std="$(grep 'std' ./components || die "std not found in components")" local components=( "rustc" "cargo" "${std}" ) use doc && components+=( "rust-docs" ) use clippy && components+=( "clippy-preview" ) use rustfmt && components+=( "rustfmt-preview" ) - use rust-analyzer && components+=( "rust-analyzer-preview" "${analysis}" ) + if use rust-analyzer; then + local analysis="$(grep 'analysis' ./components || die "analysis not found in components")" + components+=( "rust-analyzer-preview" "${analysis}" ) + fi # Rust component 'rust-src' is extracted from separate archive if use rust-src; then einfo "Combining rust and rust-src installers"