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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 65843158010 for ; Mon, 13 Feb 2023 11:46:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2B73E0867; Mon, 13 Feb 2023 11:46:11 +0000 (UTC) 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 pigeon.gentoo.org (Postfix) with ESMTPS id B7BA7E0867 for ; Mon, 13 Feb 2023 11:46:11 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6CC3340DDE for ; Mon, 13 Feb 2023 11:46:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 041FE8B8 for ; Mon, 13 Feb 2023 11:46:08 +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: <1676287969.a0dc96d04835be7ab84fe3c946928cec93266fa7.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: a0dc96d04835be7ab84fe3c946928cec93266fa7 X-VCS-Branch: master Date: Mon, 13 Feb 2023 11:46:08 +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: aebc4ecd-8bce-4b11-a5d6-5cc68323106a X-Archives-Hash: 4f9b57a62ecc24640ed1c569cab5c3a0 commit: a0dc96d04835be7ab84fe3c946928cec93266fa7 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Feb 13 10:46:54 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Feb 13 11:32:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0dc96d0 app-emulation/wine-staging: migrate to patchinstall.py Upstream has deprecated the old shell script and (finally) ported patchinstall.py to python3. So let's use what's intended. Unfortunately means no more "eapply" integration, will either use git to apply patches or fallback to hacks (latter may need testing in non-live, albeit the whole machinery is not useful right now given binary patches haven't been used for a while). Signed-off-by: Ionen Wolkens gentoo.org> .../wine-staging/wine-staging-9999.ebuild | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 887f0e540454..d6afdde72ae8 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -4,7 +4,9 @@ EAPI=8 MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper +PYTHON_COMPAT=( python3_{9..11} ) +inherit autotools edo flag-o-matic multilib multilib-build +inherit python-any-r1 toolchain-funcs wrapper WINE_GECKO=2.47.3 WINE_MONO=7.4.0 @@ -110,7 +112,16 @@ DEPEND=" ${WINE_COMMON_DEPEND} sys-kernel/linux-headers X? ( x11-base/xorg-proto )" +# gitapply.sh prefers git but can fallback to patch+extras BDEPEND=" + ${PYTHON_DEPS} + || ( + dev-vcs/git + ( + sys-apps/gawk + sys-apps/util-linux + ) + ) dev-lang/perl sys-devel/binutils sys-devel/bison @@ -164,19 +175,14 @@ src_unpack() { } src_prepare() { - local staging=( - ./patchinstall.sh DESTDIR="${S}" + local patchinstallargs=( --all - --backend=eapply --no-autoconf -W winemenubuilder-Desktop_Icon_Path #652176 ${MY_WINE_STAGING_CONF} ) - # source patcher in a subshell so can use eapply as a backend - ebegin "Running ${staging[*]}" - ( cd ../${P}/patches && . "${staging[@]}" ) - eend ${?} || die "Failed to apply the patchset" + edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}" # sanity check, bumping these has a history of oversights local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \