media-libs/mesa: Only call llvm_pkg_setup with USE="gallium llvm"

Closes: https://bugs.gentoo.org/712896
Signed-off-by: Matt Turner <mattst88@gentoo.org>

diff --git a/media-libs/mesa/mesa-19.3.5.ebuild b/media-libs/mesa/mesa-19.3.5.ebuild
index ea716c993c10bd641656060f1cb44c8d83aa4991..e0d7de8eec77ceb94030de5fbdf0a8756b60afe7 100644 (file)
--- a/media-libs/mesa/mesa-19.3.5.ebuild
+++ b/media-libs/mesa/mesa-19.3.5.ebuild
@@ -325,7 +325,7 @@ pkg_setup() {
                ewarn "detected! This can cause problems. For details, see bug 459306."
        fi
 
-       if use llvm; then
+       if use gallium && use llvm; then
                llvm_pkg_setup
        fi
        python-any-r1_pkg_setup

diff --git a/media-libs/mesa/mesa-20.0.1-r1.ebuild b/media-libs/mesa/mesa-20.0.1-r1.ebuild
index 8997f8d06a3718bde57a42d01cc5a929364477d5..e893b342e58867c8b57043a4b3fedb1a188b8247 100644 (file)
--- a/media-libs/mesa/mesa-20.0.1-r1.ebuild
+++ b/media-libs/mesa/mesa-20.0.1-r1.ebuild
@@ -326,7 +326,7 @@ pkg_setup() {
                ewarn "detected! This can cause problems. For details, see bug 459306."
        fi
 
-       if use llvm; then
+       if use gallium && use llvm; then
                llvm_pkg_setup
        fi
        python-any-r1_pkg_setup

diff --git a/media-libs/mesa/mesa-20.0.2.ebuild b/media-libs/mesa/mesa-20.0.2.ebuild
index 8997f8d06a3718bde57a42d01cc5a929364477d5..e893b342e58867c8b57043a4b3fedb1a188b8247 100644 (file)
--- a/media-libs/mesa/mesa-20.0.2.ebuild
+++ b/media-libs/mesa/mesa-20.0.2.ebuild
@@ -326,7 +326,7 @@ pkg_setup() {
                ewarn "detected! This can cause problems. For details, see bug 459306."
        fi
 
-       if use llvm; then
+       if use gallium && use llvm; then
                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 d6216736074204e2fc5743b05c98f89d0040f796..24b3afdd1fcbdb414bc8a4b7688a099688eb2b50 100644 (file)
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -327,7 +327,7 @@ pkg_setup() {
                ewarn "detected! This can cause problems. For details, see bug 459306."
        fi
 
-       if use llvm; then
+       if use gallium && use llvm; then
                llvm_pkg_setup
        fi
        python-any-r1_pkg_setup