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/wine-staging/
Date: Sun, 11 Oct 2020 20:21:42
Message-Id: 1602447689.1396290fcca2c8f0cbd0b99a58e0a2b448df5b54.sarnex@gentoo
1 commit: 1396290fcca2c8f0cbd0b99a58e0a2b448df5b54
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 11 20:20:50 2020 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 11 20:21:29 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1396290f
7
8 app-emulation/wine-staging: Sync with ::wine
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.19.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 eb04e57318e..482ad5089fb 100644
20 --- a/app-emulation/wine-staging/Manifest
21 +++ b/app-emulation/wine-staging/Manifest
22 @@ -3,7 +3,9 @@ DIST wine-5.15.tar.xz 23999688 BLAKE2B af462d9e4c9fe5e364fd474bc17b6ea61b3390428
23 DIST wine-5.16.tar.xz 24025256 BLAKE2B 2008b428b16870ec6fa6a38866152d6b94a8a83b3d673557bab9c0c435897900bd0b4b7b73e685698cf7445a6c3eda12f88132d4f43e7b2108213ea947a76c09 SHA512 e198478bcf91106af82b37c87f42961a6c37aa80ea5cf05c268a36ba2ba73c23ac6864b183b927cf3c10d666d60b9f6877edccf7746eafe8968a36b5ce3740be
24 DIST wine-5.17.tar.xz 24064512 BLAKE2B a84433ff7bb93a1f43c41f3106ff3f9c648631665100e8140340ab7d347daf6f2c3b54ea8177e1a2c2222574aa67264f5b576d99f6ef461548c74af48c62eb62 SHA512 05338036fa9b195d9cf8a84a1bcc03f35422d5f07744ec4430f20874601829be5904be10060353599cb0187728123f959ccc75e79f1ce1c47178ae9cd55ef696
25 DIST wine-5.18.tar.xz 24160316 BLAKE2B 4f359b6e869707a514d2198d2b8ba810b8552ea53ff3f37cbc7c23b732152db0fa5c0c909d2c16a03f6b0ff122435c92f8a9b8b462577aa50a39b2dcfa7bcd05 SHA512 70565fbea61b78580ca86443fcb4c10c7814c1dffcfa49ee38746fef21a52a00f2e040d9d2515892fed4021e7868720cc22b650d18872656838e4610d4d4e823
26 +DIST wine-5.19.tar.xz 24201860 BLAKE2B 34233747a58e2cf6c9b6b328cb8c0af5707479e02d20365da07d039163757c6557d25ec8136933fd9bd5a7aeb360d96e44c41c34fffb26a23f9e3ea137f03120 SHA512 b91eb1cb1225ac8abe26f5c5dd74fb376e6489b460035c70e6c7890595086e99273497741b6a736ef4884ae7bacc44482d2e3e8ba7e8d85c78c571bd4b133d8a
27 DIST wine-staging-150ce22fa21ffa040816e725ead34ed1de516bd8.tar.gz 9840427 BLAKE2B e263d6563a5438973309346ba820acdb5079ef236c5c55694bdfa16c54f3f4fe76750ab324d6c5e1f0b429df634b917f138f4a1db38417ac2b49ce41ee36a211 SHA512 37f05909ca6cb28a3527f31882562146d3971f47345312b96783b5e62bc95ee61779f12f4c13e3d05ec5f331463a7600c16d5bc428d13c42bf3e3568f4d3923e
28 DIST wine-staging-5.16.tar.gz 9830408 BLAKE2B 0c4fd5e9942f4b5a666b21cb2ab3fdb059bca5762fd622b69358fd5df7f5c770681a3cbe6f9a0433e83f3be95b69808d95ed5f76df86b9713dcedb72a398966e SHA512 62e103dd5b591bc1066b91299a95c318bf1588f273f8380c1ac43d5367b695055a1684b8cc6473255a0b449b21a483ff4e87adc3ae332d0fb520023340fff79f
29 DIST wine-staging-5.17.tar.gz 10342408 BLAKE2B aa8f864560eb476a4c2011e588df9b24410e4e4a8d6c8d81b5ff63208b3b4474870ae8bd718ba22cdb14b920b52aeac54274710bdb1b4dd427b7c7b0e8e9d14b SHA512 38c9860c8109e29026dd773a6448c9ac6faa373c0dfc04011a5f0b22be69c66dd6bdba95cb28bfb8e3656a53d726f2ffc0bae74bce4d437c4fe5a532e75a19ec
30 DIST wine-staging-5.18.tar.gz 10357038 BLAKE2B 07df0de55d1bfa36d3492498a48d8f1402dffa161f3b02f3326185d524bea9a2f0893b85a70650797bf1b74c06f5814ddc09cb184a5977cfacb968921020aee1 SHA512 75911ac4d5aaf6cfef41aa487290369d714f153b1fba2279daca75d6c5cbc7e7de9d3f8ef55eb7c311a05b86a212163e2b81ff685c1527fb0e90f223ec23dcab
31 +DIST wine-staging-5.19.tar.gz 10348478 BLAKE2B 4c23d3f488fc7dcbd98abea0593767401711ac0ed533cba144e82fd38f1349ba557aeedf6faac898de107d2b55ba41030cde111272f63ebb7ba25952bf9824d9 SHA512 4335ce48437641bbfd8b882cc92cd2970493586f4ac6501ffb94a0f2dcd38ec632d6afabf71d2c1ab1806a5cf594c2988f94a86c508fcd24a7d42078c662add9
32
33 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-5.19.ebuild
34 similarity index 99%
35 copy from app-emulation/wine-staging/wine-staging-9999.ebuild
36 copy to app-emulation/wine-staging/wine-staging-5.19.ebuild
37 index 19d8082c212..9c6e2a76fa3 100644
38 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
39 +++ b/app-emulation/wine-staging/wine-staging-5.19.ebuild
40 @@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
41 !app-emulation/wine:0
42 dos? ( >=games-emulation/dosbox-0.74_p20160629 )
43 gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
44 - mono? ( app-emulation/wine-mono:5.1.0 )
45 + mono? ( app-emulation/wine-mono:5.1.1 )
46 perl? (
47 dev-lang/perl
48 dev-perl/XML-Simple
49 @@ -492,9 +492,10 @@ multilib_src_configure() {
50 $(use_with vaapi va)
51 )
52
53 - local PKG_CONFIG
54 + local PKG_CONFIG AR RANLIB
55 # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
56 - tc-export PKG_CONFIG
57 + # set AR and RANLIB to make QA scripts happy; #483342
58 + tc-export PKG_CONFIG AR RANLIB
59
60 if use amd64; then
61 if [[ ${ABI} == amd64 ]]; then
62
63 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
64 index 19d8082c212..11363b6b82b 100644
65 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
66 +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
67 @@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
68 !app-emulation/wine:0
69 dos? ( >=games-emulation/dosbox-0.74_p20160629 )
70 gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
71 - mono? ( app-emulation/wine-mono:5.1.0 )
72 + mono? ( app-emulation/wine-mono:5.1.1 )
73 perl? (
74 dev-lang/perl
75 dev-perl/XML-Simple