commit: 1da7c1fde9bce5ef524caa97743152921b84213d Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Fri Dec 4 02:09:23 2020 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Fri Dec 4 02:37:35 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=1da7c1fd
app-emulation/wine-staging: adjust path to wineconsole removal Bug: https://bugs.gentoo.org/757999 Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> app-emulation/wine-staging/wine-staging-5.22-r2.ebuild | 14 +++++++++++--- app-emulation/wine-staging/wine-staging-9999.ebuild | 14 +++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild b/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild index 9d69e49..f8a2a07 100644 --- a/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild +++ b/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild @@ -579,9 +579,17 @@ multilib_src_install_all() { if ! use X && ! use ncurses; then rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die - rm_wineconsole() { - rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die - } + + if ! use mingw; then + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die + } + else + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die + } + fi + multilib_foreach_abi rm_wineconsole fi diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 89c3827..0e9414c 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -578,9 +578,17 @@ multilib_src_install_all() { if ! use X && ! use ncurses; then rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die - rm_wineconsole() { - rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die - } + + if ! use mingw; then + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die + } + else + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die + } + fi + multilib_foreach_abi rm_wineconsole fi
