From 6195c28a8365c89ad6de6808846d25a1bca0d856 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Fri, 24 Jul 2020 03:01:55 +0200 Subject: 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 --- www-client/firefox/firefox-68.10.0.ebuild | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'www-client') diff --git a/www-client/firefox/firefox-68.10.0.ebuild b/www-client/firefox/firefox-68.10.0.ebuild index 9afc1bda5078..15de19c9c31c 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