From 285426ee4a05c7a3c2a5159bdb73f76c3f6fbec1 Mon Sep 17 00:00:00 2001 From: Michał Górny <mgorny@gentoo.org> Date: Sun, 17 Sep 2017 10:51:39 +0200 Subject: media-libs/mesa: Split LLVM RDEP into sep block Split the LLVM RDEPEND into a separate block for improved readability when I start hacking on it. --- media-libs/mesa/mesa-9999.ebuild | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'media-libs') diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 4a8ab358f93a..d9a7ac09fccf 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -97,7 +97,6 @@ RDEPEND=" llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] - vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) ) video_cards_r600? ( virtual/libelf:0=[${MULTILIB_USEDEP}] @@ -105,7 +104,6 @@ RDEPEND=" video_cards_radeon? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) - >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] ) opencl? ( app-eselect/eselect-opencl @@ -139,6 +137,18 @@ RDEPEND="${RDEPEND} video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) " +# 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. +RDEPEND="${RDEPEND} + llvm? ( + video_cards_radeonsi? ( + vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) + ) + >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] + ) +" + # FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once # LLVM < 3.9 is out of the game DEPEND="${RDEPEND} -- cgit v1.2.3-65-gdbad