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, 12 Jul 2021 18:14:44
Message-Id: 1626113651.73d63ac96e40174926049b096ac0e8c59f242040.sarnex@gentoo
1 commit: 73d63ac96e40174926049b096ac0e8c59f242040
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 12 18:14:11 2021 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 12 18:14:11 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=73d63ac9
7
8 app-emulation/wine-staging: Sync with ::gentoo
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
12
13 app-emulation/wine-staging/wine-staging-6.12.ebuild | 5 ++---
14 app-emulation/wine-staging/wine-staging-9999.ebuild | 5 ++---
15 2 files changed, 4 insertions(+), 6 deletions(-)
16
17 diff --git a/app-emulation/wine-staging/wine-staging-6.12.ebuild b/app-emulation/wine-staging/wine-staging-6.12.ebuild
18 index 9f66da3..77c35e1 100644
19 --- a/app-emulation/wine-staging/wine-staging-6.12.ebuild
20 +++ b/app-emulation/wine-staging/wine-staging-6.12.ebuild
21 @@ -528,10 +528,9 @@ multilib_src_configure() {
22 $(use_with vaapi va)
23 )
24
25 - local PKG_CONFIG AR RANLIB
26 + local PKG_CONFIG
27 # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
28 - # set AR and RANLIB to make QA scripts happy; #483342
29 - tc-export PKG_CONFIG AR RANLIB
30 + tc-export PKG_CONFIG
31
32 if use amd64; then
33 if [[ ${ABI} == amd64 ]]; then
34
35 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
36 index 5fa9270..97f1f41 100644
37 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
38 +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
39 @@ -528,10 +528,9 @@ multilib_src_configure() {
40 $(use_with vaapi va)
41 )
42
43 - local PKG_CONFIG AR RANLIB
44 + local PKG_CONFIG
45 # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
46 - # set AR and RANLIB to make QA scripts happy; #483342
47 - tc-export PKG_CONFIG AR RANLIB
48 + tc-export PKG_CONFIG
49
50 if use amd64; then
51 if [[ ${ABI} == amd64 ]]; then