From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Fri, 15 Mar 2019 07:40:44 +0000 (+0100)
Subject: media-libs/mesa: Specify upper bound for dependency on sys-devel/llvm.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bc3fed5c7d82a99811fa4dd63db8e66aba5be5b0;p=gentoo.git

media-libs/mesa: Specify upper bound for dependency on sys-devel/llvm.

Update examples in comments.

Fixes: https://bugs.gentoo.org/680424
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---

diff --git a/media-libs/mesa/mesa-18.2.8.ebuild b/media-libs/mesa/mesa-18.2.8.ebuild
index 40b1a582b209..47c304a5f595 100644
--- a/media-libs/mesa/mesa-18.2.8.ebuild
+++ b/media-libs/mesa/mesa-18.2.8.ebuild
@@ -132,8 +132,8 @@ RDEPEND="${RDEPEND}
 #
 # 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.
+# 2. Update the := to specify *max* version, e.g. < 8.
+# 3. Specify LLVM_MAX_SLOT, e.g. 7.
 LLVM_MAX_SLOT="7"
 LLVM_DEPSTR="
 	|| (
@@ -143,7 +143,7 @@ LLVM_DEPSTR="
 		sys-devel/llvm:4[${MULTILIB_USEDEP}]
 		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
 	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	<sys-devel/llvm-8:=[${MULTILIB_USEDEP}]
 "
 LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
diff --git a/media-libs/mesa/mesa-18.3.4.ebuild b/media-libs/mesa/mesa-18.3.4.ebuild
index 7ebe214399b7..9a07527ffd4d 100644
--- a/media-libs/mesa/mesa-18.3.4.ebuild
+++ b/media-libs/mesa/mesa-18.3.4.ebuild
@@ -132,8 +132,8 @@ RDEPEND="${RDEPEND}
 #
 # 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.
+# 2. Update the := to specify *max* version, e.g. < 8.
+# 3. Specify LLVM_MAX_SLOT, e.g. 7.
 LLVM_MAX_SLOT="7"
 LLVM_DEPSTR="
 	|| (
@@ -143,7 +143,7 @@ LLVM_DEPSTR="
 		sys-devel/llvm:4[${MULTILIB_USEDEP}]
 		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
 	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	<sys-devel/llvm-8:=[${MULTILIB_USEDEP}]
 "
 LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
diff --git a/media-libs/mesa/mesa-19.0.0.ebuild b/media-libs/mesa/mesa-19.0.0.ebuild
index 46739d80f088..45091f857b03 100644
--- a/media-libs/mesa/mesa-19.0.0.ebuild
+++ b/media-libs/mesa/mesa-19.0.0.ebuild
@@ -138,15 +138,15 @@ RDEPEND="${RDEPEND}
 #
 # 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.
+# 2. Update the := to specify *max* version, e.g. < 9.
+# 3. Specify LLVM_MAX_SLOT, e.g. 8.
 LLVM_MAX_SLOT="8"
 LLVM_DEPSTR="
 	|| (
 		sys-devel/llvm:8[${MULTILIB_USEDEP}]
 		sys-devel/llvm:7[${MULTILIB_USEDEP}]
 	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	<sys-devel/llvm-9:=[${MULTILIB_USEDEP}]
 "
 LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 95a36146b15b..9ddec789e927 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -140,8 +140,8 @@ RDEPEND="${RDEPEND}
 #
 # 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.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
 LLVM_MAX_SLOT="9"
 LLVM_DEPSTR="
 	|| (