From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CF1B21582EF for ; Sat, 15 Feb 2025 14:56:58 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id B65F73430BF for ; Sat, 15 Feb 2025 14:56:58 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 1BF70110471; Sat, 15 Feb 2025 14:56:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 1369A110471 for ; Sat, 15 Feb 2025 14:56:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA3C434306E for ; Sat, 15 Feb 2025 14:56:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08C4B19DE for ; Sat, 15 Feb 2025 14:56:53 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1739631370.b683f1f80c7490b6060e944903a4efc22d800c15.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-vanilla/wine-vanilla-9999.ebuild X-VCS-Directories: app-emulation/wine-vanilla/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: b683f1f80c7490b6060e944903a4efc22d800c15 X-VCS-Branch: master Date: Sat, 15 Feb 2025 14:56:53 +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: 288b71f5-f5df-4cc0-b9e6-96e9dba81d63 X-Archives-Hash: 5eb80398fdacc65718df20cd2d16fd88 commit: b683f1f80c7490b6060e944903a4efc22d800c15 Author: Ionen Wolkens gentoo org> AuthorDate: Sat Feb 15 14:53:44 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Feb 15 14:56:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b683f1f8 app-emulation/wine-vanilla: add guard to avoid overwriting wine64 Only relevant when picking an older commit in live given it should never exist anymore otherwise. Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index a3201550680a..21d68c9d3d07 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -365,7 +365,9 @@ src_install() { use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last # "wine64" is no longer provided, but a keep symlink for old scripts - use abi_x86_64 && dosym wine ${WINE_PREFIX}/bin/wine64 + # TODO: remove the guard later, only useful for bisecting -9999 + [[ -e ${ED}${WINE_PREFIX}/bin/wine64 ]] || + use abi_x86_64 && dosym wine ${WINE_PREFIX}/bin/wine64 use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \ "${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die