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: Thu, 28 Sep 2017 13:19:17
Message-Id: 1506604515.0c906c66adb27ef11b507b96b66d3c11fe8e3116.mgorny@gentoo
1 commit: 0c906c66adb27ef11b507b96b66d3c11fe8e3116
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 17 09:07:25 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 28 13:15:15 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c906c66
7
8 media-libs/mesa: Deduplicate [opencl] deps
9
10 Since [opencl] requires [llvm], and additionally sys-devel/clang pulls
11 sys-devel/llvm in, there is really no reason for a separate [opencl]
12 block or a duplicate sys-devel/llvm dependency.
13
14 media-libs/mesa/mesa-9999.ebuild | 9 ++++-----
15 1 file changed, 4 insertions(+), 5 deletions(-)
16
17 diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
18 index 495b5a5e0b6..2a4e5faef0a 100644
19 --- a/media-libs/mesa/mesa-9999.ebuild
20 +++ b/media-libs/mesa/mesa-9999.ebuild
21 @@ -142,15 +142,14 @@ RDEPEND="${RDEPEND}
22 # simultaneously.
23 RDEPEND="${RDEPEND}
24 llvm? (
25 + opencl? (
26 + >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP}]
27 + )
28 video_cards_radeonsi? (
29 >=sys-devel/llvm-3.9.0[llvm_targets_AMDGPU(-)]
30 )
31 >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}]
32 )
33 - opencl? (
34 - >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}]
35 - >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP}]
36 - )
37 "
38
39 DEPEND="${RDEPEND}
40 @@ -198,7 +197,7 @@ pkg_setup() {
41 ewarn "detected! This can cause problems. For details, see bug 459306."
42 fi
43
44 - if use llvm || use opencl; then
45 + if use llvm; then
46 llvm_pkg_setup
47 fi
48 python-any-r1_pkg_setup