From 04357fa4aea58354dae85f27bc5cee0580964602 Mon Sep 17 00:00:00 2001 From: tastytea Date: Sat, 22 Feb 2020 15:05:24 +0100 Subject: [PATCH] app-emulation/dxvk: Fix dependency on wine >= 4.5. --- app-emulation/dxvk/Manifest | 4 ++-- app-emulation/dxvk/dxvk-1.5.3.ebuild | 13 ++++++------- app-emulation/dxvk/dxvk-1.5.4.ebuild | 13 ++++++------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest index 8d038cc..3662940 100644 --- a/app-emulation/dxvk/Manifest +++ b/app-emulation/dxvk/Manifest @@ -1,6 +1,6 @@ DIST dxvk-1.5.3.tar.gz 885490 BLAKE2B dcdb7d763fab65b5d038ef440d2b934086abaf53f2f4991c9c68cce16ba3452ff8b64b127b030396925f4b3db18a0aad5392b5bc3c14608e96ef29fbb409a3bd SHA512 41ac7f31b2c4925c30be2849b5fbca1df696b6df63978030cd9bca1c02fbdeec4523cbfe654fdb88b07df5ec42fd64294c87f07578cf7393bc5ed21b126f5bde DIST dxvk-1.5.4.tar.gz 885827 BLAKE2B c42bcd3720593159336acc9999791e6c9772bc3ef6dd97353ccd249dea6c23ef8830c80d4552a75b5d9d93b19c62cf61f9a4601a552c30454621bc60c07f2727 SHA512 3c870e906228d400c476c44e98d4f2a00fa2acbd660f23e6ae05ba323839452755c7650127630b381c73dddbb7900bf338165a1fd5da45cddb8072d2f2e20598 -EBUILD dxvk-1.5.3.ebuild 2327 BLAKE2B d664fdafd5dc9987ec640c98602fe5a466d23245626d98fc8ead7ff16bbab363dfb60160c549477fcc52d2dd80db0eb682a6efc8bc9d719faf7d7c1188a5ebe1 SHA512 298b1b82b04e4f5060356f93607bab7a766cf8dbf3ba215a35722a08ca7d9ea083e15d0a53d682366cac0193a45fee84d098fcc9b271e0bff474d34739807e1b -EBUILD dxvk-1.5.4.ebuild 2327 BLAKE2B d664fdafd5dc9987ec640c98602fe5a466d23245626d98fc8ead7ff16bbab363dfb60160c549477fcc52d2dd80db0eb682a6efc8bc9d719faf7d7c1188a5ebe1 SHA512 298b1b82b04e4f5060356f93607bab7a766cf8dbf3ba215a35722a08ca7d9ea083e15d0a53d682366cac0193a45fee84d098fcc9b271e0bff474d34739807e1b +EBUILD dxvk-1.5.3.ebuild 2294 BLAKE2B 1233671bd8b41fb47b150b92dcfd482222d20a61a37df4bc729b5696532ad35c250ab69387034a554184c9d19fe8fcc55640817dbc1501a2c0e8d3ad863f0d77 SHA512 9a877d40167da1fd6e3f5313282658b120dbd7010cd6f2e9bcae08fd38d5b23fdf946f9f76f09ff4f674e5538e5d5491182ba8b1e346de917204fe8ffdb80454 +EBUILD dxvk-1.5.4.ebuild 2294 BLAKE2B 1233671bd8b41fb47b150b92dcfd482222d20a61a37df4bc729b5696532ad35c250ab69387034a554184c9d19fe8fcc55640817dbc1501a2c0e8d3ad863f0d77 SHA512 9a877d40167da1fd6e3f5313282658b120dbd7010cd6f2e9bcae08fd38d5b23fdf946f9f76f09ff4f674e5538e5d5491182ba8b1e346de917204fe8ffdb80454 EBUILD dxvk-9999-r2.ebuild 2327 BLAKE2B d664fdafd5dc9987ec640c98602fe5a466d23245626d98fc8ead7ff16bbab363dfb60160c549477fcc52d2dd80db0eb682a6efc8bc9d719faf7d7c1188a5ebe1 SHA512 298b1b82b04e4f5060356f93607bab7a766cf8dbf3ba215a35722a08ca7d9ea083e15d0a53d682366cac0193a45fee84d098fcc9b271e0bff474d34739807e1b MISC metadata.xml 339 BLAKE2B 2c3c82d9b14bca7f4b3b2d01aadad24d534c74201952505d3d579d636c6053cb8fdc3a91c269d500876af972015d48756c7ea4b5cec089c4a7c5c4fbfdc63d70 SHA512 f2694f77e348ae5cc9053b7380b0efe41dc4a82a4fd100e2a8c87a15c11452400581145938ed80816a2c9ec86e5cd4444b99b713c2404efa7225a0e39025c7be diff --git a/app-emulation/dxvk/dxvk-1.5.3.ebuild b/app-emulation/dxvk/dxvk-1.5.3.ebuild index 68484fe..638afe5 100644 --- a/app-emulation/dxvk/dxvk-1.5.3.ebuild +++ b/app-emulation/dxvk/dxvk-1.5.3.ebuild @@ -25,19 +25,18 @@ else fi IUSE="video_cards_nvidia" -COMMON_DEPEND="virtual/wine[${MULTILIB_USEDEP}]" DEPEND=" - ${COMMON_DEPEND} dev-util/vulkan-headers dev-util/glslang " -RDEPEND=" - ${COMMON_DEPEND} - media-libs/vulkan-loader[${MULTILIB_USEDEP}] +BDEPEND=" || ( - >=app-emulation/wine-staging-4.5 - >=app-emulation/wine-vanilla-4.5 + >=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP}] + >=app-emulation/wine-vanilla-4.5[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + media-libs/vulkan-loader[${MULTILIB_USEDEP}] || ( video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-440.31 ) >=media-libs/mesa-19.2 diff --git a/app-emulation/dxvk/dxvk-1.5.4.ebuild b/app-emulation/dxvk/dxvk-1.5.4.ebuild index 68484fe..638afe5 100644 --- a/app-emulation/dxvk/dxvk-1.5.4.ebuild +++ b/app-emulation/dxvk/dxvk-1.5.4.ebuild @@ -25,19 +25,18 @@ else fi IUSE="video_cards_nvidia" -COMMON_DEPEND="virtual/wine[${MULTILIB_USEDEP}]" DEPEND=" - ${COMMON_DEPEND} dev-util/vulkan-headers dev-util/glslang " -RDEPEND=" - ${COMMON_DEPEND} - media-libs/vulkan-loader[${MULTILIB_USEDEP}] +BDEPEND=" || ( - >=app-emulation/wine-staging-4.5 - >=app-emulation/wine-vanilla-4.5 + >=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP}] + >=app-emulation/wine-vanilla-4.5[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + media-libs/vulkan-loader[${MULTILIB_USEDEP}] || ( video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-440.31 ) >=media-libs/mesa-19.2