From 29909b8bd7c0e05b909fd75915d62f8eb89f0393 Mon Sep 17 00:00:00 2001 From: Nick Sarnie Date: Mon, 28 May 2018 21:48:59 -0400 Subject: [PATCH] app-emulation/vkd3d: Sync with ::wine Fix dependencies again 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 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/" -- 2.26.2