| 1 |
commit: 432a658c2efd850e5877a05dac32504ea846f101 |
| 2 |
Author: Rob Walker <bob.mt.wya <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Oct 21 18:00:32 2018 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 22 23:32:59 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=432a658c |
| 7 |
|
| 8 |
app-emulation/wine-any: migrate to git-r3.eclass EGIT_OVERRIDE* APIs |
| 9 |
|
| 10 |
See: https://xxoo.ws/gentoo/portage/commit/17d7a4564177b1985e4b7e8f23a8efbc4d5c32ae |
| 11 |
|
| 12 |
Signed-off-by: Rob Walker <bob.mt.wya <AT> gmail.com> |
| 13 |
|
| 14 |
app-emulation/wine-any/wine-any-2.0-r1.ebuild | 29 ++++++++++++++------------ |
| 15 |
app-emulation/wine-any/wine-any-2.1-r1.ebuild | 29 ++++++++++++++------------ |
| 16 |
app-emulation/wine-any/wine-any-2.10-r1.ebuild | 29 ++++++++++++++------------ |
| 17 |
app-emulation/wine-any/wine-any-2.11-r1.ebuild | 29 ++++++++++++++------------ |
| 18 |
app-emulation/wine-any/wine-any-2.12-r1.ebuild | 29 ++++++++++++++------------ |
| 19 |
app-emulation/wine-any/wine-any-2.13-r1.ebuild | 29 ++++++++++++++------------ |
| 20 |
app-emulation/wine-any/wine-any-2.14-r1.ebuild | 29 ++++++++++++++------------ |
| 21 |
app-emulation/wine-any/wine-any-2.15-r1.ebuild | 29 ++++++++++++++------------ |
| 22 |
app-emulation/wine-any/wine-any-2.16-r1.ebuild | 29 ++++++++++++++------------ |
| 23 |
app-emulation/wine-any/wine-any-2.17-r1.ebuild | 29 ++++++++++++++------------ |
| 24 |
app-emulation/wine-any/wine-any-2.18.ebuild | 29 ++++++++++++++------------ |
| 25 |
app-emulation/wine-any/wine-any-2.19.ebuild | 29 ++++++++++++++------------ |
| 26 |
app-emulation/wine-any/wine-any-2.2-r1.ebuild | 29 ++++++++++++++------------ |
| 27 |
app-emulation/wine-any/wine-any-2.20.ebuild | 29 ++++++++++++++------------ |
| 28 |
app-emulation/wine-any/wine-any-2.21.ebuild | 29 ++++++++++++++------------ |
| 29 |
app-emulation/wine-any/wine-any-2.3-r1.ebuild | 29 ++++++++++++++------------ |
| 30 |
app-emulation/wine-any/wine-any-2.4-r1.ebuild | 29 ++++++++++++++------------ |
| 31 |
app-emulation/wine-any/wine-any-2.5-r1.ebuild | 29 ++++++++++++++------------ |
| 32 |
app-emulation/wine-any/wine-any-2.6-r1.ebuild | 29 ++++++++++++++------------ |
| 33 |
app-emulation/wine-any/wine-any-2.7-r1.ebuild | 29 ++++++++++++++------------ |
| 34 |
app-emulation/wine-any/wine-any-2.8-r1.ebuild | 29 ++++++++++++++------------ |
| 35 |
app-emulation/wine-any/wine-any-2.9-r1.ebuild | 29 ++++++++++++++------------ |
| 36 |
app-emulation/wine-any/wine-any-3.10.ebuild | 29 ++++++++++++++------------ |
| 37 |
app-emulation/wine-any/wine-any-3.11.ebuild | 29 ++++++++++++++------------ |
| 38 |
app-emulation/wine-any/wine-any-3.12.ebuild | 29 ++++++++++++++------------ |
| 39 |
app-emulation/wine-any/wine-any-3.13-r1.ebuild | 29 ++++++++++++++------------ |
| 40 |
app-emulation/wine-any/wine-any-3.13.ebuild | 29 ++++++++++++++------------ |
| 41 |
app-emulation/wine-any/wine-any-3.14.ebuild | 29 ++++++++++++++------------ |
| 42 |
app-emulation/wine-any/wine-any-3.15.ebuild | 29 ++++++++++++++------------ |
| 43 |
app-emulation/wine-any/wine-any-3.16.ebuild | 29 ++++++++++++++------------ |
| 44 |
app-emulation/wine-any/wine-any-3.17.ebuild | 29 ++++++++++++++------------ |
| 45 |
app-emulation/wine-any/wine-any-3.18.ebuild | 29 ++++++++++++++------------ |
| 46 |
app-emulation/wine-any/wine-any-3.3.ebuild | 29 ++++++++++++++------------ |
| 47 |
app-emulation/wine-any/wine-any-3.4.ebuild | 29 ++++++++++++++------------ |
| 48 |
app-emulation/wine-any/wine-any-3.5.ebuild | 29 ++++++++++++++------------ |
| 49 |
app-emulation/wine-any/wine-any-3.6.ebuild | 29 ++++++++++++++------------ |
| 50 |
app-emulation/wine-any/wine-any-3.7.ebuild | 29 ++++++++++++++------------ |
| 51 |
app-emulation/wine-any/wine-any-3.8.ebuild | 29 ++++++++++++++------------ |
| 52 |
app-emulation/wine-any/wine-any-3.9.ebuild | 29 ++++++++++++++------------ |
| 53 |
app-emulation/wine-any/wine-any-9999.ebuild | 29 ++++++++++++++------------ |
| 54 |
40 files changed, 640 insertions(+), 520 deletions(-) |
| 55 |
|
| 56 |
diff --git a/app-emulation/wine-any/wine-any-2.0-r1.ebuild b/app-emulation/wine-any/wine-any-2.0-r1.ebuild |
| 57 |
index 965b375..2720a6c 100644 |
| 58 |
--- a/app-emulation/wine-any/wine-any-2.0-r1.ebuild |
| 59 |
+++ b/app-emulation/wine-any/wine-any-2.0-r1.ebuild |
| 60 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 61 |
if use staging || use d3d9; then |
| 62 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 63 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 64 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 65 |
+ eerror "environment variables:" |
| 66 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 67 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 68 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 69 |
eerror |
| 70 |
return 1 |
| 71 |
fi |
| 72 |
fi |
| 73 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 74 |
- eerror "Commits must now be specified using the environmental variables" |
| 75 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 76 |
+ eerror "Commits must now be specified using the environment variables:" |
| 77 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 78 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 79 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 80 |
eerror |
| 81 |
return 1 |
| 82 |
fi |
| 83 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 84 |
|
| 85 |
src_unpack() { |
| 86 |
if [[ ${PV} == "9999" ]] ; then |
| 87 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 88 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 89 |
if use staging; then |
| 90 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 91 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 92 |
|
| 93 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 94 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 95 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 96 |
|
| 97 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 98 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 99 |
|
| 100 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 101 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 102 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 103 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 104 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 105 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 106 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 107 |
fi |
| 108 |
fi |
| 109 |
if use d3d9; then |
| 110 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 111 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 112 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 113 |
fi |
| 114 |
fi |
| 115 |
|
| 116 |
|
| 117 |
diff --git a/app-emulation/wine-any/wine-any-2.1-r1.ebuild b/app-emulation/wine-any/wine-any-2.1-r1.ebuild |
| 118 |
index e220465..a0ce41b 100644 |
| 119 |
--- a/app-emulation/wine-any/wine-any-2.1-r1.ebuild |
| 120 |
+++ b/app-emulation/wine-any/wine-any-2.1-r1.ebuild |
| 121 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 122 |
if use staging || use d3d9; then |
| 123 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 124 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 125 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 126 |
+ eerror "environment variables:" |
| 127 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 128 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 129 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 130 |
eerror |
| 131 |
return 1 |
| 132 |
fi |
| 133 |
fi |
| 134 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 135 |
- eerror "Commits must now be specified using the environmental variables" |
| 136 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 137 |
+ eerror "Commits must now be specified using the environment variables:" |
| 138 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 139 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 140 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 141 |
eerror |
| 142 |
return 1 |
| 143 |
fi |
| 144 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 145 |
|
| 146 |
src_unpack() { |
| 147 |
if [[ ${PV} == "9999" ]] ; then |
| 148 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 149 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 150 |
if use staging; then |
| 151 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 152 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 153 |
|
| 154 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 155 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 156 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 157 |
|
| 158 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 159 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 160 |
|
| 161 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 162 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 163 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 164 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 165 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 166 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 167 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 168 |
fi |
| 169 |
fi |
| 170 |
if use d3d9; then |
| 171 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 172 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 173 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 174 |
fi |
| 175 |
fi |
| 176 |
|
| 177 |
|
| 178 |
diff --git a/app-emulation/wine-any/wine-any-2.10-r1.ebuild b/app-emulation/wine-any/wine-any-2.10-r1.ebuild |
| 179 |
index a3f63c7..0cf2159 100644 |
| 180 |
--- a/app-emulation/wine-any/wine-any-2.10-r1.ebuild |
| 181 |
+++ b/app-emulation/wine-any/wine-any-2.10-r1.ebuild |
| 182 |
@@ -277,14 +277,19 @@ wine_env_vcs_vars() { |
| 183 |
if use staging || use d3d9; then |
| 184 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 185 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 186 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 187 |
+ eerror "environment variables:" |
| 188 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 189 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 190 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 191 |
eerror |
| 192 |
return 1 |
| 193 |
fi |
| 194 |
fi |
| 195 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 196 |
- eerror "Commits must now be specified using the environmental variables" |
| 197 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 198 |
+ eerror "Commits must now be specified using the environment variables:" |
| 199 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 200 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 201 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 202 |
eerror |
| 203 |
return 1 |
| 204 |
fi |
| 205 |
@@ -323,24 +328,22 @@ pkg_setup() { |
| 206 |
|
| 207 |
src_unpack() { |
| 208 |
if [[ ${PV} == "9999" ]] ; then |
| 209 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 210 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 211 |
if use staging; then |
| 212 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 213 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 214 |
|
| 215 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 216 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 217 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 218 |
|
| 219 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 220 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 221 |
|
| 222 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 223 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 224 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 225 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 226 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 227 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 228 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 229 |
fi |
| 230 |
fi |
| 231 |
if use d3d9; then |
| 232 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 233 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 234 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 235 |
fi |
| 236 |
fi |
| 237 |
|
| 238 |
|
| 239 |
diff --git a/app-emulation/wine-any/wine-any-2.11-r1.ebuild b/app-emulation/wine-any/wine-any-2.11-r1.ebuild |
| 240 |
index a3f63c7..0cf2159 100644 |
| 241 |
--- a/app-emulation/wine-any/wine-any-2.11-r1.ebuild |
| 242 |
+++ b/app-emulation/wine-any/wine-any-2.11-r1.ebuild |
| 243 |
@@ -277,14 +277,19 @@ wine_env_vcs_vars() { |
| 244 |
if use staging || use d3d9; then |
| 245 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 246 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 247 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 248 |
+ eerror "environment variables:" |
| 249 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 250 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 251 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 252 |
eerror |
| 253 |
return 1 |
| 254 |
fi |
| 255 |
fi |
| 256 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 257 |
- eerror "Commits must now be specified using the environmental variables" |
| 258 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 259 |
+ eerror "Commits must now be specified using the environment variables:" |
| 260 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 261 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 262 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 263 |
eerror |
| 264 |
return 1 |
| 265 |
fi |
| 266 |
@@ -323,24 +328,22 @@ pkg_setup() { |
| 267 |
|
| 268 |
src_unpack() { |
| 269 |
if [[ ${PV} == "9999" ]] ; then |
| 270 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 271 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 272 |
if use staging; then |
| 273 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 274 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 275 |
|
| 276 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 277 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 278 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 279 |
|
| 280 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 281 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 282 |
|
| 283 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 284 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 285 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 286 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 287 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 288 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 289 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 290 |
fi |
| 291 |
fi |
| 292 |
if use d3d9; then |
| 293 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 294 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 295 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 296 |
fi |
| 297 |
fi |
| 298 |
|
| 299 |
|
| 300 |
diff --git a/app-emulation/wine-any/wine-any-2.12-r1.ebuild b/app-emulation/wine-any/wine-any-2.12-r1.ebuild |
| 301 |
index a3f63c7..0cf2159 100644 |
| 302 |
--- a/app-emulation/wine-any/wine-any-2.12-r1.ebuild |
| 303 |
+++ b/app-emulation/wine-any/wine-any-2.12-r1.ebuild |
| 304 |
@@ -277,14 +277,19 @@ wine_env_vcs_vars() { |
| 305 |
if use staging || use d3d9; then |
| 306 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 307 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 308 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 309 |
+ eerror "environment variables:" |
| 310 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 311 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 312 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 313 |
eerror |
| 314 |
return 1 |
| 315 |
fi |
| 316 |
fi |
| 317 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 318 |
- eerror "Commits must now be specified using the environmental variables" |
| 319 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 320 |
+ eerror "Commits must now be specified using the environment variables:" |
| 321 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 322 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 323 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 324 |
eerror |
| 325 |
return 1 |
| 326 |
fi |
| 327 |
@@ -323,24 +328,22 @@ pkg_setup() { |
| 328 |
|
| 329 |
src_unpack() { |
| 330 |
if [[ ${PV} == "9999" ]] ; then |
| 331 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 332 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 333 |
if use staging; then |
| 334 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 335 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 336 |
|
| 337 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 338 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 339 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 340 |
|
| 341 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 342 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 343 |
|
| 344 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 345 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 346 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 347 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 348 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 349 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 350 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 351 |
fi |
| 352 |
fi |
| 353 |
if use d3d9; then |
| 354 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 355 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 356 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 357 |
fi |
| 358 |
fi |
| 359 |
|
| 360 |
|
| 361 |
diff --git a/app-emulation/wine-any/wine-any-2.13-r1.ebuild b/app-emulation/wine-any/wine-any-2.13-r1.ebuild |
| 362 |
index a3f63c7..0cf2159 100644 |
| 363 |
--- a/app-emulation/wine-any/wine-any-2.13-r1.ebuild |
| 364 |
+++ b/app-emulation/wine-any/wine-any-2.13-r1.ebuild |
| 365 |
@@ -277,14 +277,19 @@ wine_env_vcs_vars() { |
| 366 |
if use staging || use d3d9; then |
| 367 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 368 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 369 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 370 |
+ eerror "environment variables:" |
| 371 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 372 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 373 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 374 |
eerror |
| 375 |
return 1 |
| 376 |
fi |
| 377 |
fi |
| 378 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 379 |
- eerror "Commits must now be specified using the environmental variables" |
| 380 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 381 |
+ eerror "Commits must now be specified using the environment variables:" |
| 382 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 383 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 384 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 385 |
eerror |
| 386 |
return 1 |
| 387 |
fi |
| 388 |
@@ -323,24 +328,22 @@ pkg_setup() { |
| 389 |
|
| 390 |
src_unpack() { |
| 391 |
if [[ ${PV} == "9999" ]] ; then |
| 392 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 393 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 394 |
if use staging; then |
| 395 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 396 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 397 |
|
| 398 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 399 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 400 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 401 |
|
| 402 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 403 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 404 |
|
| 405 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 406 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 407 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 408 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 409 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 410 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 411 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 412 |
fi |
| 413 |
fi |
| 414 |
if use d3d9; then |
| 415 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 416 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 417 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 418 |
fi |
| 419 |
fi |
| 420 |
|
| 421 |
|
| 422 |
diff --git a/app-emulation/wine-any/wine-any-2.14-r1.ebuild b/app-emulation/wine-any/wine-any-2.14-r1.ebuild |
| 423 |
index f01ddbb..91ec853 100644 |
| 424 |
--- a/app-emulation/wine-any/wine-any-2.14-r1.ebuild |
| 425 |
+++ b/app-emulation/wine-any/wine-any-2.14-r1.ebuild |
| 426 |
@@ -277,14 +277,19 @@ wine_env_vcs_vars() { |
| 427 |
if use staging || use d3d9; then |
| 428 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 429 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 430 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 431 |
+ eerror "environment variables:" |
| 432 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 433 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 434 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 435 |
eerror |
| 436 |
return 1 |
| 437 |
fi |
| 438 |
fi |
| 439 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 440 |
- eerror "Commits must now be specified using the environmental variables" |
| 441 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 442 |
+ eerror "Commits must now be specified using the environment variables:" |
| 443 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 444 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 445 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 446 |
eerror |
| 447 |
return 1 |
| 448 |
fi |
| 449 |
@@ -323,24 +328,22 @@ pkg_setup() { |
| 450 |
|
| 451 |
src_unpack() { |
| 452 |
if [[ ${PV} == "9999" ]] ; then |
| 453 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 454 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 455 |
if use staging; then |
| 456 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 457 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 458 |
|
| 459 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 460 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 461 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 462 |
|
| 463 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 464 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 465 |
|
| 466 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 467 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 468 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 469 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 470 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 471 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 472 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 473 |
fi |
| 474 |
fi |
| 475 |
if use d3d9; then |
| 476 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 477 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 478 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 479 |
fi |
| 480 |
fi |
| 481 |
|
| 482 |
|
| 483 |
diff --git a/app-emulation/wine-any/wine-any-2.15-r1.ebuild b/app-emulation/wine-any/wine-any-2.15-r1.ebuild |
| 484 |
index f01ddbb..91ec853 100644 |
| 485 |
--- a/app-emulation/wine-any/wine-any-2.15-r1.ebuild |
| 486 |
+++ b/app-emulation/wine-any/wine-any-2.15-r1.ebuild |
| 487 |
@@ -277,14 +277,19 @@ wine_env_vcs_vars() { |
| 488 |
if use staging || use d3d9; then |
| 489 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 490 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 491 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 492 |
+ eerror "environment variables:" |
| 493 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 494 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 495 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 496 |
eerror |
| 497 |
return 1 |
| 498 |
fi |
| 499 |
fi |
| 500 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 501 |
- eerror "Commits must now be specified using the environmental variables" |
| 502 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 503 |
+ eerror "Commits must now be specified using the environment variables:" |
| 504 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 505 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 506 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 507 |
eerror |
| 508 |
return 1 |
| 509 |
fi |
| 510 |
@@ -323,24 +328,22 @@ pkg_setup() { |
| 511 |
|
| 512 |
src_unpack() { |
| 513 |
if [[ ${PV} == "9999" ]] ; then |
| 514 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 515 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 516 |
if use staging; then |
| 517 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 518 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 519 |
|
| 520 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 521 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 522 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 523 |
|
| 524 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 525 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 526 |
|
| 527 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 528 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 529 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 530 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 531 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 532 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 533 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 534 |
fi |
| 535 |
fi |
| 536 |
if use d3d9; then |
| 537 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 538 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 539 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 540 |
fi |
| 541 |
fi |
| 542 |
|
| 543 |
|
| 544 |
diff --git a/app-emulation/wine-any/wine-any-2.16-r1.ebuild b/app-emulation/wine-any/wine-any-2.16-r1.ebuild |
| 545 |
index f01ddbb..91ec853 100644 |
| 546 |
--- a/app-emulation/wine-any/wine-any-2.16-r1.ebuild |
| 547 |
+++ b/app-emulation/wine-any/wine-any-2.16-r1.ebuild |
| 548 |
@@ -277,14 +277,19 @@ wine_env_vcs_vars() { |
| 549 |
if use staging || use d3d9; then |
| 550 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 551 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 552 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 553 |
+ eerror "environment variables:" |
| 554 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 555 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 556 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 557 |
eerror |
| 558 |
return 1 |
| 559 |
fi |
| 560 |
fi |
| 561 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 562 |
- eerror "Commits must now be specified using the environmental variables" |
| 563 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 564 |
+ eerror "Commits must now be specified using the environment variables:" |
| 565 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 566 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 567 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 568 |
eerror |
| 569 |
return 1 |
| 570 |
fi |
| 571 |
@@ -323,24 +328,22 @@ pkg_setup() { |
| 572 |
|
| 573 |
src_unpack() { |
| 574 |
if [[ ${PV} == "9999" ]] ; then |
| 575 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 576 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 577 |
if use staging; then |
| 578 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 579 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 580 |
|
| 581 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 582 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 583 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 584 |
|
| 585 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 586 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 587 |
|
| 588 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 589 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 590 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 591 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 592 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 593 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 594 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 595 |
fi |
| 596 |
fi |
| 597 |
if use d3d9; then |
| 598 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 599 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 600 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 601 |
fi |
| 602 |
fi |
| 603 |
|
| 604 |
|
| 605 |
diff --git a/app-emulation/wine-any/wine-any-2.17-r1.ebuild b/app-emulation/wine-any/wine-any-2.17-r1.ebuild |
| 606 |
index f01ddbb..91ec853 100644 |
| 607 |
--- a/app-emulation/wine-any/wine-any-2.17-r1.ebuild |
| 608 |
+++ b/app-emulation/wine-any/wine-any-2.17-r1.ebuild |
| 609 |
@@ -277,14 +277,19 @@ wine_env_vcs_vars() { |
| 610 |
if use staging || use d3d9; then |
| 611 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 612 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 613 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 614 |
+ eerror "environment variables:" |
| 615 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 616 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 617 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 618 |
eerror |
| 619 |
return 1 |
| 620 |
fi |
| 621 |
fi |
| 622 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 623 |
- eerror "Commits must now be specified using the environmental variables" |
| 624 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 625 |
+ eerror "Commits must now be specified using the environment variables:" |
| 626 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 627 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 628 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 629 |
eerror |
| 630 |
return 1 |
| 631 |
fi |
| 632 |
@@ -323,24 +328,22 @@ pkg_setup() { |
| 633 |
|
| 634 |
src_unpack() { |
| 635 |
if [[ ${PV} == "9999" ]] ; then |
| 636 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 637 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 638 |
if use staging; then |
| 639 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 640 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 641 |
|
| 642 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 643 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 644 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 645 |
|
| 646 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 647 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 648 |
|
| 649 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 650 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 651 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 652 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 653 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 654 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 655 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 656 |
fi |
| 657 |
fi |
| 658 |
if use d3d9; then |
| 659 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 660 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 661 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 662 |
fi |
| 663 |
fi |
| 664 |
|
| 665 |
|
| 666 |
diff --git a/app-emulation/wine-any/wine-any-2.18.ebuild b/app-emulation/wine-any/wine-any-2.18.ebuild |
| 667 |
index 1505c2c..242fa95 100644 |
| 668 |
--- a/app-emulation/wine-any/wine-any-2.18.ebuild |
| 669 |
+++ b/app-emulation/wine-any/wine-any-2.18.ebuild |
| 670 |
@@ -273,14 +273,19 @@ wine_env_vcs_vars() { |
| 671 |
if use staging || use d3d9; then |
| 672 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 673 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 674 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 675 |
+ eerror "environment variables:" |
| 676 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 677 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 678 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 679 |
eerror |
| 680 |
return 1 |
| 681 |
fi |
| 682 |
fi |
| 683 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 684 |
- eerror "Commits must now be specified using the environmental variables" |
| 685 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 686 |
+ eerror "Commits must now be specified using the environment variables:" |
| 687 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 688 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 689 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 690 |
eerror |
| 691 |
return 1 |
| 692 |
fi |
| 693 |
@@ -319,24 +324,22 @@ pkg_setup() { |
| 694 |
|
| 695 |
src_unpack() { |
| 696 |
if [[ ${PV} == "9999" ]] ; then |
| 697 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 698 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 699 |
if use staging; then |
| 700 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 701 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 702 |
|
| 703 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 704 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 705 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 706 |
|
| 707 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 708 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 709 |
|
| 710 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 711 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 712 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 713 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 714 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 715 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 716 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 717 |
fi |
| 718 |
fi |
| 719 |
if use d3d9; then |
| 720 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 721 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 722 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 723 |
fi |
| 724 |
fi |
| 725 |
|
| 726 |
|
| 727 |
diff --git a/app-emulation/wine-any/wine-any-2.19.ebuild b/app-emulation/wine-any/wine-any-2.19.ebuild |
| 728 |
index 1505c2c..242fa95 100644 |
| 729 |
--- a/app-emulation/wine-any/wine-any-2.19.ebuild |
| 730 |
+++ b/app-emulation/wine-any/wine-any-2.19.ebuild |
| 731 |
@@ -273,14 +273,19 @@ wine_env_vcs_vars() { |
| 732 |
if use staging || use d3d9; then |
| 733 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 734 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 735 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 736 |
+ eerror "environment variables:" |
| 737 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 738 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 739 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 740 |
eerror |
| 741 |
return 1 |
| 742 |
fi |
| 743 |
fi |
| 744 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 745 |
- eerror "Commits must now be specified using the environmental variables" |
| 746 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 747 |
+ eerror "Commits must now be specified using the environment variables:" |
| 748 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 749 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 750 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 751 |
eerror |
| 752 |
return 1 |
| 753 |
fi |
| 754 |
@@ -319,24 +324,22 @@ pkg_setup() { |
| 755 |
|
| 756 |
src_unpack() { |
| 757 |
if [[ ${PV} == "9999" ]] ; then |
| 758 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 759 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 760 |
if use staging; then |
| 761 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 762 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 763 |
|
| 764 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 765 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 766 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 767 |
|
| 768 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 769 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 770 |
|
| 771 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 772 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 773 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 774 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 775 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 776 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 777 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 778 |
fi |
| 779 |
fi |
| 780 |
if use d3d9; then |
| 781 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 782 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 783 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 784 |
fi |
| 785 |
fi |
| 786 |
|
| 787 |
|
| 788 |
diff --git a/app-emulation/wine-any/wine-any-2.2-r1.ebuild b/app-emulation/wine-any/wine-any-2.2-r1.ebuild |
| 789 |
index 94cd965..e9a5ae0 100644 |
| 790 |
--- a/app-emulation/wine-any/wine-any-2.2-r1.ebuild |
| 791 |
+++ b/app-emulation/wine-any/wine-any-2.2-r1.ebuild |
| 792 |
@@ -292,14 +292,19 @@ wine_env_vcs_vars() { |
| 793 |
if use staging || use d3d9; then |
| 794 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 795 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 796 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 797 |
+ eerror "environment variables:" |
| 798 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 799 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 800 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 801 |
eerror |
| 802 |
return 1 |
| 803 |
fi |
| 804 |
fi |
| 805 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 806 |
- eerror "Commits must now be specified using the environmental variables" |
| 807 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 808 |
+ eerror "Commits must now be specified using the environment variables:" |
| 809 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 810 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 811 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 812 |
eerror |
| 813 |
return 1 |
| 814 |
fi |
| 815 |
@@ -338,24 +343,22 @@ pkg_setup() { |
| 816 |
|
| 817 |
src_unpack() { |
| 818 |
if [[ ${PV} == "9999" ]] ; then |
| 819 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 820 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 821 |
if use staging; then |
| 822 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 823 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 824 |
|
| 825 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 826 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 827 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 828 |
|
| 829 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 830 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 831 |
|
| 832 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 833 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 834 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 835 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 836 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 837 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 838 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 839 |
fi |
| 840 |
fi |
| 841 |
if use d3d9; then |
| 842 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 843 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 844 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 845 |
fi |
| 846 |
fi |
| 847 |
|
| 848 |
|
| 849 |
diff --git a/app-emulation/wine-any/wine-any-2.20.ebuild b/app-emulation/wine-any/wine-any-2.20.ebuild |
| 850 |
index be7481b..61da2c5 100644 |
| 851 |
--- a/app-emulation/wine-any/wine-any-2.20.ebuild |
| 852 |
+++ b/app-emulation/wine-any/wine-any-2.20.ebuild |
| 853 |
@@ -274,14 +274,19 @@ wine_env_vcs_vars() { |
| 854 |
if use staging || use d3d9; then |
| 855 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 856 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 857 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 858 |
+ eerror "environment variables:" |
| 859 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 860 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 861 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 862 |
eerror |
| 863 |
return 1 |
| 864 |
fi |
| 865 |
fi |
| 866 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 867 |
- eerror "Commits must now be specified using the environmental variables" |
| 868 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 869 |
+ eerror "Commits must now be specified using the environment variables:" |
| 870 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 871 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 872 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 873 |
eerror |
| 874 |
return 1 |
| 875 |
fi |
| 876 |
@@ -320,24 +325,22 @@ pkg_setup() { |
| 877 |
|
| 878 |
src_unpack() { |
| 879 |
if [[ ${PV} == "9999" ]] ; then |
| 880 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 881 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 882 |
if use staging; then |
| 883 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 884 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 885 |
|
| 886 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 887 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 888 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 889 |
|
| 890 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 891 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 892 |
|
| 893 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 894 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 895 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 896 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 897 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 898 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 899 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 900 |
fi |
| 901 |
fi |
| 902 |
if use d3d9; then |
| 903 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 904 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 905 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 906 |
fi |
| 907 |
fi |
| 908 |
|
| 909 |
|
| 910 |
diff --git a/app-emulation/wine-any/wine-any-2.21.ebuild b/app-emulation/wine-any/wine-any-2.21.ebuild |
| 911 |
index be7481b..61da2c5 100644 |
| 912 |
--- a/app-emulation/wine-any/wine-any-2.21.ebuild |
| 913 |
+++ b/app-emulation/wine-any/wine-any-2.21.ebuild |
| 914 |
@@ -274,14 +274,19 @@ wine_env_vcs_vars() { |
| 915 |
if use staging || use d3d9; then |
| 916 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 917 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 918 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 919 |
+ eerror "environment variables:" |
| 920 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 921 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 922 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 923 |
eerror |
| 924 |
return 1 |
| 925 |
fi |
| 926 |
fi |
| 927 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 928 |
- eerror "Commits must now be specified using the environmental variables" |
| 929 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 930 |
+ eerror "Commits must now be specified using the environment variables:" |
| 931 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 932 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 933 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 934 |
eerror |
| 935 |
return 1 |
| 936 |
fi |
| 937 |
@@ -320,24 +325,22 @@ pkg_setup() { |
| 938 |
|
| 939 |
src_unpack() { |
| 940 |
if [[ ${PV} == "9999" ]] ; then |
| 941 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 942 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 943 |
if use staging; then |
| 944 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 945 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 946 |
|
| 947 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 948 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 949 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 950 |
|
| 951 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 952 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 953 |
|
| 954 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 955 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 956 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 957 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 958 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 959 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 960 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 961 |
fi |
| 962 |
fi |
| 963 |
if use d3d9; then |
| 964 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 965 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 966 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 967 |
fi |
| 968 |
fi |
| 969 |
|
| 970 |
|
| 971 |
diff --git a/app-emulation/wine-any/wine-any-2.3-r1.ebuild b/app-emulation/wine-any/wine-any-2.3-r1.ebuild |
| 972 |
index e220465..a0ce41b 100644 |
| 973 |
--- a/app-emulation/wine-any/wine-any-2.3-r1.ebuild |
| 974 |
+++ b/app-emulation/wine-any/wine-any-2.3-r1.ebuild |
| 975 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 976 |
if use staging || use d3d9; then |
| 977 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 978 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 979 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 980 |
+ eerror "environment variables:" |
| 981 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 982 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 983 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 984 |
eerror |
| 985 |
return 1 |
| 986 |
fi |
| 987 |
fi |
| 988 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 989 |
- eerror "Commits must now be specified using the environmental variables" |
| 990 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 991 |
+ eerror "Commits must now be specified using the environment variables:" |
| 992 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 993 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 994 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 995 |
eerror |
| 996 |
return 1 |
| 997 |
fi |
| 998 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 999 |
|
| 1000 |
src_unpack() { |
| 1001 |
if [[ ${PV} == "9999" ]] ; then |
| 1002 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1003 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1004 |
if use staging; then |
| 1005 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1006 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1007 |
|
| 1008 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1009 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1010 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1011 |
|
| 1012 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1013 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1014 |
|
| 1015 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1016 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1017 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1018 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1019 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1020 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1021 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1022 |
fi |
| 1023 |
fi |
| 1024 |
if use d3d9; then |
| 1025 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1026 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1027 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1028 |
fi |
| 1029 |
fi |
| 1030 |
|
| 1031 |
|
| 1032 |
diff --git a/app-emulation/wine-any/wine-any-2.4-r1.ebuild b/app-emulation/wine-any/wine-any-2.4-r1.ebuild |
| 1033 |
index e71f989..aab1f37 100644 |
| 1034 |
--- a/app-emulation/wine-any/wine-any-2.4-r1.ebuild |
| 1035 |
+++ b/app-emulation/wine-any/wine-any-2.4-r1.ebuild |
| 1036 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 1037 |
if use staging || use d3d9; then |
| 1038 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1039 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1040 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1041 |
+ eerror "environment variables:" |
| 1042 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1043 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 1044 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1045 |
eerror |
| 1046 |
return 1 |
| 1047 |
fi |
| 1048 |
fi |
| 1049 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1050 |
- eerror "Commits must now be specified using the environmental variables" |
| 1051 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1052 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1053 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1054 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 1055 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1056 |
eerror |
| 1057 |
return 1 |
| 1058 |
fi |
| 1059 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 1060 |
|
| 1061 |
src_unpack() { |
| 1062 |
if [[ ${PV} == "9999" ]] ; then |
| 1063 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1064 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1065 |
if use staging; then |
| 1066 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1067 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1068 |
|
| 1069 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1070 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1071 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1072 |
|
| 1073 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1074 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1075 |
|
| 1076 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1077 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1078 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1079 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1080 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1081 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1082 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1083 |
fi |
| 1084 |
fi |
| 1085 |
if use d3d9; then |
| 1086 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1087 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1088 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1089 |
fi |
| 1090 |
fi |
| 1091 |
|
| 1092 |
|
| 1093 |
diff --git a/app-emulation/wine-any/wine-any-2.5-r1.ebuild b/app-emulation/wine-any/wine-any-2.5-r1.ebuild |
| 1094 |
index e71f989..aab1f37 100644 |
| 1095 |
--- a/app-emulation/wine-any/wine-any-2.5-r1.ebuild |
| 1096 |
+++ b/app-emulation/wine-any/wine-any-2.5-r1.ebuild |
| 1097 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 1098 |
if use staging || use d3d9; then |
| 1099 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1100 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1101 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1102 |
+ eerror "environment variables:" |
| 1103 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1104 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 1105 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1106 |
eerror |
| 1107 |
return 1 |
| 1108 |
fi |
| 1109 |
fi |
| 1110 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1111 |
- eerror "Commits must now be specified using the environmental variables" |
| 1112 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1113 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1114 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1115 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 1116 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1117 |
eerror |
| 1118 |
return 1 |
| 1119 |
fi |
| 1120 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 1121 |
|
| 1122 |
src_unpack() { |
| 1123 |
if [[ ${PV} == "9999" ]] ; then |
| 1124 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1125 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1126 |
if use staging; then |
| 1127 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1128 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1129 |
|
| 1130 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1131 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1132 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1133 |
|
| 1134 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1135 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1136 |
|
| 1137 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1138 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1139 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1140 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1141 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1142 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1143 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1144 |
fi |
| 1145 |
fi |
| 1146 |
if use d3d9; then |
| 1147 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1148 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1149 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1150 |
fi |
| 1151 |
fi |
| 1152 |
|
| 1153 |
|
| 1154 |
diff --git a/app-emulation/wine-any/wine-any-2.6-r1.ebuild b/app-emulation/wine-any/wine-any-2.6-r1.ebuild |
| 1155 |
index e71f989..aab1f37 100644 |
| 1156 |
--- a/app-emulation/wine-any/wine-any-2.6-r1.ebuild |
| 1157 |
+++ b/app-emulation/wine-any/wine-any-2.6-r1.ebuild |
| 1158 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 1159 |
if use staging || use d3d9; then |
| 1160 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1161 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1162 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1163 |
+ eerror "environment variables:" |
| 1164 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1165 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 1166 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1167 |
eerror |
| 1168 |
return 1 |
| 1169 |
fi |
| 1170 |
fi |
| 1171 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1172 |
- eerror "Commits must now be specified using the environmental variables" |
| 1173 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1174 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1175 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1176 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 1177 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1178 |
eerror |
| 1179 |
return 1 |
| 1180 |
fi |
| 1181 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 1182 |
|
| 1183 |
src_unpack() { |
| 1184 |
if [[ ${PV} == "9999" ]] ; then |
| 1185 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1186 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1187 |
if use staging; then |
| 1188 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1189 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1190 |
|
| 1191 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1192 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1193 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1194 |
|
| 1195 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1196 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1197 |
|
| 1198 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1199 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1200 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1201 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1202 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1203 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1204 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1205 |
fi |
| 1206 |
fi |
| 1207 |
if use d3d9; then |
| 1208 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1209 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1210 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1211 |
fi |
| 1212 |
fi |
| 1213 |
|
| 1214 |
|
| 1215 |
diff --git a/app-emulation/wine-any/wine-any-2.7-r1.ebuild b/app-emulation/wine-any/wine-any-2.7-r1.ebuild |
| 1216 |
index e71f989..aab1f37 100644 |
| 1217 |
--- a/app-emulation/wine-any/wine-any-2.7-r1.ebuild |
| 1218 |
+++ b/app-emulation/wine-any/wine-any-2.7-r1.ebuild |
| 1219 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 1220 |
if use staging || use d3d9; then |
| 1221 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1222 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1223 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1224 |
+ eerror "environment variables:" |
| 1225 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1226 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 1227 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1228 |
eerror |
| 1229 |
return 1 |
| 1230 |
fi |
| 1231 |
fi |
| 1232 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1233 |
- eerror "Commits must now be specified using the environmental variables" |
| 1234 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1235 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1236 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1237 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 1238 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1239 |
eerror |
| 1240 |
return 1 |
| 1241 |
fi |
| 1242 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 1243 |
|
| 1244 |
src_unpack() { |
| 1245 |
if [[ ${PV} == "9999" ]] ; then |
| 1246 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1247 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1248 |
if use staging; then |
| 1249 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1250 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1251 |
|
| 1252 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1253 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1254 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1255 |
|
| 1256 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1257 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1258 |
|
| 1259 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1260 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1261 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1262 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1263 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1264 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1265 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1266 |
fi |
| 1267 |
fi |
| 1268 |
if use d3d9; then |
| 1269 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1270 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1271 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1272 |
fi |
| 1273 |
fi |
| 1274 |
|
| 1275 |
|
| 1276 |
diff --git a/app-emulation/wine-any/wine-any-2.8-r1.ebuild b/app-emulation/wine-any/wine-any-2.8-r1.ebuild |
| 1277 |
index e71f989..aab1f37 100644 |
| 1278 |
--- a/app-emulation/wine-any/wine-any-2.8-r1.ebuild |
| 1279 |
+++ b/app-emulation/wine-any/wine-any-2.8-r1.ebuild |
| 1280 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 1281 |
if use staging || use d3d9; then |
| 1282 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1283 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1284 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1285 |
+ eerror "environment variables:" |
| 1286 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1287 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 1288 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1289 |
eerror |
| 1290 |
return 1 |
| 1291 |
fi |
| 1292 |
fi |
| 1293 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1294 |
- eerror "Commits must now be specified using the environmental variables" |
| 1295 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1296 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1297 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1298 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 1299 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1300 |
eerror |
| 1301 |
return 1 |
| 1302 |
fi |
| 1303 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 1304 |
|
| 1305 |
src_unpack() { |
| 1306 |
if [[ ${PV} == "9999" ]] ; then |
| 1307 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1308 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1309 |
if use staging; then |
| 1310 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1311 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1312 |
|
| 1313 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1314 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1315 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1316 |
|
| 1317 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1318 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1319 |
|
| 1320 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1321 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1322 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1323 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1324 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1325 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1326 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1327 |
fi |
| 1328 |
fi |
| 1329 |
if use d3d9; then |
| 1330 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1331 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1332 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1333 |
fi |
| 1334 |
fi |
| 1335 |
|
| 1336 |
|
| 1337 |
diff --git a/app-emulation/wine-any/wine-any-2.9-r1.ebuild b/app-emulation/wine-any/wine-any-2.9-r1.ebuild |
| 1338 |
index a3f63c7..0cf2159 100644 |
| 1339 |
--- a/app-emulation/wine-any/wine-any-2.9-r1.ebuild |
| 1340 |
+++ b/app-emulation/wine-any/wine-any-2.9-r1.ebuild |
| 1341 |
@@ -277,14 +277,19 @@ wine_env_vcs_vars() { |
| 1342 |
if use staging || use d3d9; then |
| 1343 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1344 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1345 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1346 |
+ eerror "environment variables:" |
| 1347 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1348 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 1349 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1350 |
eerror |
| 1351 |
return 1 |
| 1352 |
fi |
| 1353 |
fi |
| 1354 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1355 |
- eerror "Commits must now be specified using the environmental variables" |
| 1356 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1357 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1358 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1359 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
| 1360 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1361 |
eerror |
| 1362 |
return 1 |
| 1363 |
fi |
| 1364 |
@@ -323,24 +328,22 @@ pkg_setup() { |
| 1365 |
|
| 1366 |
src_unpack() { |
| 1367 |
if [[ ${PV} == "9999" ]] ; then |
| 1368 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1369 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1370 |
if use staging; then |
| 1371 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1372 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1373 |
|
| 1374 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1375 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1376 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1377 |
|
| 1378 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1379 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1380 |
|
| 1381 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1382 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1383 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1384 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1385 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1386 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1387 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1388 |
fi |
| 1389 |
fi |
| 1390 |
if use d3d9; then |
| 1391 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1392 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1393 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1394 |
fi |
| 1395 |
fi |
| 1396 |
|
| 1397 |
|
| 1398 |
diff --git a/app-emulation/wine-any/wine-any-3.10.ebuild b/app-emulation/wine-any/wine-any-3.10.ebuild |
| 1399 |
index fb02fa5..2a11d8c 100644 |
| 1400 |
--- a/app-emulation/wine-any/wine-any-3.10.ebuild |
| 1401 |
+++ b/app-emulation/wine-any/wine-any-3.10.ebuild |
| 1402 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 1403 |
if use staging || use d3d9; then |
| 1404 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1405 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1406 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1407 |
+ eerror "environment variables:" |
| 1408 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1409 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1410 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1411 |
eerror |
| 1412 |
return 1 |
| 1413 |
fi |
| 1414 |
fi |
| 1415 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1416 |
- eerror "Commits must now be specified using the environmental variables" |
| 1417 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1418 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1419 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1420 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1421 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1422 |
eerror |
| 1423 |
return 1 |
| 1424 |
fi |
| 1425 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 1426 |
|
| 1427 |
src_unpack() { |
| 1428 |
if [[ ${PV} == "9999" ]] ; then |
| 1429 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1430 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1431 |
if use staging; then |
| 1432 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1433 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1434 |
|
| 1435 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1436 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1437 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1438 |
|
| 1439 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1440 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1441 |
|
| 1442 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1443 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1444 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1445 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1446 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1447 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1448 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1449 |
fi |
| 1450 |
fi |
| 1451 |
if use d3d9; then |
| 1452 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1453 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1454 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1455 |
fi |
| 1456 |
fi |
| 1457 |
|
| 1458 |
|
| 1459 |
diff --git a/app-emulation/wine-any/wine-any-3.11.ebuild b/app-emulation/wine-any/wine-any-3.11.ebuild |
| 1460 |
index ef30453..74182b1 100644 |
| 1461 |
--- a/app-emulation/wine-any/wine-any-3.11.ebuild |
| 1462 |
+++ b/app-emulation/wine-any/wine-any-3.11.ebuild |
| 1463 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 1464 |
if use staging || use d3d9; then |
| 1465 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1466 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1467 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1468 |
+ eerror "environment variables:" |
| 1469 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1470 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1471 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1472 |
eerror |
| 1473 |
return 1 |
| 1474 |
fi |
| 1475 |
fi |
| 1476 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1477 |
- eerror "Commits must now be specified using the environmental variables" |
| 1478 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1479 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1480 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1481 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1482 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1483 |
eerror |
| 1484 |
return 1 |
| 1485 |
fi |
| 1486 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 1487 |
|
| 1488 |
src_unpack() { |
| 1489 |
if [[ ${PV} == "9999" ]] ; then |
| 1490 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1491 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1492 |
if use staging; then |
| 1493 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1494 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1495 |
|
| 1496 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1497 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1498 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1499 |
|
| 1500 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1501 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1502 |
|
| 1503 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1504 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1505 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1506 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1507 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1508 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1509 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1510 |
fi |
| 1511 |
fi |
| 1512 |
if use d3d9; then |
| 1513 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1514 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1515 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1516 |
fi |
| 1517 |
fi |
| 1518 |
|
| 1519 |
|
| 1520 |
diff --git a/app-emulation/wine-any/wine-any-3.12.ebuild b/app-emulation/wine-any/wine-any-3.12.ebuild |
| 1521 |
index c65730b..5062c56 100644 |
| 1522 |
--- a/app-emulation/wine-any/wine-any-3.12.ebuild |
| 1523 |
+++ b/app-emulation/wine-any/wine-any-3.12.ebuild |
| 1524 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 1525 |
if use staging || use d3d9; then |
| 1526 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1527 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1528 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1529 |
+ eerror "environment variables:" |
| 1530 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1531 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1532 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1533 |
eerror |
| 1534 |
return 1 |
| 1535 |
fi |
| 1536 |
fi |
| 1537 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1538 |
- eerror "Commits must now be specified using the environmental variables" |
| 1539 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1540 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1541 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1542 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1543 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1544 |
eerror |
| 1545 |
return 1 |
| 1546 |
fi |
| 1547 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 1548 |
|
| 1549 |
src_unpack() { |
| 1550 |
if [[ ${PV} == "9999" ]] ; then |
| 1551 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1552 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1553 |
if use staging; then |
| 1554 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1555 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1556 |
|
| 1557 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1558 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1559 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1560 |
|
| 1561 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1562 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1563 |
|
| 1564 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1565 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1566 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1567 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1568 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1569 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1570 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1571 |
fi |
| 1572 |
fi |
| 1573 |
if use d3d9; then |
| 1574 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1575 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1576 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1577 |
fi |
| 1578 |
fi |
| 1579 |
|
| 1580 |
|
| 1581 |
diff --git a/app-emulation/wine-any/wine-any-3.13-r1.ebuild b/app-emulation/wine-any/wine-any-3.13-r1.ebuild |
| 1582 |
index b82e8a2..53a8e58 100644 |
| 1583 |
--- a/app-emulation/wine-any/wine-any-3.13-r1.ebuild |
| 1584 |
+++ b/app-emulation/wine-any/wine-any-3.13-r1.ebuild |
| 1585 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 1586 |
if use staging || use d3d9; then |
| 1587 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1588 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1589 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1590 |
+ eerror "environment variables:" |
| 1591 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1592 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1593 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1594 |
eerror |
| 1595 |
return 1 |
| 1596 |
fi |
| 1597 |
fi |
| 1598 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1599 |
- eerror "Commits must now be specified using the environmental variables" |
| 1600 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1601 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1602 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1603 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1604 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1605 |
eerror |
| 1606 |
return 1 |
| 1607 |
fi |
| 1608 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 1609 |
|
| 1610 |
src_unpack() { |
| 1611 |
if [[ ${PV} == "9999" ]] ; then |
| 1612 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1613 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1614 |
if use staging; then |
| 1615 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1616 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1617 |
|
| 1618 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1619 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1620 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1621 |
|
| 1622 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1623 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1624 |
|
| 1625 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1626 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1627 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1628 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1629 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1630 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1631 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1632 |
fi |
| 1633 |
fi |
| 1634 |
if use d3d9; then |
| 1635 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1636 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1637 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1638 |
fi |
| 1639 |
fi |
| 1640 |
|
| 1641 |
|
| 1642 |
diff --git a/app-emulation/wine-any/wine-any-3.13.ebuild b/app-emulation/wine-any/wine-any-3.13.ebuild |
| 1643 |
index b82e8a2..53a8e58 100644 |
| 1644 |
--- a/app-emulation/wine-any/wine-any-3.13.ebuild |
| 1645 |
+++ b/app-emulation/wine-any/wine-any-3.13.ebuild |
| 1646 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 1647 |
if use staging || use d3d9; then |
| 1648 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1649 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1650 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1651 |
+ eerror "environment variables:" |
| 1652 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1653 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1654 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1655 |
eerror |
| 1656 |
return 1 |
| 1657 |
fi |
| 1658 |
fi |
| 1659 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1660 |
- eerror "Commits must now be specified using the environmental variables" |
| 1661 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1662 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1663 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1664 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1665 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1666 |
eerror |
| 1667 |
return 1 |
| 1668 |
fi |
| 1669 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 1670 |
|
| 1671 |
src_unpack() { |
| 1672 |
if [[ ${PV} == "9999" ]] ; then |
| 1673 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1674 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1675 |
if use staging; then |
| 1676 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1677 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1678 |
|
| 1679 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1680 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1681 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1682 |
|
| 1683 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1684 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1685 |
|
| 1686 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1687 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1688 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1689 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1690 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1691 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1692 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1693 |
fi |
| 1694 |
fi |
| 1695 |
if use d3d9; then |
| 1696 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1697 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1698 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1699 |
fi |
| 1700 |
fi |
| 1701 |
|
| 1702 |
|
| 1703 |
diff --git a/app-emulation/wine-any/wine-any-3.14.ebuild b/app-emulation/wine-any/wine-any-3.14.ebuild |
| 1704 |
index b82e8a2..53a8e58 100644 |
| 1705 |
--- a/app-emulation/wine-any/wine-any-3.14.ebuild |
| 1706 |
+++ b/app-emulation/wine-any/wine-any-3.14.ebuild |
| 1707 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 1708 |
if use staging || use d3d9; then |
| 1709 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1710 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1711 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1712 |
+ eerror "environment variables:" |
| 1713 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1714 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1715 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1716 |
eerror |
| 1717 |
return 1 |
| 1718 |
fi |
| 1719 |
fi |
| 1720 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1721 |
- eerror "Commits must now be specified using the environmental variables" |
| 1722 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1723 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1724 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1725 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1726 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1727 |
eerror |
| 1728 |
return 1 |
| 1729 |
fi |
| 1730 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 1731 |
|
| 1732 |
src_unpack() { |
| 1733 |
if [[ ${PV} == "9999" ]] ; then |
| 1734 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1735 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1736 |
if use staging; then |
| 1737 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1738 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1739 |
|
| 1740 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1741 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1742 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1743 |
|
| 1744 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1745 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1746 |
|
| 1747 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1748 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1749 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1750 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1751 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1752 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1753 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1754 |
fi |
| 1755 |
fi |
| 1756 |
if use d3d9; then |
| 1757 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1758 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1759 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1760 |
fi |
| 1761 |
fi |
| 1762 |
|
| 1763 |
|
| 1764 |
diff --git a/app-emulation/wine-any/wine-any-3.15.ebuild b/app-emulation/wine-any/wine-any-3.15.ebuild |
| 1765 |
index b82e8a2..53a8e58 100644 |
| 1766 |
--- a/app-emulation/wine-any/wine-any-3.15.ebuild |
| 1767 |
+++ b/app-emulation/wine-any/wine-any-3.15.ebuild |
| 1768 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 1769 |
if use staging || use d3d9; then |
| 1770 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1771 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1772 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1773 |
+ eerror "environment variables:" |
| 1774 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1775 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1776 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1777 |
eerror |
| 1778 |
return 1 |
| 1779 |
fi |
| 1780 |
fi |
| 1781 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1782 |
- eerror "Commits must now be specified using the environmental variables" |
| 1783 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1784 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1785 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1786 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1787 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1788 |
eerror |
| 1789 |
return 1 |
| 1790 |
fi |
| 1791 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 1792 |
|
| 1793 |
src_unpack() { |
| 1794 |
if [[ ${PV} == "9999" ]] ; then |
| 1795 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1796 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1797 |
if use staging; then |
| 1798 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1799 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1800 |
|
| 1801 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1802 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1803 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1804 |
|
| 1805 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1806 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1807 |
|
| 1808 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1809 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1810 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1811 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1812 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1813 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1814 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1815 |
fi |
| 1816 |
fi |
| 1817 |
if use d3d9; then |
| 1818 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1819 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1820 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1821 |
fi |
| 1822 |
fi |
| 1823 |
|
| 1824 |
|
| 1825 |
diff --git a/app-emulation/wine-any/wine-any-3.16.ebuild b/app-emulation/wine-any/wine-any-3.16.ebuild |
| 1826 |
index b82e8a2..53a8e58 100644 |
| 1827 |
--- a/app-emulation/wine-any/wine-any-3.16.ebuild |
| 1828 |
+++ b/app-emulation/wine-any/wine-any-3.16.ebuild |
| 1829 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 1830 |
if use staging || use d3d9; then |
| 1831 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1832 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1833 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1834 |
+ eerror "environment variables:" |
| 1835 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1836 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1837 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1838 |
eerror |
| 1839 |
return 1 |
| 1840 |
fi |
| 1841 |
fi |
| 1842 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1843 |
- eerror "Commits must now be specified using the environmental variables" |
| 1844 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1845 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1846 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1847 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1848 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1849 |
eerror |
| 1850 |
return 1 |
| 1851 |
fi |
| 1852 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 1853 |
|
| 1854 |
src_unpack() { |
| 1855 |
if [[ ${PV} == "9999" ]] ; then |
| 1856 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1857 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1858 |
if use staging; then |
| 1859 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1860 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1861 |
|
| 1862 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1863 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1864 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1865 |
|
| 1866 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1867 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1868 |
|
| 1869 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1870 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1871 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1872 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1873 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1874 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1875 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1876 |
fi |
| 1877 |
fi |
| 1878 |
if use d3d9; then |
| 1879 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1880 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1881 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1882 |
fi |
| 1883 |
fi |
| 1884 |
|
| 1885 |
|
| 1886 |
diff --git a/app-emulation/wine-any/wine-any-3.17.ebuild b/app-emulation/wine-any/wine-any-3.17.ebuild |
| 1887 |
index 9afa796..24ab26f 100644 |
| 1888 |
--- a/app-emulation/wine-any/wine-any-3.17.ebuild |
| 1889 |
+++ b/app-emulation/wine-any/wine-any-3.17.ebuild |
| 1890 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 1891 |
if use staging || use d3d9; then |
| 1892 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1893 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1894 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1895 |
+ eerror "environment variables:" |
| 1896 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1897 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1898 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1899 |
eerror |
| 1900 |
return 1 |
| 1901 |
fi |
| 1902 |
fi |
| 1903 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1904 |
- eerror "Commits must now be specified using the environmental variables" |
| 1905 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1906 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1907 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1908 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1909 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1910 |
eerror |
| 1911 |
return 1 |
| 1912 |
fi |
| 1913 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 1914 |
|
| 1915 |
src_unpack() { |
| 1916 |
if [[ ${PV} == "9999" ]] ; then |
| 1917 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1918 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1919 |
if use staging; then |
| 1920 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1921 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1922 |
|
| 1923 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1924 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1925 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1926 |
|
| 1927 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1928 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1929 |
|
| 1930 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1931 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1932 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1933 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1934 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1935 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1936 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1937 |
fi |
| 1938 |
fi |
| 1939 |
if use d3d9; then |
| 1940 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 1941 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 1942 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 1943 |
fi |
| 1944 |
fi |
| 1945 |
|
| 1946 |
|
| 1947 |
diff --git a/app-emulation/wine-any/wine-any-3.18.ebuild b/app-emulation/wine-any/wine-any-3.18.ebuild |
| 1948 |
index 9afa796..24ab26f 100644 |
| 1949 |
--- a/app-emulation/wine-any/wine-any-3.18.ebuild |
| 1950 |
+++ b/app-emulation/wine-any/wine-any-3.18.ebuild |
| 1951 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 1952 |
if use staging || use d3d9; then |
| 1953 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 1954 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 1955 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 1956 |
+ eerror "environment variables:" |
| 1957 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1958 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1959 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1960 |
eerror |
| 1961 |
return 1 |
| 1962 |
fi |
| 1963 |
fi |
| 1964 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 1965 |
- eerror "Commits must now be specified using the environmental variables" |
| 1966 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 1967 |
+ eerror "Commits must now be specified using the environment variables:" |
| 1968 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 1969 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 1970 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 1971 |
eerror |
| 1972 |
return 1 |
| 1973 |
fi |
| 1974 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 1975 |
|
| 1976 |
src_unpack() { |
| 1977 |
if [[ ${PV} == "9999" ]] ; then |
| 1978 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 1979 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 1980 |
if use staging; then |
| 1981 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 1982 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 1983 |
|
| 1984 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 1985 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 1986 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 1987 |
|
| 1988 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1989 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 1990 |
|
| 1991 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 1992 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 1993 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 1994 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 1995 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 1996 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 1997 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 1998 |
fi |
| 1999 |
fi |
| 2000 |
if use d3d9; then |
| 2001 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 2002 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 2003 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 2004 |
fi |
| 2005 |
fi |
| 2006 |
|
| 2007 |
|
| 2008 |
diff --git a/app-emulation/wine-any/wine-any-3.3.ebuild b/app-emulation/wine-any/wine-any-3.3.ebuild |
| 2009 |
index 257d598..877362e 100644 |
| 2010 |
--- a/app-emulation/wine-any/wine-any-3.3.ebuild |
| 2011 |
+++ b/app-emulation/wine-any/wine-any-3.3.ebuild |
| 2012 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 2013 |
if use staging || use d3d9; then |
| 2014 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 2015 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 2016 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 2017 |
+ eerror "environment variables:" |
| 2018 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2019 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2020 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2021 |
eerror |
| 2022 |
return 1 |
| 2023 |
fi |
| 2024 |
fi |
| 2025 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 2026 |
- eerror "Commits must now be specified using the environmental variables" |
| 2027 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 2028 |
+ eerror "Commits must now be specified using the environment variables:" |
| 2029 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2030 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2031 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2032 |
eerror |
| 2033 |
return 1 |
| 2034 |
fi |
| 2035 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 2036 |
|
| 2037 |
src_unpack() { |
| 2038 |
if [[ ${PV} == "9999" ]] ; then |
| 2039 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 2040 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 2041 |
if use staging; then |
| 2042 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 2043 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 2044 |
|
| 2045 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 2046 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 2047 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 2048 |
|
| 2049 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2050 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2051 |
|
| 2052 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 2053 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 2054 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 2055 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 2056 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 2057 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 2058 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 2059 |
fi |
| 2060 |
fi |
| 2061 |
if use d3d9; then |
| 2062 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 2063 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 2064 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 2065 |
fi |
| 2066 |
fi |
| 2067 |
|
| 2068 |
|
| 2069 |
diff --git a/app-emulation/wine-any/wine-any-3.4.ebuild b/app-emulation/wine-any/wine-any-3.4.ebuild |
| 2070 |
index 257d598..877362e 100644 |
| 2071 |
--- a/app-emulation/wine-any/wine-any-3.4.ebuild |
| 2072 |
+++ b/app-emulation/wine-any/wine-any-3.4.ebuild |
| 2073 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 2074 |
if use staging || use d3d9; then |
| 2075 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 2076 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 2077 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 2078 |
+ eerror "environment variables:" |
| 2079 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2080 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2081 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2082 |
eerror |
| 2083 |
return 1 |
| 2084 |
fi |
| 2085 |
fi |
| 2086 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 2087 |
- eerror "Commits must now be specified using the environmental variables" |
| 2088 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 2089 |
+ eerror "Commits must now be specified using the environment variables:" |
| 2090 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2091 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2092 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2093 |
eerror |
| 2094 |
return 1 |
| 2095 |
fi |
| 2096 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 2097 |
|
| 2098 |
src_unpack() { |
| 2099 |
if [[ ${PV} == "9999" ]] ; then |
| 2100 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 2101 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 2102 |
if use staging; then |
| 2103 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 2104 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 2105 |
|
| 2106 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 2107 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 2108 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 2109 |
|
| 2110 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2111 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2112 |
|
| 2113 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 2114 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 2115 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 2116 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 2117 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 2118 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 2119 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 2120 |
fi |
| 2121 |
fi |
| 2122 |
if use d3d9; then |
| 2123 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 2124 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 2125 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 2126 |
fi |
| 2127 |
fi |
| 2128 |
|
| 2129 |
|
| 2130 |
diff --git a/app-emulation/wine-any/wine-any-3.5.ebuild b/app-emulation/wine-any/wine-any-3.5.ebuild |
| 2131 |
index 257d598..877362e 100644 |
| 2132 |
--- a/app-emulation/wine-any/wine-any-3.5.ebuild |
| 2133 |
+++ b/app-emulation/wine-any/wine-any-3.5.ebuild |
| 2134 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 2135 |
if use staging || use d3d9; then |
| 2136 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 2137 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 2138 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 2139 |
+ eerror "environment variables:" |
| 2140 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2141 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2142 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2143 |
eerror |
| 2144 |
return 1 |
| 2145 |
fi |
| 2146 |
fi |
| 2147 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 2148 |
- eerror "Commits must now be specified using the environmental variables" |
| 2149 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 2150 |
+ eerror "Commits must now be specified using the environment variables:" |
| 2151 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2152 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2153 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2154 |
eerror |
| 2155 |
return 1 |
| 2156 |
fi |
| 2157 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 2158 |
|
| 2159 |
src_unpack() { |
| 2160 |
if [[ ${PV} == "9999" ]] ; then |
| 2161 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 2162 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 2163 |
if use staging; then |
| 2164 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 2165 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 2166 |
|
| 2167 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 2168 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 2169 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 2170 |
|
| 2171 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2172 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2173 |
|
| 2174 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 2175 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 2176 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 2177 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 2178 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 2179 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 2180 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 2181 |
fi |
| 2182 |
fi |
| 2183 |
if use d3d9; then |
| 2184 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 2185 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 2186 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 2187 |
fi |
| 2188 |
fi |
| 2189 |
|
| 2190 |
|
| 2191 |
diff --git a/app-emulation/wine-any/wine-any-3.6.ebuild b/app-emulation/wine-any/wine-any-3.6.ebuild |
| 2192 |
index 257d598..877362e 100644 |
| 2193 |
--- a/app-emulation/wine-any/wine-any-3.6.ebuild |
| 2194 |
+++ b/app-emulation/wine-any/wine-any-3.6.ebuild |
| 2195 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 2196 |
if use staging || use d3d9; then |
| 2197 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 2198 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 2199 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 2200 |
+ eerror "environment variables:" |
| 2201 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2202 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2203 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2204 |
eerror |
| 2205 |
return 1 |
| 2206 |
fi |
| 2207 |
fi |
| 2208 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 2209 |
- eerror "Commits must now be specified using the environmental variables" |
| 2210 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 2211 |
+ eerror "Commits must now be specified using the environment variables:" |
| 2212 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2213 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2214 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2215 |
eerror |
| 2216 |
return 1 |
| 2217 |
fi |
| 2218 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 2219 |
|
| 2220 |
src_unpack() { |
| 2221 |
if [[ ${PV} == "9999" ]] ; then |
| 2222 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 2223 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 2224 |
if use staging; then |
| 2225 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 2226 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 2227 |
|
| 2228 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 2229 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 2230 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 2231 |
|
| 2232 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2233 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2234 |
|
| 2235 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 2236 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 2237 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 2238 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 2239 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 2240 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 2241 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 2242 |
fi |
| 2243 |
fi |
| 2244 |
if use d3d9; then |
| 2245 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 2246 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 2247 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 2248 |
fi |
| 2249 |
fi |
| 2250 |
|
| 2251 |
|
| 2252 |
diff --git a/app-emulation/wine-any/wine-any-3.7.ebuild b/app-emulation/wine-any/wine-any-3.7.ebuild |
| 2253 |
index 257d598..877362e 100644 |
| 2254 |
--- a/app-emulation/wine-any/wine-any-3.7.ebuild |
| 2255 |
+++ b/app-emulation/wine-any/wine-any-3.7.ebuild |
| 2256 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 2257 |
if use staging || use d3d9; then |
| 2258 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 2259 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 2260 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 2261 |
+ eerror "environment variables:" |
| 2262 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2263 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2264 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2265 |
eerror |
| 2266 |
return 1 |
| 2267 |
fi |
| 2268 |
fi |
| 2269 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 2270 |
- eerror "Commits must now be specified using the environmental variables" |
| 2271 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 2272 |
+ eerror "Commits must now be specified using the environment variables:" |
| 2273 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2274 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2275 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2276 |
eerror |
| 2277 |
return 1 |
| 2278 |
fi |
| 2279 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 2280 |
|
| 2281 |
src_unpack() { |
| 2282 |
if [[ ${PV} == "9999" ]] ; then |
| 2283 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 2284 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 2285 |
if use staging; then |
| 2286 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 2287 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 2288 |
|
| 2289 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 2290 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 2291 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 2292 |
|
| 2293 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2294 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2295 |
|
| 2296 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 2297 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 2298 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 2299 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 2300 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 2301 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 2302 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 2303 |
fi |
| 2304 |
fi |
| 2305 |
if use d3d9; then |
| 2306 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 2307 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 2308 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 2309 |
fi |
| 2310 |
fi |
| 2311 |
|
| 2312 |
|
| 2313 |
diff --git a/app-emulation/wine-any/wine-any-3.8.ebuild b/app-emulation/wine-any/wine-any-3.8.ebuild |
| 2314 |
index 257d598..877362e 100644 |
| 2315 |
--- a/app-emulation/wine-any/wine-any-3.8.ebuild |
| 2316 |
+++ b/app-emulation/wine-any/wine-any-3.8.ebuild |
| 2317 |
@@ -276,14 +276,19 @@ wine_env_vcs_vars() { |
| 2318 |
if use staging || use d3d9; then |
| 2319 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 2320 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 2321 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 2322 |
+ eerror "environment variables:" |
| 2323 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2324 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2325 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2326 |
eerror |
| 2327 |
return 1 |
| 2328 |
fi |
| 2329 |
fi |
| 2330 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 2331 |
- eerror "Commits must now be specified using the environmental variables" |
| 2332 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 2333 |
+ eerror "Commits must now be specified using the environment variables:" |
| 2334 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2335 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2336 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2337 |
eerror |
| 2338 |
return 1 |
| 2339 |
fi |
| 2340 |
@@ -322,24 +327,22 @@ pkg_setup() { |
| 2341 |
|
| 2342 |
src_unpack() { |
| 2343 |
if [[ ${PV} == "9999" ]] ; then |
| 2344 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 2345 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 2346 |
if use staging; then |
| 2347 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 2348 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 2349 |
|
| 2350 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 2351 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 2352 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 2353 |
|
| 2354 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2355 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2356 |
|
| 2357 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 2358 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 2359 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 2360 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 2361 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 2362 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 2363 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 2364 |
fi |
| 2365 |
fi |
| 2366 |
if use d3d9; then |
| 2367 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 2368 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 2369 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 2370 |
fi |
| 2371 |
fi |
| 2372 |
|
| 2373 |
|
| 2374 |
diff --git a/app-emulation/wine-any/wine-any-3.9.ebuild b/app-emulation/wine-any/wine-any-3.9.ebuild |
| 2375 |
index fb02fa5..2a11d8c 100644 |
| 2376 |
--- a/app-emulation/wine-any/wine-any-3.9.ebuild |
| 2377 |
+++ b/app-emulation/wine-any/wine-any-3.9.ebuild |
| 2378 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 2379 |
if use staging || use d3d9; then |
| 2380 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 2381 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 2382 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 2383 |
+ eerror "environment variables:" |
| 2384 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2385 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2386 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2387 |
eerror |
| 2388 |
return 1 |
| 2389 |
fi |
| 2390 |
fi |
| 2391 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 2392 |
- eerror "Commits must now be specified using the environmental variables" |
| 2393 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 2394 |
+ eerror "Commits must now be specified using the environment variables:" |
| 2395 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2396 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2397 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2398 |
eerror |
| 2399 |
return 1 |
| 2400 |
fi |
| 2401 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 2402 |
|
| 2403 |
src_unpack() { |
| 2404 |
if [[ ${PV} == "9999" ]] ; then |
| 2405 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 2406 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 2407 |
if use staging; then |
| 2408 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 2409 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 2410 |
|
| 2411 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 2412 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 2413 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 2414 |
|
| 2415 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2416 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2417 |
|
| 2418 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 2419 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 2420 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 2421 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 2422 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 2423 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 2424 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 2425 |
fi |
| 2426 |
fi |
| 2427 |
if use d3d9; then |
| 2428 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 2429 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 2430 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 2431 |
fi |
| 2432 |
fi |
| 2433 |
|
| 2434 |
|
| 2435 |
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild |
| 2436 |
index b82e8a2..53a8e58 100644 |
| 2437 |
--- a/app-emulation/wine-any/wine-any-9999.ebuild |
| 2438 |
+++ b/app-emulation/wine-any/wine-any-9999.ebuild |
| 2439 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 2440 |
if use staging || use d3d9; then |
| 2441 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 2442 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 2443 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 2444 |
+ eerror "environment variables:" |
| 2445 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2446 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2447 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2448 |
eerror |
| 2449 |
return 1 |
| 2450 |
fi |
| 2451 |
fi |
| 2452 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 2453 |
- eerror "Commits must now be specified using the environmental variables" |
| 2454 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 2455 |
+ eerror "Commits must now be specified using the environment variables:" |
| 2456 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 2457 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 2458 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 2459 |
eerror |
| 2460 |
return 1 |
| 2461 |
fi |
| 2462 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 2463 |
|
| 2464 |
src_unpack() { |
| 2465 |
if [[ ${PV} == "9999" ]] ; then |
| 2466 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 2467 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 2468 |
if use staging; then |
| 2469 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 2470 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 2471 |
|
| 2472 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 2473 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 2474 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 2475 |
|
| 2476 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2477 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 2478 |
|
| 2479 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 2480 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 2481 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 2482 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 2483 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 2484 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 2485 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 2486 |
fi |
| 2487 |
fi |
| 2488 |
if use d3d9; then |
| 2489 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 2490 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 2491 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 2492 |
fi |
| 2493 |
fi |
Archives