From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 07733138335 for ; Tue, 19 Feb 2019 01:24:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00E22E0884; Tue, 19 Feb 2019 01:24:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADDF8E0884 for ; Tue, 19 Feb 2019 01:24:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 30AF9335D03 for ; Tue, 19 Feb 2019 01:24:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44573501 for ; Tue, 19 Feb 2019 01:24:01 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1550539403.67fb3694a54ab1c8a19fdf16d5b0421aa982e0e0.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust/rust-1.30.1-r1.ebuild dev-lang/rust/rust-1.31.1.ebuild dev-lang/rust/rust-1.32.0.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 67fb3694a54ab1c8a19fdf16d5b0421aa982e0e0 X-VCS-Branch: master Date: Tue, 19 Feb 2019 01:24:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6e2f5cc3-a2e6-4f3b-8cac-8055c64bf94e X-Archives-Hash: 2663786183c9e30dd427776953ab8b2e commit: 67fb3694a54ab1c8a19fdf16d5b0421aa982e0e0 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Feb 19 00:33:51 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Feb 19 01:23:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67fb3694 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 gentoo.org> dev-lang/rust/rust-1.30.1-r1.ebuild | 6 ++++-- dev-lang/rust/rust-1.31.1.ebuild | 6 ++++-- dev-lang/rust/rust-1.32.0.ebuild | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dev-lang/rust/rust-1.30.1-r1.ebuild b/dev-lang/rust/rust-1.30.1-r1.ebuild index f0ff75335fa..7aee61f2377 100644 --- 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 22ed3b4a4c0..debbd8a7a98 100644 --- 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 bc2a6106b8a..18425b87101 100644 --- 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