commit: bc3fed5c7d82a99811fa4dd63db8e66aba5be5b0 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Fri Mar 15 07:40:44 2019 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Mar 16 20:01:07 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc3fed5c
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 <AT> Apache.Org> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/mesa/mesa-18.2.8.ebuild | 6 +++--- media-libs/mesa/mesa-18.3.4.ebuild | 6 +++--- media-libs/mesa/mesa-19.0.0.ebuild | 6 +++--- media-libs/mesa/mesa-9999.ebuild | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/media-libs/mesa/mesa-18.2.8.ebuild b/media-libs/mesa/mesa-18.2.8.ebuild index 40b1a582b20..47c304a5f59 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 7ebe214399b..9a07527ffd4 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 46739d80f08..45091f857b0 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 95a36146b15..9ddec789e92 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=" || (
