commit:     41810774f0d1b34b9469cac2113c4bb047c1c3b5
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  1 16:41:26 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Sep  1 16:41:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41810774

app-emulation/wine-vanilla: Sync with ::wine

Require vulkan for vkd3d
Bump to 3.14

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 app-emulation/wine-vanilla/Manifest                                  | 1 +
 app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild                  | 3 ++-
 app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild                  | 3 ++-
 app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild               | 3 ++-
 app-emulation/wine-vanilla/wine-vanilla-3.13.ebuild                  | 5 +++--
 .../{wine-vanilla-9999.ebuild => wine-vanilla-3.14.ebuild}           | 3 ++-
 app-emulation/wine-vanilla/wine-vanilla-9999.ebuild                  | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index ca91d76c80b..e774020e9b5 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -4,3 +4,4 @@ DIST wine-3.0.2.tar.xz 19726920 BLAKE2B 
e108f851b2d893b052a26ae4368f3337bebcc81b
 DIST wine-3.11.tar.xz 20501100 BLAKE2B 
793fe0a83ed13f4ca436c710198ffcbde5e0109d9890551a410b1d836d79adf4060f0cc7e20861eb806878db79f8003023821ac1b0d72a0710235412863c4576
 SHA512 
8f7226364648ec30eb77f1848ee6bf01be2445fd96f902309575ac1f6ece31bf54d415516fcda76ae438010a36a9d4846d22cc37365aac4a230701376f9589d7
 DIST wine-3.12.tar.xz 20516708 BLAKE2B 
6ff32f8d471492c1ca42db434b16c0273e98cd15215d2f67e3d8e34e298d36620f55409bb781687f3ab11e6a44bd95eaa033e642fdb0d7aae90319ac2ddd2fb6
 SHA512 
afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1
 DIST wine-3.13.tar.xz 20551460 BLAKE2B 
2f8b1c2f72761b3c5541b8760be3009295dc9482257539edce83aa9d6022b2e8a25e1cee4fe56b69808e51e338fd330db5da17dec5dea4ba7684b5d7eb7e77d5
 SHA512 
a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59
+DIST wine-3.14.tar.xz 20583696 BLAKE2B 
5e9410c5dadd0c08cbe0e52b0170840492890784dbd1afc8f01ab50caac8443513133575fa6f64143276ce315dde8614f5ece4b3cd5568c224a3379c85619b63
 SHA512 
50dbbf8a832abfa01247b9d170c6e1fe4f722cc8868659512df7bc17efd7e9d618db10283baf1eda0f1e4abbcdd130be16dbdb8d5a91b155c2c441e50e2b43f1

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild
index cdb123c486e..1336c2357bf 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild
@@ -40,7 +40,8 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
        X? ( truetype )
        elibc_glibc? ( threads )
        osmesa? ( opengl )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+       test? ( abi_x86_32 )
+       vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
 # or fail due to Xvfb's opengl limitations.

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild
index cdb123c486e..1336c2357bf 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild
@@ -40,7 +40,8 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
        X? ( truetype )
        elibc_glibc? ( threads )
        osmesa? ( opengl )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+       test? ( abi_x86_32 )
+       vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
 # or fail due to Xvfb's opengl limitations.

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild
index 96e3367ccf4..9a0d8ea7f20 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild
@@ -40,7 +40,8 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
        X? ( truetype )
        elibc_glibc? ( threads )
        osmesa? ( opengl )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+       test? ( abi_x86_32 )
+       vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
 # or fail due to Xvfb's opengl limitations.

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.13.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-3.13.ebuild
index cdb123c486e..9a0d8ea7f20 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.13.ebuild
@@ -40,7 +40,8 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
        X? ( truetype )
        elibc_glibc? ( threads )
        osmesa? ( opengl )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+       test? ( abi_x86_32 )
+       vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
 # or fail due to Xvfb's opengl limitations.
@@ -107,7 +108,7 @@ RDEPEND="${COMMON_DEPEND}
        !app-emulation/wine:0
        dos? ( >=games-emulation/dosbox-0.74_p20160629 )
        gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-       mono? ( app-emulation/wine-mono:4.7.1 )
+       mono? ( app-emulation/wine-mono:4.7.3 )
        perl? (
                dev-lang/perl
                dev-perl/XML-Simple

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-3.14.ebuild
similarity index 99%
copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
copy to app-emulation/wine-vanilla/wine-vanilla-3.14.ebuild
index 96e3367ccf4..9a0d8ea7f20 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.14.ebuild
@@ -40,7 +40,8 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
        X? ( truetype )
        elibc_glibc? ( threads )
        osmesa? ( opengl )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+       test? ( abi_x86_32 )
+       vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
 # or fail due to Xvfb's opengl limitations.

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 96e3367ccf4..9a0d8ea7f20 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -40,7 +40,8 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
        X? ( truetype )
        elibc_glibc? ( threads )
        osmesa? ( opengl )
-       test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+       test? ( abi_x86_32 )
+       vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
 # or fail due to Xvfb's opengl limitations.

Reply via email to