[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/

["NP Hardass" <np-hardass@gentoo.org>]

commit:     4469bdbf74cebf43c949f218a202caf0f5b70f99
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 05:33:10 2016 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 05:33:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4469bdbf

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

Package-Manager: portage-2.2.26

 app-emulation/wine/wine-9999.ebuild | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 4c1b6f4..b44030b 100644
--- 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