[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/

[Nick Sarnie]

commit:     d8420149dd0c5f31bd35c3646a62a53fd0aa3030
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  2 02:21:37 2020 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Thu Apr  2 02:22:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8420149

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

Fix shortcut bug

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 .../{wine-staging-9999.ebuild => wine-staging-5.5-r1.ebuild}            | 2 +-
 app-emulation/wine-staging/wine-staging-9999.ebuild                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild 
b/app-emulation/wine-staging/wine-staging-5.5-r1.ebuild
similarity index 99%
copy from app-emulation/wine-staging/wine-staging-9999.ebuild
copy to app-emulation/wine-staging/wine-staging-5.5-r1.ebuild
index c4c429fb8c2..4fec765f317 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.5-r1.ebuild
@@ -354,7 +354,7 @@ src_prepare() {
                ewarn "Applying the Wine-Staging patchset. Any bug reports to 
the"
                ewarn "Wine bugzilla should explicitly state that staging was 
used."
 
-               local STAGING_EXCLUDE=""
+               local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" 
#652176
                use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W 
Pipelight"
 
                # Launch wine-staging patcher in a subshell, using eapply as a 
backend, and gitapply.sh as a backend for binary patches

diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild 
b/app-emulation/wine-staging/wine-staging-9999.ebuild
index c4c429fb8c2..4fec765f317 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -354,7 +354,7 @@ src_prepare() {
                ewarn "Applying the Wine-Staging patchset. Any bug reports to 
the"
                ewarn "Wine bugzilla should explicitly state that staging was 
used."
 
-               local STAGING_EXCLUDE=""
+               local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" 
#652176
                use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W 
Pipelight"
 
                # Launch wine-staging patcher in a subshell, using eapply as a 
backend, and gitapply.sh as a backend for binary patches