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.

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 4a8ab358f93a71725c79c91d383046ad465a5645..d9a7ac09fccf9a9b2076f182e57a6879de6d4f11 100644 (file)
--- 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}