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

[Georgy Yakovlev]

commit:     02aec2211dbed3353527e8ddb7969b00240eea68
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  9 09:33:48 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Oct  9 09:34:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02aec221

dev-lang/rust: update boostrap_rust_version_check()

we don't need it for binpkgs

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-lang/rust/rust-1.45.2.ebuild | 1 +
 dev-lang/rust/rust-1.46.0.ebuild | 1 +
 dev-lang/rust/rust-1.47.0.ebuild | 1 +
 3 files changed, 3 insertions(+)

diff --git a/dev-lang/rust/rust-1.45.2.ebuild b/dev-lang/rust/rust-1.45.2.ebuild
index dbb1d9183f1..5c87a5c5a60 100644
--- a/dev-lang/rust/rust-1.45.2.ebuild
+++ b/dev-lang/rust/rust-1.45.2.ebuild
@@ -131,6 +131,7 @@ toml_usex() {
 
 boostrap_rust_version_check() {
        # never call from pkg_pretend. eselect-rust may be not installed yet.
+       [[ ${MERGE_TYPE} == binary ]] && return
        local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
        local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
        rustc_version=${rustc_version[0]#rust-bin-}

diff --git a/dev-lang/rust/rust-1.46.0.ebuild b/dev-lang/rust/rust-1.46.0.ebuild
index 1eeee9eb516..ceaa6d45c12 100644
--- a/dev-lang/rust/rust-1.46.0.ebuild
+++ b/dev-lang/rust/rust-1.46.0.ebuild
@@ -130,6 +130,7 @@ toml_usex() {
 
 boostrap_rust_version_check() {
        # never call from pkg_pretend. eselect-rust may be not installed yet.
+       [[ ${MERGE_TYPE} == binary ]] && return
        local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
        local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
        rustc_version=${rustc_version[0]#rust-bin-}

diff --git a/dev-lang/rust/rust-1.47.0.ebuild b/dev-lang/rust/rust-1.47.0.ebuild
index bc0dd9a95b4..a5041ff03fe 100644
--- a/dev-lang/rust/rust-1.47.0.ebuild
+++ b/dev-lang/rust/rust-1.47.0.ebuild
@@ -133,6 +133,7 @@ toml_usex() {
 
 boostrap_rust_version_check() {
        # never call from pkg_pretend. eselect-rust may be not installed yet.
+       [[ ${MERGE_TYPE} == binary ]] && return
        local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
        local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
        rustc_version=${rustc_version[0]#rust-bin-}