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 7561B138359 for ; Fri, 24 Jul 2020 01:02:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98515E0826; Fri, 24 Jul 2020 01:02:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7F3D2E0826 for ; Fri, 24 Jul 2020 01:02:34 +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 011B434F1DE for ; Fri, 24 Jul 2020 01:02:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DDFE52DB for ; Fri, 24 Jul 2020 01:02:26 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1595552540.6195c28a8365c89ad6de6808846d25a1bca0d856.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox/firefox-68.10.0.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 6195c28a8365c89ad6de6808846d25a1bca0d856 X-VCS-Branch: master Date: Fri, 24 Jul 2020 01:02:26 +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: 2c5a1005-03c6-4c7b-be25-3c05c959ca70 X-Archives-Hash: b4a7a99fabd55807bf643c6b6836e738 commit: 6195c28a8365c89ad6de6808846d25a1bca0d856 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Jul 24 01:01:55 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Jul 24 01:02:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6195c28a www-client/firefox: move fatal rust version check to pkg_setup In case no rust version is installed yet, the rust check in pkg_pretend will block any PM run which would pull in rust. Moving fatal check to pkg_setup will still prevent unnecessary compile time but avoid that block. Bug: https://bugs.gentoo.org/733692 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann gentoo.org> www-client/firefox/firefox-68.10.0.ebuild | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/www-client/firefox/firefox-68.10.0.ebuild b/www-client/firefox/firefox-68.10.0.ebuild index 9afc1bda507..15de19c9c31 100644 --- a/www-client/firefox/firefox-68.10.0.ebuild +++ b/www-client/firefox/firefox-68.10.0.ebuild @@ -232,10 +232,10 @@ pkg_pretend() { local rustc_version=( $(eselect --brief rust show 2>/dev/null) ) rustc_version=${rustc_version[0]/rust-bin-/} rustc_version=${rustc_version/rust-/} - [[ -z "${rustc_version}" ]] && die "Failed to determine rustc version!" - - if ver_test "${rustc_version}" -ge "1.45.0" ; then - die "Rust >=1.45.0 is not supported. Please use 'eselect rust' to switch to =1.45.0 is not supported. Please use 'eselect rust' to switch to /dev/null) ) + rustc_version=${rustc_version[0]/rust-bin-/} + rustc_version=${rustc_version/rust-/} + [[ -z "${rustc_version}" ]] && die "Failed to determine rustc version!" + + if ver_test "${rustc_version}" -ge "1.45.0" ; then + die "Rust >=1.45.0 is not supported. Please use 'eselect rust' to switch to