Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/
Date: Mon, 28 Sep 2020 02:41:08
Message-Id: 1601260217.50d213e58c068cc39cddddaa712aefe7a6ce3678.sarnex@gentoo
1 commit: 50d213e58c068cc39cddddaa712aefe7a6ce3678
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 28 02:30:17 2020 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 28 02:30:17 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=50d213e5
7
8 app-emulation/wine-staging: Bump to 5.18
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
12
13 app-emulation/wine-staging/Manifest | 2 ++
14 .../{wine-staging-9999.ebuild => wine-staging-5.18.ebuild} | 7 ++++---
15 app-emulation/wine-staging/wine-staging-9999.ebuild | 2 +-
16 3 files changed, 7 insertions(+), 4 deletions(-)
17
18 diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
19 index cda2707..2c1c84f 100644
20 --- a/app-emulation/wine-staging/Manifest
21 +++ b/app-emulation/wine-staging/Manifest
22 @@ -36,6 +36,7 @@ DIST wine-5.14.tar.xz 23975804 BLAKE2B bc14b84f4044323cd65c8c0a715a09b296bb8ecad
23 DIST wine-5.15.tar.xz 23999688 BLAKE2B af462d9e4c9fe5e364fd474bc17b6ea61b3390428762845291271811feab13cf6ccd39c8c5847b0cc922bd273d42227d95b871dfa04cf055560a3cff65349275 SHA512 90baf7df915cf1ce88022a4aebe4a6975b4b0defcc043a0c6738fefb9b853e0bfbcc645c39e33cdbb20673fab5df7561ab5b55e38a4e0a68907912a80e556ae3
24 DIST wine-5.16.tar.xz 24025256 BLAKE2B 2008b428b16870ec6fa6a38866152d6b94a8a83b3d673557bab9c0c435897900bd0b4b7b73e685698cf7445a6c3eda12f88132d4f43e7b2108213ea947a76c09 SHA512 e198478bcf91106af82b37c87f42961a6c37aa80ea5cf05c268a36ba2ba73c23ac6864b183b927cf3c10d666d60b9f6877edccf7746eafe8968a36b5ce3740be
25 DIST wine-5.17.tar.xz 24064512 BLAKE2B a84433ff7bb93a1f43c41f3106ff3f9c648631665100e8140340ab7d347daf6f2c3b54ea8177e1a2c2222574aa67264f5b576d99f6ef461548c74af48c62eb62 SHA512 05338036fa9b195d9cf8a84a1bcc03f35422d5f07744ec4430f20874601829be5904be10060353599cb0187728123f959ccc75e79f1ce1c47178ae9cd55ef696
26 +DIST wine-5.18.tar.xz 24160316 BLAKE2B 4f359b6e869707a514d2198d2b8ba810b8552ea53ff3f37cbc7c23b732152db0fa5c0c909d2c16a03f6b0ff122435c92f8a9b8b462577aa50a39b2dcfa7bcd05 SHA512 70565fbea61b78580ca86443fcb4c10c7814c1dffcfa49ee38746fef21a52a00f2e040d9d2515892fed4021e7868720cc22b650d18872656838e4610d4d4e823
27 DIST wine-5.2.tar.xz 22837712 BLAKE2B ee9d4d4dd6c0669d1585cc6988d933dbc7aa5277a0f13e965dd9eecb621e475d33a832b316e37f1372a965efe517efafa9f857a38d9bf081026d221db96b7a0d SHA512 57fa66885c3b5f43e51324e24b8524f663ad67ff15b464ac7d58096d5921f523a59ef5f1dc1ea7aa65fa10d64b7cd832f421c1b773c72bc312d8544a61c33f8f
28 DIST wine-5.3.tar.xz 22918612 BLAKE2B dce58aec45f665e1014635eadc9cc00c969e46c87de5d41bc51168237d9fc01011dcfc3fa4c83ed4cbcdfe19a3747e5e32f87946434a6eba2a8547f1929b33f3 SHA512 40528f46ad10c11758308e3bf21ba73c7af133d4dda386d542acec3a5cb31e01be0eb102b94f9d82a2358e45597bf49bd1e82c463e3a26aff8c0827b5a0894b6
29 DIST wine-5.4.tar.xz 22917904 BLAKE2B ceaa8516ddc0c2421b92da0ef047465cfa9fc203dfce93b42ca76409bab5e24709d173a4ed519b78f32d8ee99ffd9f0d06ee4156357f995c75e434b0249a31e2 SHA512 892e8b875484ada01eaddab4ea50992f95cf3ced6730f8e2ca1f0765770d7fa53a21080c526772b9b3ac83b3559d3d68e83ad3af3afbe9d6f931d833afde7e98
30 @@ -76,6 +77,7 @@ DIST wine-staging-5.13.tar.gz 9807468 BLAKE2B 17fea3955affd66082d9cf3d72529b5510
31 DIST wine-staging-5.14.tar.gz 9780843 BLAKE2B 03b964fd8b71a8a9e54f53074e4be82dd633a6489cdc30bade6e844e458ca43437bbd34c1a629fd0c1090173e37379a048be45561172bfff8e003daaf4104583 SHA512 da81b572480a6fc12aa39a93070e2b88593bba1463d5b0545083dbd6eaa306ec57fe39e77f24544d2a1a396a3e64c1687c12b69e0643e11a909e4e31a3e46014
32 DIST wine-staging-5.16.tar.gz 9830408 BLAKE2B 0c4fd5e9942f4b5a666b21cb2ab3fdb059bca5762fd622b69358fd5df7f5c770681a3cbe6f9a0433e83f3be95b69808d95ed5f76df86b9713dcedb72a398966e SHA512 62e103dd5b591bc1066b91299a95c318bf1588f273f8380c1ac43d5367b695055a1684b8cc6473255a0b449b21a483ff4e87adc3ae332d0fb520023340fff79f
33 DIST wine-staging-5.17.tar.gz 10342408 BLAKE2B aa8f864560eb476a4c2011e588df9b24410e4e4a8d6c8d81b5ff63208b3b4474870ae8bd718ba22cdb14b920b52aeac54274710bdb1b4dd427b7c7b0e8e9d14b SHA512 38c9860c8109e29026dd773a6448c9ac6faa373c0dfc04011a5f0b22be69c66dd6bdba95cb28bfb8e3656a53d726f2ffc0bae74bce4d437c4fe5a532e75a19ec
34 +DIST wine-staging-5.18.tar.gz 10357038 BLAKE2B 07df0de55d1bfa36d3492498a48d8f1402dffa161f3b02f3326185d524bea9a2f0893b85a70650797bf1b74c06f5814ddc09cb184a5977cfacb968921020aee1 SHA512 75911ac4d5aaf6cfef41aa487290369d714f153b1fba2279daca75d6c5cbc7e7de9d3f8ef55eb7c311a05b86a212163e2b81ff685c1527fb0e90f223ec23dcab
35 DIST wine-staging-5.2.tar.gz 9898002 BLAKE2B f4dc43223cf89e6c76fc7898a98acdc9eb3d4a8e8279a38135f155d9a3fe6a2f7bbc52ece5c4a07cf801caa91c10e40f172271b442356e52a59c31a8a82db3c3 SHA512 dd2066db1eb4d424579bdf8d25f476eae0b86a6bea7b1f7ff2a21d7bf0209b4ef00d9c0ed29a7cab50c5dea4684acb5d342ebf02554b16fd0938a03e607f6270
36 DIST wine-staging-5.3.tar.gz 9904213 BLAKE2B 5a1a9b41a17533238151ad87ec631a9ff78f954fa51baaebac787bd4eba88730a3524e4778a55eb80fd4153302d443d859c0b27c149495cd72ab6263aa583a8a SHA512 df14a61c04b134a72dc8662ee331fd234e2c82bf82824cb01443ae6516aba0bdcb579e2dbedc1ada47de0f3a1265c5fe9ef5f8183094d74451845b78d0a81702
37 DIST wine-staging-5.4.tar.gz 9924147 BLAKE2B c82fa66470645e62e63e8760d68cb92e4a04c209db712371bc1a534756c6b16c109e247bb1866edc514bdb24ba6a9e9f4ccb5c0db204d51541da0af82fd3b96f SHA512 d4958e73cea34a4a722f516487116d9f77a22099cb80b9c79f2468fbe28855acec131dacecfd255a9934fb88bcf34809bfb2e2e518d89ac23bcae125b6d6c86b
38
39 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-5.18.ebuild
40 similarity index 99%
41 copy from app-emulation/wine-staging/wine-staging-9999.ebuild
42 copy to app-emulation/wine-staging/wine-staging-5.18.ebuild
43 index 2b9e559..5b6a507 100644
44 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
45 +++ b/app-emulation/wine-staging/wine-staging-5.18.ebuild
46 @@ -115,7 +115,7 @@ COMMON_DEPEND="
47 unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
48 v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
49 vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
50 - vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
51 + vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
52 vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
53 xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
54 xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
55 @@ -492,9 +492,10 @@ multilib_src_configure() {
56 $(use_with vaapi va)
57 )
58
59 - local PKG_CONFIG
60 + local PKG_CONFIG AR RANLIB
61 # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
62 - tc-export PKG_CONFIG
63 + # set AR and RANLIB to make QA scripts happy; #483342
64 + tc-export PKG_CONFIG AR RANLIB
65
66 if use amd64; then
67 if [[ ${ABI} == amd64 ]]; then
68
69 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
70 index 2b9e559..19d8082 100644
71 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
72 +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
73 @@ -115,7 +115,7 @@ COMMON_DEPEND="
74 unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
75 v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
76 vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
77 - vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
78 + vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
79 vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
80 xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
81 xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )