app-emulation/wine: Check SHAs for staging compat, bug #572522

Package-Manager: portage-2.2.26

diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 4c1b6f446af0366ba370b1593a760dfd771aa804..b44030bba0e6b63997c7c6575a43d9dc0f47a95e 100644 (file)
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -204,9 +204,21 @@ src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
                git-r3_src_unpack
                if use staging; then
+                       local WINE_COMMIT=${EGIT_VERSION}
+
                        EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
                        unset ${PN}_LIVE_REPO;
+                       unset EGIT_COMMIT;
+
                        EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+
+                       local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+                       if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+                               einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+                               einfo "If src_prepare fails, try emerging with the env var EGIT_COMMIT."
+                               einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
+                       fi
                fi
        else
                unpack ${P}.tar.bz2