[gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/

["Michał Górny" <mgorny@gentoo.org>]

commit:     f852c290ad649e8a299e285dae1d51fb55ded064
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 17 09:34:08 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> 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}]
 	)
 "