From: Nick Sarnie <sarnex@gentoo.org>
Date: Tue, 29 May 2018 01:48:59 +0000 (-0400)
Subject: app-emulation/vkd3d: Sync with ::wine
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=29909b8bd7c0e05b909fd75915d62f8eb89f0393;p=gentoo.git

app-emulation/vkd3d: Sync with ::wine

Fix dependencies again

Package-Manager: Portage-2.3.40, Repoman-2.3.9
---

diff --git a/app-emulation/vkd3d/vkd3d-1.0.ebuild b/app-emulation/vkd3d/vkd3d-1.0.ebuild
index e5f968f0a63f..db0b7d1d64f1 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 e5f968f0a63f..db0b7d1d64f1 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/"