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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D05A915800F for ; Fri, 3 Feb 2023 00:13:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1761E079E; Fri, 3 Feb 2023 00:13:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 pigeon.gentoo.org (Postfix) with ESMTPS id 67E78E079E for ; Fri, 3 Feb 2023 00:13:46 +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 437C933BEFE for ; Fri, 3 Feb 2023 00:13:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65C92889 for ; Fri, 3 Feb 2023 00:13:43 +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: <1675382759.91e2689542f77f4105937e7cfd68a66821f683fb.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-staging/wine-staging-9999.ebuild X-VCS-Directories: app-emulation/wine-staging/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 91e2689542f77f4105937e7cfd68a66821f683fb X-VCS-Branch: master Date: Fri, 3 Feb 2023 00:13:43 +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: ce1bf689-b24a-43c1-ba7e-40956c82cb92 X-Archives-Hash: c3ad50b42476afec18d986c66d7389bb commit: 91e2689542f77f4105937e7cfd68a66821f683fb Author: Ionen Wolkens gentoo org> AuthorDate: Thu Feb 2 23:08:03 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Feb 3 00:05:59 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e26895 app-emulation/wine-staging: revert to upstream-commit file in live Upstream has deprecated patchinstall.sh in favor of patchinstall.py which reads this file. So instead it's now the shell script that's not being updated. So "tentatively" use the file again. This deprecation is however surprising given patchinstall.py hasn't really been touched in years and still uses python2. May work with 2to3 but will delay actually using that for patching to see what upstream does (perhaps modernize the .py or un-deprecate, do hope won't need to keep going back & forth with this). Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/wine-staging/wine-staging-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index b23645292240..887f0e540454 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -153,7 +153,7 @@ src_unpack() { EGIT_CHECKOUT_DIR=${WORKDIR}/${P} git-r3_src_unpack - EGIT_COMMIT=$("${BASH}" "${EGIT_CHECKOUT_DIR}"/patches/patchinstall.sh --upstream-commit) || die + EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die EGIT_REPO_URI=${WINE_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${S} einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"