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

[Michał Górny]

commit:     0c906c66adb27ef11b507b96b66d3c11fe8e3116
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 17 09:07:25 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 13:15:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c906c66

media-libs/mesa: Deduplicate [opencl] deps

Since [opencl] requires [llvm], and additionally sys-devel/clang pulls
sys-devel/llvm in, there is really no reason for a separate [opencl]
block or a duplicate sys-devel/llvm dependency.

 media-libs/mesa/mesa-9999.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 495b5a5e0b6..2a4e5faef0a 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -142,15 +142,14 @@ RDEPEND="${RDEPEND}
 # simultaneously.
 RDEPEND="${RDEPEND}
        llvm? (
+               opencl? (
+                       >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP}]
+               )
                video_cards_radeonsi? (
                        >=sys-devel/llvm-3.9.0[llvm_targets_AMDGPU(-)]
                )
                >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}]
        )
-       opencl? (
-               >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}]
-               >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP}]
-       )
 "
 
 DEPEND="${RDEPEND}
@@ -198,7 +197,7 @@ pkg_setup() {
                ewarn "detected! This can cause problems. For details, see bug 
459306."
        fi
 
-       if use llvm || use opencl; then
+       if use llvm; then
                llvm_pkg_setup
        fi
        python-any-r1_pkg_setup