From 746d8396d374a301936e089752bf575641f2bf8e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 8 Oct 2018 16:22:21 +0100 Subject: dev-lang/rust : drop eapi7-ver, fix slot --- dev-lang/rust/rust-1.29.1-r1337.ebuild | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dev-lang/rust/rust-1.29.1-r1337.ebuild b/dev-lang/rust/rust-1.29.1-r1337.ebuild index dea119ab..be9e849e 100644 --- a/dev-lang/rust/rust-1.29.1-r1337.ebuild +++ b/dev-lang/rust/rust-1.29.1-r1337.ebuild @@ -5,7 +5,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{5,6} pypy ) -inherit eapi7-ver multiprocessing multilib-build python-any-r1 toolchain-funcs +inherit multiprocessing multilib-build python-any-r1 toolchain-funcs if [[ ${PV} = *beta* ]]; then betaver=${PV//*beta} @@ -14,8 +14,7 @@ if [[ ${PV} = *beta* ]]; then SLOT="beta/${PV}" SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz" else - ABI_VER="$(ver_cut 1-2)" - SLOT="stable/${ABI_VER}" + SLOT="stable/1.29" MY_P="rustc-${PV}" SRC="${MY_P}-src.tar.xz" KEYWORDS="amd64 ~arm64 x86" @@ -25,12 +24,12 @@ CHOST_amd64=x86_64-unknown-linux-gnu CHOST_x86=i686-unknown-linux-gnu CHOST_arm64=aarch64-unknown-linux-gnu -RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" +RUST_STAGE0_VERSION="1.28.0" RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}" RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}" RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}" -CARGO_DEPEND_VERSION="0.$(($(ver_cut 2) + 1)).0" +CARGO_DEPEND_VERSION="0.30.0" DESCRIPTION="Systems programming language from Mozilla" HOMEPAGE="https://www.rust-lang.org/" -- cgit v1.2.3