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 8B3F81396D0 for ; Thu, 28 Sep 2017 13:19:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B3272BC012; Thu, 28 Sep 2017 13:19:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 DFCED2BC012 for ; Thu, 28 Sep 2017 13:19:17 +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 12DBF34170C for ; Thu, 28 Sep 2017 13:19:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1ADBD9096 for ; Thu, 28 Sep 2017 13:19:13 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1506604521.f852c290ad649e8a299e285dae1d51fb55ded064.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f852c290ad649e8a299e285dae1d51fb55ded064 X-VCS-Branch: master Date: Thu, 28 Sep 2017 13:19:13 +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: 411e75ea-c7ec-4ded-a014-656206b4c1fc X-Archives-Hash: 42b9a040dc1d18c2c4b3158b96459c98 commit: f852c290ad649e8a299e285dae1d51fb55ded064 Author: Michał Górny gentoo org> AuthorDate: Sun Sep 17 09:34:08 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Sep 28 13:15:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f852c290 media-libs/mesa: Fix LLVM dep to pull exactly one version Since LLVM is slotted, you can't expect multiple different dependencies to apply to the same slot. For this reason, we need to ensure that only one form of dependency (set of USE flags) is applied to LLVM. To cover all the necessary variants: - when using [opencl], enforce LLVM version and USE flags through implicit dependency via sys-devel/clang; - enforce [llvm_targets_AMDGPU] for all variants needing it, and the non-AMDGPU version only if neither of them applies. media-libs/mesa/mesa-9999.ebuild | 55 ++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 0a378a1ffeb..61bcd2822db 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -143,18 +143,53 @@ RDEPEND="${RDEPEND} RDEPEND="${RDEPEND} llvm? ( opencl? ( - >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP}] - ) - video_cards_r600? ( - >=sys-devel/llvm-3.9.0[llvm_targets_AMDGPU(-)] - ) - video_cards_radeon? ( - >=sys-devel/llvm-3.9.0[llvm_targets_AMDGPU(-)] + video_cards_r600? ( + >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] + ) + !video_cards_r600? ( + video_cards_radeonsi? ( + >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] + ) + ) + !video_cards_r600? ( + !video_cards_radeonsi? ( + video_cards_radeon? ( + >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP}] + ) + ) + ) ) - video_cards_radeonsi? ( - >=sys-devel/llvm-3.9.0[llvm_targets_AMDGPU(-)] + !opencl? ( + video_cards_r600? ( + >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] + ) + !video_cards_r600? ( + video_cards_radeonsi? ( + >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] + ) + ) + !video_cards_r600? ( + !video_cards_radeonsi? ( + video_cards_radeon? ( + >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] + ) + ) + ) ) - >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) "