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 7E8B1138206 for ; Tue, 16 Jan 2018 22:50:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9462E08C4; Tue, 16 Jan 2018 22:50:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 93BC5E08C4 for ; Tue, 16 Jan 2018 22:50:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 48F5E335C4E for ; Tue, 16 Jan 2018 22:50:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA401151 for ; Tue, 16 Jan 2018 22:50:44 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1516143039.2cf547b0488752f4de600b0e9a82a70aa5584bf6.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/include-what-you-use/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/include-what-you-use/include-what-you-use-4.0-r1.ebuild dev-util/include-what-you-use/include-what-you-use-4.0-r2.ebuild X-VCS-Directories: dev-util/include-what-you-use/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 2cf547b0488752f4de600b0e9a82a70aa5584bf6 X-VCS-Branch: master Date: Tue, 16 Jan 2018 22:50:44 +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-Archives-Salt: 6a62ecdc-5c1b-494e-a2f3-87bb320ff404 X-Archives-Hash: 14f2d6b9b5943e528a4244e4633d47cd commit: 2cf547b0488752f4de600b0e9a82a70aa5584bf6 Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Jan 16 22:35:34 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Jan 16 22:50:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cf547b0 dev-util/include-what-you-use: set LLVM_MAX_SLOT=4 to use correct directory Noticed by Michał Górny Package-Manager: Portage-2.3.19, Repoman-2.3.6 ...ou-use-4.0-r1.ebuild => include-what-you-use-4.0-r2.ebuild} | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-util/include-what-you-use/include-what-you-use-4.0-r1.ebuild b/dev-util/include-what-you-use/include-what-you-use-4.0-r2.ebuild similarity index 85% rename from dev-util/include-what-you-use/include-what-you-use-4.0-r1.ebuild rename to dev-util/include-what-you-use/include-what-you-use-4.0-r2.ebuild index 5b23f35f1cb..f278652a524 100644 --- a/dev-util/include-what-you-use/include-what-you-use-4.0-r1.ebuild +++ b/dev-util/include-what-you-use/include-what-you-use-4.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,8 +15,10 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND="sys-devel/llvm:4 - sys-devel/clang:4 +LLVM_MAX_SLOT=4 + +RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT} + sys-devel/clang:${LLVM_MAX_SLOT} ${PYTHON_DEPS} " DEPEND="${RDEPEND}" @@ -46,7 +48,7 @@ src_configure() { # 'clang' binary itself. See bug #625972 # Thus as a hack we install it to the same directory # as llvm/clang itself. - -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)" + -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" ) cmake-utils_src_configure }