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: Tue, 28 Feb 2017 23:15:55
Message-Id: 1488323749.20c86fa7732866052ceeb76f8aa0845849ff3c6a.mgorny@gentoo
1 commit: 20c86fa7732866052ceeb76f8aa0845849ff3c6a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 28 23:12:33 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 28 23:15:49 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20c86fa7
7
8 media-libs/mesa: Fix slotted LLVM deps to include MULTILIB_USEDEP
9
10 Include MULTILIB_USEDEP in all variants of LLVM deps, since it was
11 mistakenly omitted for slot :4 (and additional := binder). No revbump
12 since lack of the flags caused build failure, it is quite unlikely for
13 people to disable them afterwards and it applied only to p.masked
14 llvm:4.
15
16 media-libs/mesa/mesa-17.0.0.ebuild | 10 +++++-----
17 1 file changed, 5 insertions(+), 5 deletions(-)
18
19 diff --git a/media-libs/mesa/mesa-17.0.0.ebuild b/media-libs/mesa/mesa-17.0.0.ebuild
20 index ceeb3555a29..c3c5a2c4faa 100644
21 --- a/media-libs/mesa/mesa-17.0.0.ebuild
22 +++ b/media-libs/mesa/mesa-17.0.0.ebuild
23 @@ -99,14 +99,14 @@ RDEPEND="
24 virtual/libelf:0=[${MULTILIB_USEDEP}]
25 vulkan? (
26 || (
27 - sys-devel/llvm:4
28 + sys-devel/llvm:4[${MULTILIB_USEDEP}]
29 >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] ) )
30 )
31 || (
32 - sys-devel/llvm:4
33 + sys-devel/llvm:4[${MULTILIB_USEDEP}]
34 >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}]
35 )
36 - <sys-devel/llvm-5:=
37 + <sys-devel/llvm-5:=[${MULTILIB_USEDEP}]
38 )
39 opencl? (
40 app-eselect/eselect-opencl
41 @@ -149,11 +149,11 @@ DEPEND="${RDEPEND}
42 )
43 opencl? (
44 || (
45 - sys-devel/llvm:4
46 + sys-devel/llvm:4[${MULTILIB_USEDEP}]
47 >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}]
48 )
49 || (
50 - sys-devel/clang:4
51 + sys-devel/clang:4[${MULTILIB_USEDEP}]
52 >=sys-devel/clang-3.6.0:0[${MULTILIB_USEDEP}]
53 )
54 >=sys-devel/gcc-4.6