dev-lang/rust: doesn't support >=sys-devel/llvm-8

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/dev-lang/rust/rust-1.30.1-r1.ebuild b/dev-lang/rust/rust-1.30.1-r1.ebuild
index f0ff75335fabe3a72201a021220bbda591b99e12..7aee61f2377630c8bbc38c707a9fbe92b452fbff 100644 (file)
--- a/dev-lang/rust/rust-1.30.1-r1.ebuild
+++ b/dev-lang/rust/rust-1.30.1-r1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
 
+LLVM_MAX_SLOT=7
+
 inherit check-reqs eapi7-ver estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
 if [[ ${PV} = *beta* ]]; then
@@ -182,7 +184,7 @@ src_configure() {
                EOF
                if use system-llvm; then
                        cat <<- EOF >> "${S}"/config.toml
-                           llvm-config = "$(get_llvm_prefix)/bin/llvm-config"
+                               llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
                        EOF
                fi
        done

diff --git a/dev-lang/rust/rust-1.31.1.ebuild b/dev-lang/rust/rust-1.31.1.ebuild
index 22ed3b4a4c0c48861f63319aa05d17cb0eb28d10..debbd8a7a98c3b220e49caf5cfb04b771d66d5b2 100644 (file)
--- a/dev-lang/rust/rust-1.31.1.ebuild
+++ b/dev-lang/rust/rust-1.31.1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
 
+LLVM_MAX_SLOT=7
+
 inherit check-reqs eapi7-ver estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
 if [[ ${PV} = *beta* ]]; then
@@ -182,7 +184,7 @@ src_configure() {
                EOF
                if use system-llvm; then
                        cat <<- EOF >> "${S}"/config.toml
-                           llvm-config = "$(get_llvm_prefix)/bin/llvm-config"
+                               llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
                        EOF
                fi
        done

diff --git a/dev-lang/rust/rust-1.32.0.ebuild b/dev-lang/rust/rust-1.32.0.ebuild
index bc2a6106b8ade78ca032dddc7bc42222b13d7840..18425b87101f56df6924c8539e696eeb32f6d2a9 100644 (file)
--- a/dev-lang/rust/rust-1.32.0.ebuild
+++ b/dev-lang/rust/rust-1.32.0.ebuild
@@ -5,6 +5,8 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
 
+LLVM_MAX_SLOT=7
+
 inherit check-reqs eapi7-ver estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
 if [[ ${PV} = *beta* ]]; then
@@ -45,7 +47,7 @@ COMMON_DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
                net-libs/libssh2
                net-libs/http-parser:=
                net-misc/curl[ssl]
-               system-llvm? ( >=sys-devel/llvm-7:= )"
+               system-llvm? ( sys-devel/llvm:7= )"
 DEPEND="${COMMON_DEPEND}
        ${PYTHON_DEPS}
        || (
@@ -184,7 +186,7 @@ src_configure() {
                EOF
                if use system-llvm; then
                        cat <<- EOF >> "${S}"/config.toml
-                           llvm-config = "$(get_llvm_prefix)/bin/llvm-config"
+                               llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
                        EOF
                fi
        done