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

[Michał Górny]

commit:     8887e178a3f5bbd7a8959a4bbd6a0282cb698659
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 21:06:54 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 21:08:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8887e178

media-libs/mesa: Fix uncond call to llvm_pkg_setup, #608536

 media-libs/mesa/mesa-17.0.0.ebuild | 4 +++-
 media-libs/mesa/mesa-9999.ebuild   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-17.0.0.ebuild 
b/media-libs/mesa/mesa-17.0.0.ebuild
index b35f0bc5ef..d6d58afc0d 100644
--- a/media-libs/mesa/mesa-17.0.0.ebuild
+++ b/media-libs/mesa/mesa-17.0.0.ebuild
@@ -201,7 +201,9 @@ pkg_setup() {
                ewarn "detected! This can cause problems. For details, see bug 
459306."
        fi
 
-       LLVM_MAX_SLOT=4 llvm_pkg_setup
+       if use llvm || use opencl; then
+               LLVM_MAX_SLOT=4 llvm_pkg_setup
+       fi
        python-any-r1_pkg_setup
 }
 

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index fe87f66a7b..2f05b05d30 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -188,7 +188,9 @@ pkg_setup() {
                ewarn "detected! This can cause problems. For details, see bug 
459306."
        fi
 
-       llvm_pkg_setup
+       if use llvm || use opencl; then
+               llvm_pkg_setup
+       fi
        python-any-r1_pkg_setup
 }