From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7168A1580B2 for ; Fri, 3 Sep 2021 11:10:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DC8DE085A; Fri, 3 Sep 2021 11:10:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 138EFE085A for ; Fri, 3 Sep 2021 11:10:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A7C533CEF2 for ; Fri, 3 Sep 2021 11:10:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC1B48A for ; Fri, 3 Sep 2021 11:10:23 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1630666078.ac0bc5018440b22a10921bb7fc9429ebef2a982c.chiitoo@gentoo> Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/ X-VCS-Repository: repo/proj/wine X-VCS-Files: app-emulation/wine-staging/wine-staging-6.10.ebuild app-emulation/wine-staging/wine-staging-6.11.ebuild app-emulation/wine-staging/wine-staging-6.12.ebuild app-emulation/wine-staging/wine-staging-6.13.ebuild app-emulation/wine-staging/wine-staging-6.14.ebuild app-emulation/wine-staging/wine-staging-6.15.ebuild app-emulation/wine-staging/wine-staging-6.16.ebuild app-emulation/wine-staging/wine-staging-6.8.ebuild app-emulation/wine-staging/wine-staging-6.9.ebuild X-VCS-Directories: app-emulation/wine-staging/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: ac0bc5018440b22a10921bb7fc9429ebef2a982c X-VCS-Branch: master Date: Fri, 3 Sep 2021 11:10:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 05e4695a-e8f5-44d3-b45e-8398186ffc90 X-Archives-Hash: fa88226a95a60a68ac29aae056406f38 commit: ac0bc5018440b22a10921bb7fc9429ebef2a982c Author: Jimi Huotari gentoo org> AuthorDate: Fri Sep 3 10:47:58 2021 +0000 Commit: Jimi Huotari gentoo 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 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}