media-libs/mesa: Update the dependencies for LLVM_TARGETS=AMDGPU

diff --git a/media-libs/mesa/mesa-11.2.2.ebuild b/media-libs/mesa/mesa-11.2.2.ebuild
index a5caca7c93647aacd2615f93a66ebc0d7953e6eb..d84d50ec8a7ba518a6ac636dfcf08a52731de369 100644 (file)
--- a/media-libs/mesa/mesa-11.2.2.ebuild
+++ b/media-libs/mesa/mesa-11.2.2.ebuild
@@ -130,7 +130,10 @@ RDEPEND="${RDEPEND}
 
 DEPEND="${RDEPEND}
        llvm? (
-               video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+               video_cards_radeonsi? ( || (
+                       sys-devel/llvm[llvm_targets_AMDGPU]
+                       sys-devel/llvm[video_cards_radeon]
+               ) )
        )
        opencl? (
                                >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]

diff --git a/media-libs/mesa/mesa-12.0.1.ebuild b/media-libs/mesa/mesa-12.0.1.ebuild
index 877042a3794b4c6bd5a90c6030852fe46154cfcd..9cda1d765f6101b1501d9b5f861a9204e95aa7f3 100644 (file)
--- a/media-libs/mesa/mesa-12.0.1.ebuild
+++ b/media-libs/mesa/mesa-12.0.1.ebuild
@@ -133,7 +133,10 @@ RDEPEND="${RDEPEND}
 
 DEPEND="${RDEPEND}
        llvm? (
-               video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+               video_cards_radeonsi? ( || (
+                       sys-devel/llvm[llvm_targets_AMDGPU]
+                       sys-devel/llvm[video_cards_radeon]
+               ) )
        )
        opencl? (
                                >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]

diff --git a/media-libs/mesa/mesa-12.0.2.ebuild b/media-libs/mesa/mesa-12.0.2.ebuild
index fd6b44d3b2d734a7243adea3df4d5a9abe65aabc..4c75c596b1d834ae3a1b67bf8d1a130bca9f9ad2 100644 (file)
--- a/media-libs/mesa/mesa-12.0.2.ebuild
+++ b/media-libs/mesa/mesa-12.0.2.ebuild
@@ -133,7 +133,10 @@ RDEPEND="${RDEPEND}
 
 DEPEND="${RDEPEND}
        llvm? (
-               video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+               video_cards_radeonsi? ( || (
+                       sys-devel/llvm[llvm_targets_AMDGPU]
+                       sys-devel/llvm[video_cards_radeon]
+               ) )
        )
        opencl? (
                                >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]

diff --git a/media-libs/mesa/mesa-12.0.3.ebuild b/media-libs/mesa/mesa-12.0.3.ebuild
index fd6b44d3b2d734a7243adea3df4d5a9abe65aabc..0ea1fe2d1db090f883802fa204fd58ad7edd504b 100644 (file)
--- a/media-libs/mesa/mesa-12.0.3.ebuild
+++ b/media-libs/mesa/mesa-12.0.3.ebuild
@@ -131,9 +131,14 @@ RDEPEND="${RDEPEND}
        video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
 "
 
+# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
+# LLVM < 3.9 is out of the game
 DEPEND="${RDEPEND}
        llvm? (
-               video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+               video_cards_radeonsi? ( || (
+                       sys-devel/llvm[llvm_targets_AMDGPU]
+                       sys-devel/llvm[video_cards_radeon]
+               ) )
        )
        opencl? (
                                >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3d273ed85a3046e0860bfce74fd8e39621d89e67..7088075cb351554df93695798614310f595c9a91 100644 (file)
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -131,9 +131,14 @@ RDEPEND="${RDEPEND}
        video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
 "
 
+# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
+# LLVM < 3.9 is out of the game
 DEPEND="${RDEPEND}
        llvm? (
-               video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+               video_cards_radeonsi? ( || (
+                       sys-devel/llvm[llvm_targets_AMDGPU]
+                       sys-devel/llvm[video_cards_radeon]
+               ) )
        )
        opencl? (
                                >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]