commit: 91e2689542f77f4105937e7cfd68a66821f683fb
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 2 23:08:03 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> 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 <ionen <AT> 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})"
