commit: ba956c8e2dcedd1265a19432fc38297c4d6e2e8c
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 04:23:38 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 19:07:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba956c8e
app-emulation/wine: Fix use of env vars for 9999
Package-Manager: portage-2.3.0
app-emulation/wine/wine-1.8-r3.ebuild | 34 ++++++++++++++++++++++++------
app-emulation/wine/wine-1.8.1-r3.ebuild | 34 ++++++++++++++++++++++++------
app-emulation/wine/wine-1.8.2-r2.ebuild | 34 ++++++++++++++++++++++++------
app-emulation/wine/wine-1.8.3-r1.ebuild | 34 ++++++++++++++++++++++++------
app-emulation/wine/wine-1.9.10-r3.ebuild | 36 +++++++++++++++++++++++++-------
app-emulation/wine/wine-1.9.11-r3.ebuild | 36 +++++++++++++++++++++++++-------
app-emulation/wine/wine-1.9.12-r2.ebuild | 36 +++++++++++++++++++++++++-------
app-emulation/wine/wine-1.9.13-r2.ebuild | 36 +++++++++++++++++++++++++-------
app-emulation/wine/wine-1.9.14-r2.ebuild | 36 +++++++++++++++++++++++++-------
app-emulation/wine/wine-1.9.15-r1.ebuild | 36 +++++++++++++++++++++++++-------
app-emulation/wine/wine-1.9.16.ebuild | 36 +++++++++++++++++++++++++-------
app-emulation/wine/wine-1.9.17.ebuild | 36 +++++++++++++++++++++++++-------
app-emulation/wine/wine-1.9.4-r3.ebuild | 34 ++++++++++++++++++++++++------
app-emulation/wine/wine-1.9.5-r3.ebuild | 34 ++++++++++++++++++++++++------
app-emulation/wine/wine-1.9.6-r3.ebuild | 34 ++++++++++++++++++++++++------
app-emulation/wine/wine-1.9.7-r3.ebuild | 34 ++++++++++++++++++++++++------
app-emulation/wine/wine-1.9.8-r2.ebuild | 34 ++++++++++++++++++++++++------
app-emulation/wine/wine-1.9.9-r3.ebuild | 36 +++++++++++++++++++++++++-------
app-emulation/wine/wine-9999.ebuild | 36 +++++++++++++++++++++++++-------
19 files changed, 542 insertions(+), 124 deletions(-)
diff --git a/app-emulation/wine/wine-1.8-r3.ebuild
b/app-emulation/wine/wine-1.8-r3.ebuild
index ad22c09..14de6ad 100644
--- a/app-emulation/wine/wine-1.8-r3.ebuild
+++ b/app-emulation/wine/wine-1.8-r3.ebuild
@@ -246,6 +246,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -263,6 +284,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -274,19 +296,19 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
fi
diff --git a/app-emulation/wine/wine-1.8.1-r3.ebuild
b/app-emulation/wine/wine-1.8.1-r3.ebuild
index 56ea43c..c83c20d 100644
--- a/app-emulation/wine/wine-1.8.1-r3.ebuild
+++ b/app-emulation/wine/wine-1.8.1-r3.ebuild
@@ -247,6 +247,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -264,6 +285,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -275,19 +297,19 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
fi
diff --git a/app-emulation/wine/wine-1.8.2-r2.ebuild
b/app-emulation/wine/wine-1.8.2-r2.ebuild
index 2276923..43c0243 100644
--- a/app-emulation/wine/wine-1.8.2-r2.ebuild
+++ b/app-emulation/wine/wine-1.8.2-r2.ebuild
@@ -247,6 +247,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -264,6 +285,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -275,19 +297,19 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
fi
diff --git a/app-emulation/wine/wine-1.8.3-r1.ebuild
b/app-emulation/wine/wine-1.8.3-r1.ebuild
index 8ef5cc9..c856ece 100644
--- a/app-emulation/wine/wine-1.8.3-r1.ebuild
+++ b/app-emulation/wine/wine-1.8.3-r1.ebuild
@@ -247,6 +247,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -264,6 +285,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -275,19 +297,19 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
fi
diff --git a/app-emulation/wine/wine-1.9.10-r3.ebuild
b/app-emulation/wine/wine-1.9.10-r3.ebuild
index 0f8b69e..5012252 100644
--- a/app-emulation/wine/wine-1.9.10-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.10-r3.ebuild
@@ -254,6 +254,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -271,6 +292,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -282,23 +304,23 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
if use d3d9; then
- git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
fi
fi
diff --git a/app-emulation/wine/wine-1.9.11-r3.ebuild
b/app-emulation/wine/wine-1.9.11-r3.ebuild
index 0f8b69e..5012252 100644
--- a/app-emulation/wine/wine-1.9.11-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.11-r3.ebuild
@@ -254,6 +254,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -271,6 +292,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -282,23 +304,23 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
if use d3d9; then
- git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
fi
fi
diff --git a/app-emulation/wine/wine-1.9.12-r2.ebuild
b/app-emulation/wine/wine-1.9.12-r2.ebuild
index 46a6f20..6e2868f 100644
--- a/app-emulation/wine/wine-1.9.12-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.12-r2.ebuild
@@ -254,6 +254,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -271,6 +292,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -282,23 +304,23 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
if use d3d9; then
- git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
fi
fi
diff --git a/app-emulation/wine/wine-1.9.13-r2.ebuild
b/app-emulation/wine/wine-1.9.13-r2.ebuild
index 8bedf34..8c4e720 100644
--- a/app-emulation/wine/wine-1.9.13-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.13-r2.ebuild
@@ -254,6 +254,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -271,6 +292,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -282,23 +304,23 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
if use d3d9; then
- git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
fi
fi
diff --git a/app-emulation/wine/wine-1.9.14-r2.ebuild
b/app-emulation/wine/wine-1.9.14-r2.ebuild
index 8bedf34..8c4e720 100644
--- a/app-emulation/wine/wine-1.9.14-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.14-r2.ebuild
@@ -254,6 +254,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -271,6 +292,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -282,23 +304,23 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
if use d3d9; then
- git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
fi
fi
diff --git a/app-emulation/wine/wine-1.9.15-r1.ebuild
b/app-emulation/wine/wine-1.9.15-r1.ebuild
index 8bedf34..8c4e720 100644
--- a/app-emulation/wine/wine-1.9.15-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.15-r1.ebuild
@@ -254,6 +254,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -271,6 +292,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -282,23 +304,23 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
if use d3d9; then
- git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
fi
fi
diff --git a/app-emulation/wine/wine-1.9.16.ebuild
b/app-emulation/wine/wine-1.9.16.ebuild
index 8bedf34..8c4e720 100644
--- a/app-emulation/wine/wine-1.9.16.ebuild
+++ b/app-emulation/wine/wine-1.9.16.ebuild
@@ -254,6 +254,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -271,6 +292,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -282,23 +304,23 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
if use d3d9; then
- git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
fi
fi
diff --git a/app-emulation/wine/wine-1.9.17.ebuild
b/app-emulation/wine/wine-1.9.17.ebuild
index b5dad1f..4f8f3e9 100644
--- a/app-emulation/wine/wine-1.9.17.ebuild
+++ b/app-emulation/wine/wine-1.9.17.ebuild
@@ -254,6 +254,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -271,6 +292,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -282,23 +304,23 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
if use d3d9; then
- git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
fi
fi
diff --git a/app-emulation/wine/wine-1.9.4-r3.ebuild
b/app-emulation/wine/wine-1.9.4-r3.ebuild
index 6a4d343..9f75de1 100644
--- a/app-emulation/wine/wine-1.9.4-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.4-r3.ebuild
@@ -245,6 +245,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -262,6 +283,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -273,19 +295,19 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
fi
diff --git a/app-emulation/wine/wine-1.9.5-r3.ebuild
b/app-emulation/wine/wine-1.9.5-r3.ebuild
index e186513..c280dc5 100644
--- a/app-emulation/wine/wine-1.9.5-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.5-r3.ebuild
@@ -244,6 +244,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -261,6 +282,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -272,19 +294,19 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
fi
diff --git a/app-emulation/wine/wine-1.9.6-r3.ebuild
b/app-emulation/wine/wine-1.9.6-r3.ebuild
index d91273b..d77474b 100644
--- a/app-emulation/wine/wine-1.9.6-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.6-r3.ebuild
@@ -244,6 +244,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -261,6 +282,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -272,19 +294,19 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
fi
diff --git a/app-emulation/wine/wine-1.9.7-r3.ebuild
b/app-emulation/wine/wine-1.9.7-r3.ebuild
index d91273b..d77474b 100644
--- a/app-emulation/wine/wine-1.9.7-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.7-r3.ebuild
@@ -244,6 +244,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -261,6 +282,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -272,19 +294,19 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
fi
diff --git a/app-emulation/wine/wine-1.9.8-r2.ebuild
b/app-emulation/wine/wine-1.9.8-r2.ebuild
index cc1f86d..714463e 100644
--- a/app-emulation/wine/wine-1.9.8-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.8-r2.ebuild
@@ -244,6 +244,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -261,6 +282,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -272,19 +294,19 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
fi
diff --git a/app-emulation/wine/wine-1.9.9-r3.ebuild
b/app-emulation/wine/wine-1.9.9-r3.ebuild
index 24ef63d..180e41d 100644
--- a/app-emulation/wine/wine-1.9.9-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.9-r3.ebuild
@@ -254,6 +254,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -271,6 +292,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -282,23 +304,23 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
if use d3d9; then
- git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
fi
fi
diff --git a/app-emulation/wine/wine-9999.ebuild
b/app-emulation/wine/wine-9999.ebuild
index b5dad1f..4f8f3e9 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -254,6 +254,27 @@ wine_build_environment_check() {
fi
}
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${PN},
${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you
may use the"
+ eerror "environmental variables WINE_COMMIT,
STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ 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
+ return 1
+ fi
+}
+
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
@@ -271,6 +292,7 @@ pkg_pretend() {
pkg_setup() {
wine_build_environment_check || die
+ wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
@@ -282,23 +304,23 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
+ EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
- local WINE_COMMIT=${EGIT_VERSION}
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
- git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
"${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
- local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
+ local
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh"
--upstream-commit) || die
- if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ if [[ "${CURRENT_WINE_COMMIT}" !=
"${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not
guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with
the env var EGIT_COMMIT."
- einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
+ einfo "Example:
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
if use d3d9; then
- git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
fi
fi
