commit: 432a658c2efd850e5877a05dac32504ea846f101 Author: Rob Walker <bob.mt.wya <AT> gmail <DOT> com> AuthorDate: Sun Oct 21 18:00:32 2018 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Mon Oct 22 23:32:59 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=432a658c
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 <AT> gmail.com> app-emulation/wine-any/wine-any-2.0-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.1-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.10-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.11-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.12-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.13-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.14-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.15-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.16-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.17-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.18.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.19.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.2-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.20.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.21.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.3-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.4-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.5-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.6-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.7-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.8-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-2.9-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.10.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.11.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.12.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.13-r1.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.13.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.14.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.15.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.16.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.17.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.18.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.3.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.4.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.5.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.6.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.7.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.8.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-3.9.ebuild | 29 ++++++++++++++------------ app-emulation/wine-any/wine-any-9999.ebuild | 29 ++++++++++++++------------ 40 files changed, 640 insertions(+), 520 deletions(-) diff --git a/app-emulation/wine-any/wine-any-2.0-r1.ebuild b/app-emulation/wine-any/wine-any-2.0-r1.ebuild index 965b375..2720a6c 100644 --- a/app-emulation/wine-any/wine-any-2.0-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.0-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 diff --git a/app-emulation/wine-any/wine-any-2.1-r1.ebuild b/app-emulation/wine-any/wine-any-2.1-r1.ebuild index e220465..a0ce41b 100644 --- a/app-emulation/wine-any/wine-any-2.1-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.1-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 diff --git a/app-emulation/wine-any/wine-any-2.10-r1.ebuild b/app-emulation/wine-any/wine-any-2.10-r1.ebuild index a3f63c7..0cf2159 100644 --- a/app-emulation/wine-any/wine-any-2.10-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.10-r1.ebuild @@ -277,14 +277,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 @@ -323,24 +328,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 diff --git a/app-emulation/wine-any/wine-any-2.11-r1.ebuild b/app-emulation/wine-any/wine-any-2.11-r1.ebuild index a3f63c7..0cf2159 100644 --- a/app-emulation/wine-any/wine-any-2.11-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.11-r1.ebuild @@ -277,14 +277,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 @@ -323,24 +328,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 diff --git a/app-emulation/wine-any/wine-any-2.12-r1.ebuild b/app-emulation/wine-any/wine-any-2.12-r1.ebuild index a3f63c7..0cf2159 100644 --- a/app-emulation/wine-any/wine-any-2.12-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.12-r1.ebuild @@ -277,14 +277,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 @@ -323,24 +328,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 diff --git a/app-emulation/wine-any/wine-any-2.13-r1.ebuild b/app-emulation/wine-any/wine-any-2.13-r1.ebuild index a3f63c7..0cf2159 100644 --- a/app-emulation/wine-any/wine-any-2.13-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.13-r1.ebuild @@ -277,14 +277,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 @@ -323,24 +328,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 diff --git a/app-emulation/wine-any/wine-any-2.14-r1.ebuild b/app-emulation/wine-any/wine-any-2.14-r1.ebuild index f01ddbb..91ec853 100644 --- a/app-emulation/wine-any/wine-any-2.14-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.14-r1.ebuild @@ -277,14 +277,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 @@ -323,24 +328,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 diff --git a/app-emulation/wine-any/wine-any-2.15-r1.ebuild b/app-emulation/wine-any/wine-any-2.15-r1.ebuild index f01ddbb..91ec853 100644 --- a/app-emulation/wine-any/wine-any-2.15-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.15-r1.ebuild @@ -277,14 +277,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 @@ -323,24 +328,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 diff --git a/app-emulation/wine-any/wine-any-2.16-r1.ebuild b/app-emulation/wine-any/wine-any-2.16-r1.ebuild index f01ddbb..91ec853 100644 --- a/app-emulation/wine-any/wine-any-2.16-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.16-r1.ebuild @@ -277,14 +277,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 @@ -323,24 +328,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 diff --git a/app-emulation/wine-any/wine-any-2.17-r1.ebuild b/app-emulation/wine-any/wine-any-2.17-r1.ebuild index f01ddbb..91ec853 100644 --- a/app-emulation/wine-any/wine-any-2.17-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.17-r1.ebuild @@ -277,14 +277,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 @@ -323,24 +328,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 diff --git a/app-emulation/wine-any/wine-any-2.18.ebuild b/app-emulation/wine-any/wine-any-2.18.ebuild index 1505c2c..242fa95 100644 --- a/app-emulation/wine-any/wine-any-2.18.ebuild +++ b/app-emulation/wine-any/wine-any-2.18.ebuild @@ -273,14 +273,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 @@ -319,24 +324,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 diff --git a/app-emulation/wine-any/wine-any-2.19.ebuild b/app-emulation/wine-any/wine-any-2.19.ebuild index 1505c2c..242fa95 100644 --- a/app-emulation/wine-any/wine-any-2.19.ebuild +++ b/app-emulation/wine-any/wine-any-2.19.ebuild @@ -273,14 +273,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 @@ -319,24 +324,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 diff --git a/app-emulation/wine-any/wine-any-2.2-r1.ebuild b/app-emulation/wine-any/wine-any-2.2-r1.ebuild index 94cd965..e9a5ae0 100644 --- a/app-emulation/wine-any/wine-any-2.2-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.2-r1.ebuild @@ -292,14 +292,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 @@ -338,24 +343,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 diff --git a/app-emulation/wine-any/wine-any-2.20.ebuild b/app-emulation/wine-any/wine-any-2.20.ebuild index be7481b..61da2c5 100644 --- a/app-emulation/wine-any/wine-any-2.20.ebuild +++ b/app-emulation/wine-any/wine-any-2.20.ebuild @@ -274,14 +274,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 @@ -320,24 +325,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 diff --git a/app-emulation/wine-any/wine-any-2.21.ebuild b/app-emulation/wine-any/wine-any-2.21.ebuild index be7481b..61da2c5 100644 --- a/app-emulation/wine-any/wine-any-2.21.ebuild +++ b/app-emulation/wine-any/wine-any-2.21.ebuild @@ -274,14 +274,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 @@ -320,24 +325,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 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 diff --git a/app-emulation/wine-any/wine-any-2.4-r1.ebuild b/app-emulation/wine-any/wine-any-2.4-r1.ebuild index e71f989..aab1f37 100644 --- a/app-emulation/wine-any/wine-any-2.4-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.4-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 diff --git a/app-emulation/wine-any/wine-any-2.5-r1.ebuild b/app-emulation/wine-any/wine-any-2.5-r1.ebuild index e71f989..aab1f37 100644 --- a/app-emulation/wine-any/wine-any-2.5-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.5-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 diff --git a/app-emulation/wine-any/wine-any-2.6-r1.ebuild b/app-emulation/wine-any/wine-any-2.6-r1.ebuild index e71f989..aab1f37 100644 --- a/app-emulation/wine-any/wine-any-2.6-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.6-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 diff --git a/app-emulation/wine-any/wine-any-2.7-r1.ebuild b/app-emulation/wine-any/wine-any-2.7-r1.ebuild index e71f989..aab1f37 100644 --- a/app-emulation/wine-any/wine-any-2.7-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.7-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 diff --git a/app-emulation/wine-any/wine-any-2.8-r1.ebuild b/app-emulation/wine-any/wine-any-2.8-r1.ebuild index e71f989..aab1f37 100644 --- a/app-emulation/wine-any/wine-any-2.8-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.8-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 diff --git a/app-emulation/wine-any/wine-any-2.9-r1.ebuild b/app-emulation/wine-any/wine-any-2.9-r1.ebuild index a3f63c7..0cf2159 100644 --- a/app-emulation/wine-any/wine-any-2.9-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.9-r1.ebuild @@ -277,14 +277,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 @@ -323,24 +328,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 diff --git a/app-emulation/wine-any/wine-any-3.10.ebuild b/app-emulation/wine-any/wine-any-3.10.ebuild index fb02fa5..2a11d8c 100644 --- a/app-emulation/wine-any/wine-any-3.10.ebuild +++ b/app-emulation/wine-any/wine-any-3.10.ebuild @@ -278,14 +278,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_STAGING_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_STAGING_WINE_STAGING" + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" eerror return 1 fi @@ -324,24 +329,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 diff --git a/app-emulation/wine-any/wine-any-3.11.ebuild b/app-emulation/wine-any/wine-any-3.11.ebuild index ef30453..74182b1 100644 --- a/app-emulation/wine-any/wine-any-3.11.ebuild +++ b/app-emulation/wine-any/wine-any-3.11.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_STAGING_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_STAGING_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 diff --git a/app-emulation/wine-any/wine-any-3.12.ebuild b/app-emulation/wine-any/wine-any-3.12.ebuild index c65730b..5062c56 100644 --- a/app-emulation/wine-any/wine-any-3.12.ebuild +++ b/app-emulation/wine-any/wine-any-3.12.ebuild @@ -278,14 +278,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_STAGING_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_STAGING_WINE_STAGING" + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" eerror return 1 fi @@ -324,24 +329,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 diff --git a/app-emulation/wine-any/wine-any-3.13-r1.ebuild b/app-emulation/wine-any/wine-any-3.13-r1.ebuild index b82e8a2..53a8e58 100644 --- a/app-emulation/wine-any/wine-any-3.13-r1.ebuild +++ b/app-emulation/wine-any/wine-any-3.13-r1.ebuild @@ -278,14 +278,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_STAGING_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_STAGING_WINE_STAGING" + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" eerror return 1 fi @@ -324,24 +329,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 diff --git a/app-emulation/wine-any/wine-any-3.13.ebuild b/app-emulation/wine-any/wine-any-3.13.ebuild index b82e8a2..53a8e58 100644 --- a/app-emulation/wine-any/wine-any-3.13.ebuild +++ b/app-emulation/wine-any/wine-any-3.13.ebuild @@ -278,14 +278,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_STAGING_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_STAGING_WINE_STAGING" + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" eerror return 1 fi @@ -324,24 +329,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 diff --git a/app-emulation/wine-any/wine-any-3.14.ebuild b/app-emulation/wine-any/wine-any-3.14.ebuild index b82e8a2..53a8e58 100644 --- a/app-emulation/wine-any/wine-any-3.14.ebuild +++ b/app-emulation/wine-any/wine-any-3.14.ebuild @@ -278,14 +278,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_STAGING_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_STAGING_WINE_STAGING" + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" eerror return 1 fi @@ -324,24 +329,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 diff --git a/app-emulation/wine-any/wine-any-3.15.ebuild b/app-emulation/wine-any/wine-any-3.15.ebuild index b82e8a2..53a8e58 100644 --- a/app-emulation/wine-any/wine-any-3.15.ebuild +++ b/app-emulation/wine-any/wine-any-3.15.ebuild @@ -278,14 +278,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_STAGING_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_STAGING_WINE_STAGING" + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" eerror return 1 fi @@ -324,24 +329,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 diff --git a/app-emulation/wine-any/wine-any-3.16.ebuild b/app-emulation/wine-any/wine-any-3.16.ebuild index b82e8a2..53a8e58 100644 --- a/app-emulation/wine-any/wine-any-3.16.ebuild +++ b/app-emulation/wine-any/wine-any-3.16.ebuild @@ -278,14 +278,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_STAGING_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_STAGING_WINE_STAGING" + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" eerror return 1 fi @@ -324,24 +329,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 diff --git a/app-emulation/wine-any/wine-any-3.17.ebuild b/app-emulation/wine-any/wine-any-3.17.ebuild index 9afa796..24ab26f 100644 --- a/app-emulation/wine-any/wine-any-3.17.ebuild +++ b/app-emulation/wine-any/wine-any-3.17.ebuild @@ -278,14 +278,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_STAGING_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_STAGING_WINE_STAGING" + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" eerror return 1 fi @@ -324,24 +329,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 diff --git a/app-emulation/wine-any/wine-any-3.18.ebuild b/app-emulation/wine-any/wine-any-3.18.ebuild index 9afa796..24ab26f 100644 --- a/app-emulation/wine-any/wine-any-3.18.ebuild +++ b/app-emulation/wine-any/wine-any-3.18.ebuild @@ -278,14 +278,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_STAGING_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_STAGING_WINE_STAGING" + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" eerror return 1 fi @@ -324,24 +329,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 diff --git a/app-emulation/wine-any/wine-any-3.3.ebuild b/app-emulation/wine-any/wine-any-3.3.ebuild index 257d598..877362e 100644 --- a/app-emulation/wine-any/wine-any-3.3.ebuild +++ b/app-emulation/wine-any/wine-any-3.3.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_STAGING_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_STAGING_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 diff --git a/app-emulation/wine-any/wine-any-3.4.ebuild b/app-emulation/wine-any/wine-any-3.4.ebuild index 257d598..877362e 100644 --- a/app-emulation/wine-any/wine-any-3.4.ebuild +++ b/app-emulation/wine-any/wine-any-3.4.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_STAGING_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_STAGING_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 diff --git a/app-emulation/wine-any/wine-any-3.5.ebuild b/app-emulation/wine-any/wine-any-3.5.ebuild index 257d598..877362e 100644 --- a/app-emulation/wine-any/wine-any-3.5.ebuild +++ b/app-emulation/wine-any/wine-any-3.5.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_STAGING_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_STAGING_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 diff --git a/app-emulation/wine-any/wine-any-3.6.ebuild b/app-emulation/wine-any/wine-any-3.6.ebuild index 257d598..877362e 100644 --- a/app-emulation/wine-any/wine-any-3.6.ebuild +++ b/app-emulation/wine-any/wine-any-3.6.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_STAGING_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_STAGING_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 diff --git a/app-emulation/wine-any/wine-any-3.7.ebuild b/app-emulation/wine-any/wine-any-3.7.ebuild index 257d598..877362e 100644 --- a/app-emulation/wine-any/wine-any-3.7.ebuild +++ b/app-emulation/wine-any/wine-any-3.7.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_STAGING_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_STAGING_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 diff --git a/app-emulation/wine-any/wine-any-3.8.ebuild b/app-emulation/wine-any/wine-any-3.8.ebuild index 257d598..877362e 100644 --- a/app-emulation/wine-any/wine-any-3.8.ebuild +++ b/app-emulation/wine-any/wine-any-3.8.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_STAGING_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_STAGING_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 diff --git a/app-emulation/wine-any/wine-any-3.9.ebuild b/app-emulation/wine-any/wine-any-3.9.ebuild index fb02fa5..2a11d8c 100644 --- a/app-emulation/wine-any/wine-any-3.9.ebuild +++ b/app-emulation/wine-any/wine-any-3.9.ebuild @@ -278,14 +278,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_STAGING_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_STAGING_WINE_STAGING" + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" eerror return 1 fi @@ -324,24 +329,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 diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild index b82e8a2..53a8e58 100644 --- a/app-emulation/wine-any/wine-any-9999.ebuild +++ b/app-emulation/wine-any/wine-any-9999.ebuild @@ -278,14 +278,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_STAGING_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_STAGING_WINE_STAGING" + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" eerror return 1 fi @@ -324,24 +329,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
