Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/
Date: Wed, 27 Dec 2017 19:37:44
Message-Id: 1514403445.53123145d790b74aad2a4a8bb3cbfb7c64c1040f.mgorny@gentoo
1 commit: 53123145d790b74aad2a4a8bb3cbfb7c64c1040f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 27 19:34:29 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 27 19:37:25 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53123145
7
8 media-libs/mesa: Bind LLVM deps to <4 (= slot 0) in 17.1.10
9
10 Closes: https://bugs.gentoo.org/640650
11 Closes: https://bugs.gentoo.org/641908
12
13 media-libs/mesa/mesa-17.1.10.ebuild | 14 +++++++-------
14 1 file changed, 7 insertions(+), 7 deletions(-)
15
16 diff --git a/media-libs/mesa/mesa-17.1.10.ebuild b/media-libs/mesa/mesa-17.1.10.ebuild
17 index 935abcb79a1..1f6c5085909 100644
18 --- a/media-libs/mesa/mesa-17.1.10.ebuild
19 +++ b/media-libs/mesa/mesa-17.1.10.ebuild
20 @@ -98,7 +98,7 @@ RDEPEND="
21 llvm? (
22 video_cards_radeonsi? (
23 virtual/libelf:0=[${MULTILIB_USEDEP}]
24 - vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
25 + vulkan? ( >=sys-devel/llvm-3.9.0:0=[${MULTILIB_USEDEP}] )
26 )
27 video_cards_r600? (
28 virtual/libelf:0=[${MULTILIB_USEDEP}]
29 @@ -106,7 +106,7 @@ RDEPEND="
30 video_cards_radeon? (
31 virtual/libelf:0=[${MULTILIB_USEDEP}]
32 )
33 - >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
34 + >=sys-devel/llvm-3.6.0:0=[${MULTILIB_USEDEP}]
35 )
36 opencl? (
37 app-eselect/eselect-opencl
38 @@ -144,13 +144,13 @@ DEPEND="${RDEPEND}
39 ${PYTHON_DEPS}
40 llvm? (
41 video_cards_radeonsi? ( || (
42 - sys-devel/llvm[llvm_targets_AMDGPU]
43 - sys-devel/llvm[video_cards_radeon]
44 + sys-devel/llvm:0[llvm_targets_AMDGPU]
45 + sys-devel/llvm:0[video_cards_radeon]
46 ) )
47 )
48 opencl? (
49 - >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
50 - >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
51 + >=sys-devel/llvm-3.6.0:0=[${MULTILIB_USEDEP}]
52 + >=sys-devel/clang-3.6.0:0=[${MULTILIB_USEDEP}]
53 >=sys-devel/gcc-4.6
54 )
55 sys-devel/gettext
56 @@ -188,7 +188,7 @@ x86? (
57
58 pkg_setup() {
59 # warning message for bug 459306
60 - if use llvm && has_version sys-devel/llvm[!debug=]; then
61 + if use llvm && has_version "sys-devel/llvm:0[!debug=]"; then
62 ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
63 ewarn "detected! This can cause problems. For details, see bug 459306."
64 fi