Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/
Date: Wed, 03 Oct 2018 18:58:28
Message-Id: 1538592763.ea54709409140f84831fcaea8758e82c9f69d857.leio@gentoo
1 commit: ea54709409140f84831fcaea8758e82c9f69d857
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 3 18:03:18 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 3 18:52:43 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea547094
7
8 dev-lang/rust: migrate from versionator to eapi7-ver
9
10 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
11 Package-Manager: Portage-2.3.49, Repoman-2.3.11
12
13 dev-lang/rust/rust-1.29.1.ebuild | 8 ++++----
14 1 file changed, 4 insertions(+), 4 deletions(-)
15
16 diff --git a/dev-lang/rust/rust-1.29.1.ebuild b/dev-lang/rust/rust-1.29.1.ebuild
17 index f7c35f7cda7..ba34f9440f3 100644
18 --- a/dev-lang/rust/rust-1.29.1.ebuild
19 +++ b/dev-lang/rust/rust-1.29.1.ebuild
20 @@ -5,7 +5,7 @@ EAPI=6
21
22 PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
23
24 -inherit multiprocessing multilib-build python-any-r1 toolchain-funcs versionator
25 +inherit eapi7-ver multiprocessing multilib-build python-any-r1 toolchain-funcs
26
27 if [[ ${PV} = *beta* ]]; then
28 betaver=${PV//*beta}
29 @@ -14,7 +14,7 @@ if [[ ${PV} = *beta* ]]; then
30 SLOT="beta/${PV}"
31 SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
32 else
33 - ABI_VER="$(get_version_component_range 1-2)"
34 + ABI_VER="$(ver_cut 1-2)"
35 SLOT="stable/${ABI_VER}"
36 MY_P="rustc-${PV}"
37 SRC="${MY_P}-src.tar.xz"
38 @@ -25,12 +25,12 @@ CHOST_amd64=x86_64-unknown-linux-gnu
39 CHOST_x86=i686-unknown-linux-gnu
40 CHOST_arm64=aarch64-unknown-linux-gnu
41
42 -RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
43 +RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
44 RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
45 RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
46 RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
47
48 -CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
49 +CARGO_DEPEND_VERSION="0.$(($(ver_cut 2) + 1)).0"
50
51 DESCRIPTION="Systems programming language from Mozilla"
52 HOMEPAGE="https://www.rust-lang.org/"