diff options
| author |   Rob Walker <bob.mt.wya@gmail.com> | 2018-10-21 19:00:32 +0100 |
|---|---|---|
| committer |   Nick Sarnie <sarnex@gentoo.org> | 2018-10-22 19:32:59 -0400 |
| commit | 432a658c2efd850e5877a05dac32504ea846f101 (patch) | |
| tree | 106a069f235bf656aa51b90ce7ddd9129bd59caa /app-emulation/wine-any/wine-any-2.3-r1.ebuild | |
| parent | app-emulation/wine-any: migrate to new eapi7-ver eclass (diff) | |
| download | wine-432a658c2efd850e5877a05dac32504ea846f101.tar.gz wine-432a658c2efd850e5877a05dac32504ea846f101.tar.bz2 wine-432a658c2efd850e5877a05dac32504ea846f101.zip | |
app-emulation/wine-any: migrate to git-r3.eclass EGIT_OVERRIDE* APIs
See: https://xxoo.ws/gentoo/portage/commit/17d7a4564177b1985e4b7e8f23a8efbc4d5c32ae
Signed-off-by: Rob Walker <bob.mt.wya@gmail.com>
Diffstat (limited to 'app-emulation/wine-any/wine-any-2.3-r1.ebuild')
| -rw-r--r-- | app-emulation/wine-any/wine-any-2.3-r1.ebuild | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/app-emulation/wine-any/wine-any-2.3-r1.ebuild b/app-emulation/wine-any/wine-any-2.3-r1.ebuild index e220465..a0ce41b 100644 --- a/app-emulation/wine-any/wine-any-2.3-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.3-r1.ebuild @@ -276,14 +276,19 @@ wine_env_vcs_vars() { if use staging || use d3d9; then eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" eerror "cannot be used to set the commit. Instead, you may use the" - eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." + eerror "environment variables:" + eerror " EGIT_OVERRIDE_COMMIT_WINE" + eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" eerror return 1 fi fi if [[ ! -z ${EGIT_COMMIT} ]]; then - eerror "Commits must now be specified using the environmental variables" - eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" + eerror "Commits must now be specified using the environment variables:" + eerror " EGIT_OVERRIDE_COMMIT_WINE" + eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" eerror return 1 fi @@ -322,24 +327,22 @@ pkg_setup() { src_unpack() { if [[ ${PV} == "9999" ]] ; then - EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack if use staging; then - local CURRENT_WINE_COMMIT=${EGIT_VERSION} + local CURRENT_COMMIT_WINE=${EGIT_VERSION} - git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" - git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" + EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack - local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die + local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die - if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then + if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; 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 WINE_COMMIT." - einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" + einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." + einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" fi fi if use d3d9; then - git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" - git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" + EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack fi fi |