media-libs/mesa: Use correct slotted LLVM deps

Introduce a proper complete slotted dependency block for LLVM. While
it's not strictly necessary whenever the Mesa version supports
the newest LLVM version, keeping it unconditionally will help developers
wrap up Mesa releases correctly.

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 6cc00b907127f463517d88cc28e00da05df32788..cd6ff53c78ac3b4be29b1339fe0d8c7e7470a78b 100644 (file)
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -140,7 +140,20 @@ RDEPEND="${RDEPEND}
 # Please keep the LLVM dependency block separate. Since LLVM is slotted,
 # we need to *really* make sure we're not pulling one than more slot
 # simultaneously.
-LLVM_DEPSTR=">=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}]"
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_DEPSTR="
+       || (
+               sys-devel/llvm:6[${MULTILIB_USEDEP}]
+               sys-devel/llvm:5[${MULTILIB_USEDEP}]
+               sys-devel/llvm:4[${MULTILIB_USEDEP}]
+               >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+       )
+       sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
 LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
 CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}