| 1 |
commit: 4469bdbf74cebf43c949f218a202caf0f5b70f99 |
| 2 |
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 30 05:33:10 2016 +0000 |
| 4 |
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 30 05:33:27 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4469bdbf |
| 7 |
|
| 8 |
app-emulation/wine: Check SHAs for staging compat, bug #572522 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
app-emulation/wine/wine-9999.ebuild | 12 ++++++++++++ |
| 13 |
1 file changed, 12 insertions(+) |
| 14 |
|
| 15 |
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild |
| 16 |
index 4c1b6f4..b44030b 100644 |
| 17 |
--- a/app-emulation/wine/wine-9999.ebuild |
| 18 |
+++ b/app-emulation/wine/wine-9999.ebuild |
| 19 |
@@ -204,9 +204,21 @@ src_unpack() { |
| 20 |
if [[ ${PV} == "9999" ]] ; then |
| 21 |
git-r3_src_unpack |
| 22 |
if use staging; then |
| 23 |
+ local WINE_COMMIT=${EGIT_VERSION} |
| 24 |
+ |
| 25 |
EGIT_REPO_URI=${STAGING_EGIT_REPO_URI} |
| 26 |
unset ${PN}_LIVE_REPO; |
| 27 |
+ unset EGIT_COMMIT; |
| 28 |
+ |
| 29 |
EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack |
| 30 |
+ |
| 31 |
+ local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 32 |
+ |
| 33 |
+ if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then |
| 34 |
+ einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 35 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_COMMIT." |
| 36 |
+ einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine" |
| 37 |
+ fi |
| 38 |
fi |
| 39 |
else |
| 40 |
unpack ${P}.tar.bz2 |
Archives