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 A660413835B for ; Fri, 4 Dec 2020 02:40:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D27BE08BD; Fri, 4 Dec 2020 02:40:17 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3B959E087E for ; Fri, 4 Dec 2020 02:40:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 BE6C2341030 for ; Fri, 4 Dec 2020 02:40:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 394E1476 for ; Fri, 4 Dec 2020 02:40:14 +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: <1607049310.14deadb457c34a5f053217b4fa0bc720209973ba.chiitoo@gentoo> Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/ X-VCS-Repository: repo/proj/wine X-VCS-Files: app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild app-emulation/wine-vanilla/wine-vanilla-9999.ebuild X-VCS-Directories: app-emulation/wine-vanilla/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: 14deadb457c34a5f053217b4fa0bc720209973ba X-VCS-Branch: master Date: Fri, 4 Dec 2020 02:40:14 +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: f90365d7-c9ed-46e8-9da1-d4655a0b87c9 X-Archives-Hash: 76b5113fac47a85104e7026bf8f3cb9d commit: 14deadb457c34a5f053217b4fa0bc720209973ba Author: Jimi Huotari gentoo org> AuthorDate: Thu Dec 3 07:25:35 2020 +0000 Commit: Jimi Huotari gentoo org> CommitDate: Fri Dec 4 02:35:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=14deadb4 app-emulation/wine-vanilla: 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 gentoo.org> app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild | 14 +++++++++++--- app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 14 +++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild index 05ef8ff..ff9a439 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild @@ -505,9 +505,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-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 05ef8ff..ff9a439 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -505,9 +505,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