Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/
Date: Fri, 09 Oct 2020 09:34:32
Message-Id: 1602236041.02aec2211dbed3353527e8ddb7969b00240eea68.gyakovlev@gentoo
1 commit: 02aec2211dbed3353527e8ddb7969b00240eea68
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 9 09:33:48 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 9 09:34:01 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02aec221
7
8 dev-lang/rust: update boostrap_rust_version_check()
9
10 we don't need it for binpkgs
11
12 Package-Manager: Portage-3.0.8, Repoman-3.0.1
13 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
14
15 dev-lang/rust/rust-1.45.2.ebuild | 1 +
16 dev-lang/rust/rust-1.46.0.ebuild | 1 +
17 dev-lang/rust/rust-1.47.0.ebuild | 1 +
18 3 files changed, 3 insertions(+)
19
20 diff --git a/dev-lang/rust/rust-1.45.2.ebuild b/dev-lang/rust/rust-1.45.2.ebuild
21 index dbb1d9183f1..5c87a5c5a60 100644
22 --- a/dev-lang/rust/rust-1.45.2.ebuild
23 +++ b/dev-lang/rust/rust-1.45.2.ebuild
24 @@ -131,6 +131,7 @@ toml_usex() {
25
26 boostrap_rust_version_check() {
27 # never call from pkg_pretend. eselect-rust may be not installed yet.
28 + [[ ${MERGE_TYPE} == binary ]] && return
29 local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
30 local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
31 rustc_version=${rustc_version[0]#rust-bin-}
32
33 diff --git a/dev-lang/rust/rust-1.46.0.ebuild b/dev-lang/rust/rust-1.46.0.ebuild
34 index 1eeee9eb516..ceaa6d45c12 100644
35 --- a/dev-lang/rust/rust-1.46.0.ebuild
36 +++ b/dev-lang/rust/rust-1.46.0.ebuild
37 @@ -130,6 +130,7 @@ toml_usex() {
38
39 boostrap_rust_version_check() {
40 # never call from pkg_pretend. eselect-rust may be not installed yet.
41 + [[ ${MERGE_TYPE} == binary ]] && return
42 local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
43 local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
44 rustc_version=${rustc_version[0]#rust-bin-}
45
46 diff --git a/dev-lang/rust/rust-1.47.0.ebuild b/dev-lang/rust/rust-1.47.0.ebuild
47 index bc0dd9a95b4..a5041ff03fe 100644
48 --- a/dev-lang/rust/rust-1.47.0.ebuild
49 +++ b/dev-lang/rust/rust-1.47.0.ebuild
50 @@ -133,6 +133,7 @@ toml_usex() {
51
52 boostrap_rust_version_check() {
53 # never call from pkg_pretend. eselect-rust may be not installed yet.
54 + [[ ${MERGE_TYPE} == binary ]] && return
55 local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
56 local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
57 rustc_version=${rustc_version[0]#rust-bin-}