commit: ac0bc5018440b22a10921bb7fc9429ebef2a982c Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Fri Sep 3 10:47:58 2021 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Fri Sep 3 10:47:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=ac0bc501
app-emulation/wine-staging: remove removal of wineconsole The path has changed since release 6.8, and while it could be fixed, at this time, removing wineconsole might do more harm than good. Bug: https://bugs.gentoo.org/551124 Bug: https://bugs.gentoo.org/757999 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> app-emulation/wine-staging/wine-staging-6.10.ebuild | 18 ------------------ app-emulation/wine-staging/wine-staging-6.11.ebuild | 18 ------------------ app-emulation/wine-staging/wine-staging-6.12.ebuild | 18 ------------------ app-emulation/wine-staging/wine-staging-6.13.ebuild | 18 ------------------ app-emulation/wine-staging/wine-staging-6.14.ebuild | 18 ------------------ app-emulation/wine-staging/wine-staging-6.15.ebuild | 18 ------------------ app-emulation/wine-staging/wine-staging-6.16.ebuild | 18 ------------------ app-emulation/wine-staging/wine-staging-6.8.ebuild | 18 ------------------ app-emulation/wine-staging/wine-staging-6.9.ebuild | 18 ------------------ 9 files changed, 162 deletions(-) diff --git a/app-emulation/wine-staging/wine-staging-6.10.ebuild b/app-emulation/wine-staging/wine-staging-6.10.ebuild index a1637bb..ae8c5c3 100644 --- a/app-emulation/wine-staging/wine-staging-6.10.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.10.ebuild @@ -579,24 +579,6 @@ multilib_src_install_all() { "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die fi - # Remove wineconsole if neither backend is installed #551124 - if ! use X; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || 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 - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} diff --git a/app-emulation/wine-staging/wine-staging-6.11.ebuild b/app-emulation/wine-staging/wine-staging-6.11.ebuild index a1637bb..ae8c5c3 100644 --- a/app-emulation/wine-staging/wine-staging-6.11.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.11.ebuild @@ -579,24 +579,6 @@ multilib_src_install_all() { "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die fi - # Remove wineconsole if neither backend is installed #551124 - if ! use X; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || 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 - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} diff --git a/app-emulation/wine-staging/wine-staging-6.12.ebuild b/app-emulation/wine-staging/wine-staging-6.12.ebuild index e7e3033..0fd71a5 100644 --- a/app-emulation/wine-staging/wine-staging-6.12.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.12.ebuild @@ -579,24 +579,6 @@ multilib_src_install_all() { "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die fi - # Remove wineconsole if neither backend is installed #551124 - if ! use X; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || 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 - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} diff --git a/app-emulation/wine-staging/wine-staging-6.13.ebuild b/app-emulation/wine-staging/wine-staging-6.13.ebuild index 3490662..332f5ca 100644 --- a/app-emulation/wine-staging/wine-staging-6.13.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.13.ebuild @@ -579,24 +579,6 @@ multilib_src_install_all() { "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die fi - # Remove wineconsole if neither backend is installed #551124 - if ! use X; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || 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 - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} diff --git a/app-emulation/wine-staging/wine-staging-6.14.ebuild b/app-emulation/wine-staging/wine-staging-6.14.ebuild index 99423da..5560bbd 100644 --- a/app-emulation/wine-staging/wine-staging-6.14.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.14.ebuild @@ -578,24 +578,6 @@ multilib_src_install_all() { "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die fi - # Remove wineconsole if neither backend is installed #551124 - if ! use X; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || 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 - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} diff --git a/app-emulation/wine-staging/wine-staging-6.15.ebuild b/app-emulation/wine-staging/wine-staging-6.15.ebuild index 1b3a52f..f8a707a 100644 --- a/app-emulation/wine-staging/wine-staging-6.15.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.15.ebuild @@ -577,24 +577,6 @@ multilib_src_install_all() { "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die fi - # Remove wineconsole if neither backend is installed #551124 - if ! use X; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || 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 - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} diff --git a/app-emulation/wine-staging/wine-staging-6.16.ebuild b/app-emulation/wine-staging/wine-staging-6.16.ebuild index 1b3a52f..f8a707a 100644 --- a/app-emulation/wine-staging/wine-staging-6.16.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.16.ebuild @@ -577,24 +577,6 @@ multilib_src_install_all() { "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die fi - # Remove wineconsole if neither backend is installed #551124 - if ! use X; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || 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 - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} diff --git a/app-emulation/wine-staging/wine-staging-6.8.ebuild b/app-emulation/wine-staging/wine-staging-6.8.ebuild index cd11ef5..c3fbb66 100644 --- a/app-emulation/wine-staging/wine-staging-6.8.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.8.ebuild @@ -579,24 +579,6 @@ multilib_src_install_all() { "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die fi - # Remove wineconsole if neither backend is installed #551124 - if ! use X; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || 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 - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} diff --git a/app-emulation/wine-staging/wine-staging-6.9.ebuild b/app-emulation/wine-staging/wine-staging-6.9.ebuild index cd11ef5..c3fbb66 100644 --- a/app-emulation/wine-staging/wine-staging-6.9.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.9.ebuild @@ -579,24 +579,6 @@ multilib_src_install_all() { "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die fi - # Remove wineconsole if neither backend is installed #551124 - if ! use X; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || 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 - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
