[gentoo-commits] repo/proj/wine:master commit in: app-emulation/vkd3d/

[Nick Sarnie]

commit:     6e1b7a52225214a96632859b31cbd56aec309e2f
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 01:38:08 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue May 29 01:38:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=6e1b7a52

app-emulation/vkd3d: Fix dependencies again

Thanks [Arfrever]

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/vkd3d/vkd3d-1.0.ebuild  | 15 +++++++--------
 app-emulation/vkd3d/vkd3d-9999.ebuild | 15 +++++++--------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app-emulation/vkd3d/vkd3d-1.0.ebuild 
b/app-emulation/vkd3d/vkd3d-1.0.ebuild
index e5f968f..db0b7d1 100644
--- a/app-emulation/vkd3d/vkd3d-1.0.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.0.ebuild
@@ -15,16 +15,15 @@ fi
 
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
-               dev-util/spirv-headers
-               || (
-                        ( 
<=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] )
-                        ( 
>media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}]
-                               dev-util/vulkan-headers
-                        )
-                  )
+               media-libs/vulkan-loader[${MULTILIB_USEDEP}]
                x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+               dev-util/spirv-headers
+               || (
+                       dev-util/vulkan-headers
+                       
<=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}]
+                  )"
 
 DESCRIPTION="D3D12 to Vulkan translation library"
 HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";

diff --git a/app-emulation/vkd3d/vkd3d-9999.ebuild 
b/app-emulation/vkd3d/vkd3d-9999.ebuild
index e5f968f..db0b7d1 100644
--- a/app-emulation/vkd3d/vkd3d-9999.ebuild
+++ b/app-emulation/vkd3d/vkd3d-9999.ebuild
@@ -15,16 +15,15 @@ fi
 
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
-               dev-util/spirv-headers
-               || (
-                        ( 
<=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] )
-                        ( 
>media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}]
-                               dev-util/vulkan-headers
-                        )
-                  )
+               media-libs/vulkan-loader[${MULTILIB_USEDEP}]
                x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+               dev-util/spirv-headers
+               || (
+                       dev-util/vulkan-headers
+                       
<=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}]
+                  )"
 
 DESCRIPTION="D3D12 to Vulkan translation library"
 HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";