commit: b6c0730a41163808e0df5fec7a528e5347e2e53f
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 14:53:51 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 15:04:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c0730a
app-emulation/wine-staging: add workaround for smart-live-rebuild
Tentative fix for smart-live-rebuild ignoring wine-staging-9999
(believed to be due to seeing EGIT_COMMIT).
Not tested, but should work in theory.
Could mark them local but want to ensure nothing git-r3_src_unpack
set was preserved to be sure.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-emulation/wine-staging/wine-staging-9999.ebuild | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild
b/app-emulation/wine-staging/wine-staging-9999.ebuild
index c811b766776f..a11cbb764ad0 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -180,11 +180,15 @@ src_unpack() {
EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
git-r3_src_unpack
- 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})"
- git-r3_src_unpack
+ # hack: use subshell to preserve state (including what git-r3
unpack
+ # sets) for smart-live-rebuild as this is not the repo to look
at
+ (
+
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})"
+ git-r3_src_unpack
+ )
else
default
fi
