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

[Jory Pratt]

commit:     bb7cc1b82a643e2cf2b847b949f0a18f46a9d67e
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  4 03:02:24 2020 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Apr  4 03:02:24 2020 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=bb7cc1b8

media-libs/mesa: Version bump 20.0.4

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 media-libs/mesa/Manifest                                   | 2 +-
 media-libs/mesa/{mesa-20.0.3.ebuild => mesa-20.0.4.ebuild} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 07da109..a0d5e87 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,2 +1,2 @@
 DIST mesa-19.3.5.tar.xz 12064980 BLAKE2B 
a20ebfb149624f13951795e07154ab70dc1856a7a1261b339b0bdf0009511111756c88439e7b8729f768b0b4b298301b9a3c0c10d7f2fab3abd91649c12ba51c
 SHA512 
413929573fab31e1bb2a1a04c0c770161c2db464a5aab3f0567d27603fff889ede70e1f6e197e7ff1c1639dc4cc543457bcf45761f0f8e6dffafccfa773a4e3f
-DIST mesa-20.0.3.tar.xz 12290804 BLAKE2B 
e416c010e5d126c84c09bb371e852f51098fc8f191e01f9f8baff0728f8d3fa3671ef97e4c8a334a0b94dba871efa27d9f45e9f458524c88bff4d96d62bbadf0
 SHA512 
e27d147bb85908cac4eb4b0f0505a7c539051805f54e6e50105c9e5c07d3b3b3c8524959b31eb97f8e8f6e5859f46cd257a25275e0671279f12ecd89ee13f7bf
+DIST mesa-20.0.4.tar.xz 12292888 BLAKE2B 
a14b747045ee4ff3bc07e527ad43d5b22047d6c9700cf290ba9c95e07bd88b9252bdd14380d4f0033dcb8fb652664987889d972db09462bcc69c8a7e843b606f
 SHA512 
17d8bc3b56779a8e5648d81da9ee97b66bcec015710801edce4e8055fbb314cd9ebc1d112e3035480ba844c7d9ae6b5b1f1eac0cc0817e69e9253a7748451a55

diff --git a/media-libs/mesa/mesa-20.0.3.ebuild 
b/media-libs/mesa/mesa-20.0.4.ebuild
similarity index 99%
rename from media-libs/mesa/mesa-20.0.3.ebuild
rename to media-libs/mesa/mesa-20.0.4.ebuild
index 7eca79f..2861ed0 100644
--- a/media-libs/mesa/mesa-20.0.3.ebuild
+++ b/media-libs/mesa/mesa-20.0.4.ebuild
@@ -153,7 +153,7 @@ LLVM_DEPSTR="
                sys-devel/llvm:9[${MULTILIB_USEDEP}]
                sys-devel/llvm:8[${MULTILIB_USEDEP}]
        )
-       sys-devel/llvm:=[${MULTILIB_USEDEP}]
+       <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
 "
 LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
@@ -330,7 +330,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