commit: a967b96f909b94a4a45bd4f22ecfe694a98dea9e Author: Rob Walker <bob.mt.wya <AT> gmail <DOT> com> AuthorDate: Sun Oct 21 18:50:46 2018 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Mon Oct 22 23:35:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=a967b96f
app-emulation/wine: migrate to git-r3.eclass EGIT_OVERRIDE* APIs See: https://xxoo.ws/gentoo/portage/commit/17d7a4564177b1985e4b7e8f23a8efbc4d5c32ae Signed-off-by: Rob Walker <bob.mt.wya <AT> gmail.com> app-emulation/wine/wine-2.0.ebuild | 2 +- app-emulation/wine/wine-2.1.ebuild | 21 ++++++++++++--------- app-emulation/wine/wine-2.2.ebuild | 21 ++++++++++++--------- app-emulation/wine/wine-2.3.ebuild | 21 ++++++++++++--------- app-emulation/wine/wine-9999.ebuild | 21 ++++++++++++--------- 5 files changed, 49 insertions(+), 37 deletions(-) diff --git a/app-emulation/wine/wine-2.0.ebuild b/app-emulation/wine/wine-2.0.ebuild index 99a23d9..093e5b8 100644 --- a/app-emulation/wine/wine-2.0.ebuild +++ b/app-emulation/wine/wine-2.0.ebuild @@ -248,7 +248,7 @@ pkg_setup() { src_unpack() { if [[ ${PV} == "9999" ]] ; then - EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + git-r3_src_unpack fi default diff --git a/app-emulation/wine/wine-2.1.ebuild b/app-emulation/wine/wine-2.1.ebuild index c0a183e..7605faf 100644 --- a/app-emulation/wine/wine-2.1.ebuild +++ b/app-emulation/wine/wine-2.1.ebuild @@ -281,14 +281,19 @@ wine_env_vcs_vars() { if use staging || use d3d9; then eerror "Because of the multi-repo nature of ${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 " 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_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + git-r3_src_unpack if use staging; then local CURRENT_WINE_COMMIT=${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 if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_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 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_WINE_COMMIT} 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 diff --git a/app-emulation/wine/wine-2.2.ebuild b/app-emulation/wine/wine-2.2.ebuild index c0a183e..7605faf 100644 --- a/app-emulation/wine/wine-2.2.ebuild +++ b/app-emulation/wine/wine-2.2.ebuild @@ -281,14 +281,19 @@ wine_env_vcs_vars() { if use staging || use d3d9; then eerror "Because of the multi-repo nature of ${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 " 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_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + git-r3_src_unpack if use staging; then local CURRENT_WINE_COMMIT=${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 if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_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 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_WINE_COMMIT} 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 diff --git a/app-emulation/wine/wine-2.3.ebuild b/app-emulation/wine/wine-2.3.ebuild index c0a183e..7605faf 100644 --- a/app-emulation/wine/wine-2.3.ebuild +++ b/app-emulation/wine/wine-2.3.ebuild @@ -281,14 +281,19 @@ wine_env_vcs_vars() { if use staging || use d3d9; then eerror "Because of the multi-repo nature of ${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 " 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_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + git-r3_src_unpack if use staging; then local CURRENT_WINE_COMMIT=${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 if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_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 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_WINE_COMMIT} 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 diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index a872411..16495a9 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -281,14 +281,19 @@ wine_env_vcs_vars() { if use staging || use d3d9; then eerror "Because of the multi-repo nature of ${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 " 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_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + git-r3_src_unpack if use staging; then local CURRENT_WINE_COMMIT=${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 if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_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 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_WINE_COMMIT} 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
