Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/vkd3d/
Date: Tue, 29 May 2018 01:49:30
Message-Id: 1527558539.29909b8bd7c0e05b909fd75915d62f8eb89f0393.sarnex@gentoo
1 commit: 29909b8bd7c0e05b909fd75915d62f8eb89f0393
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 29 01:48:59 2018 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Tue May 29 01:48:59 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29909b8b
7
8 app-emulation/vkd3d: Sync with ::wine
9
10 Fix dependencies again
11
12 Package-Manager: Portage-2.3.40, Repoman-2.3.9
13
14 app-emulation/vkd3d/vkd3d-1.0.ebuild | 15 +++++++--------
15 app-emulation/vkd3d/vkd3d-9999.ebuild | 15 +++++++--------
16 2 files changed, 14 insertions(+), 16 deletions(-)
17
18 diff --git a/app-emulation/vkd3d/vkd3d-1.0.ebuild b/app-emulation/vkd3d/vkd3d-1.0.ebuild
19 index e5f968f0a63..db0b7d1d64f 100644
20 --- a/app-emulation/vkd3d/vkd3d-1.0.ebuild
21 +++ b/app-emulation/vkd3d/vkd3d-1.0.ebuild
22 @@ -15,16 +15,15 @@ fi
23
24 IUSE="spirv-tools"
25 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
26 - dev-util/spirv-headers
27 - || (
28 - ( <=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] )
29 - ( >media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}]
30 - dev-util/vulkan-headers
31 - )
32 - )
33 + media-libs/vulkan-loader[${MULTILIB_USEDEP}]
34 x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]"
35
36 -DEPEND="${RDEPEND}"
37 +DEPEND="${RDEPEND}
38 + dev-util/spirv-headers
39 + || (
40 + dev-util/vulkan-headers
41 + <=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}]
42 + )"
43
44 DESCRIPTION="D3D12 to Vulkan translation library"
45 HOMEPAGE="https://source.winehq.org/git/vkd3d.git/"
46
47 diff --git a/app-emulation/vkd3d/vkd3d-9999.ebuild b/app-emulation/vkd3d/vkd3d-9999.ebuild
48 index e5f968f0a63..db0b7d1d64f 100644
49 --- a/app-emulation/vkd3d/vkd3d-9999.ebuild
50 +++ b/app-emulation/vkd3d/vkd3d-9999.ebuild
51 @@ -15,16 +15,15 @@ fi
52
53 IUSE="spirv-tools"
54 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
55 - dev-util/spirv-headers
56 - || (
57 - ( <=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] )
58 - ( >media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}]
59 - dev-util/vulkan-headers
60 - )
61 - )
62 + media-libs/vulkan-loader[${MULTILIB_USEDEP}]
63 x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]"
64
65 -DEPEND="${RDEPEND}"
66 +DEPEND="${RDEPEND}
67 + dev-util/spirv-headers
68 + || (
69 + dev-util/vulkan-headers
70 + <=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}]
71 + )"
72
73 DESCRIPTION="D3D12 to Vulkan translation library"
74 HOMEPAGE="https://source.winehq.org/git/vkd3d.git/"