1 |
commit: 6ce20ed04a18222843839d5d8b90d26497de6a64 |
2 |
Author: Rob Walker <bob.mt.wya <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Oct 21 13:05:10 2018 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 22 23:28:04 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=6ce20ed0 |
7 |
|
8 |
app-emulation/wine-staging: 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-staging/wine-staging-2.0-r1.ebuild | 16 +++++++++------- |
15 |
app-emulation/wine-staging/wine-staging-2.1-r1.ebuild | 16 +++++++++------- |
16 |
app-emulation/wine-staging/wine-staging-2.10-r1.ebuild | 16 +++++++++------- |
17 |
app-emulation/wine-staging/wine-staging-2.11-r1.ebuild | 16 +++++++++------- |
18 |
app-emulation/wine-staging/wine-staging-2.12-r1.ebuild | 16 +++++++++------- |
19 |
app-emulation/wine-staging/wine-staging-2.13-r1.ebuild | 16 +++++++++------- |
20 |
app-emulation/wine-staging/wine-staging-2.14-r1.ebuild | 16 +++++++++------- |
21 |
app-emulation/wine-staging/wine-staging-2.15-r1.ebuild | 16 +++++++++------- |
22 |
app-emulation/wine-staging/wine-staging-2.16-r1.ebuild | 16 +++++++++------- |
23 |
app-emulation/wine-staging/wine-staging-2.17-r1.ebuild | 16 +++++++++------- |
24 |
app-emulation/wine-staging/wine-staging-2.18.ebuild | 16 +++++++++------- |
25 |
app-emulation/wine-staging/wine-staging-2.19.ebuild | 16 +++++++++------- |
26 |
app-emulation/wine-staging/wine-staging-2.2-r1.ebuild | 16 +++++++++------- |
27 |
app-emulation/wine-staging/wine-staging-2.20.ebuild | 16 +++++++++------- |
28 |
app-emulation/wine-staging/wine-staging-2.21.ebuild | 16 +++++++++------- |
29 |
app-emulation/wine-staging/wine-staging-2.3-r1.ebuild | 16 +++++++++------- |
30 |
app-emulation/wine-staging/wine-staging-2.4-r1.ebuild | 16 +++++++++------- |
31 |
app-emulation/wine-staging/wine-staging-2.5-r1.ebuild | 16 +++++++++------- |
32 |
app-emulation/wine-staging/wine-staging-2.6-r1.ebuild | 16 +++++++++------- |
33 |
app-emulation/wine-staging/wine-staging-2.7-r1.ebuild | 16 +++++++++------- |
34 |
app-emulation/wine-staging/wine-staging-2.8-r1.ebuild | 16 +++++++++------- |
35 |
app-emulation/wine-staging/wine-staging-2.9-r1.ebuild | 16 +++++++++------- |
36 |
app-emulation/wine-staging/wine-staging-3.10.ebuild | 16 +++++++++------- |
37 |
app-emulation/wine-staging/wine-staging-3.11.ebuild | 16 +++++++++------- |
38 |
app-emulation/wine-staging/wine-staging-3.12.ebuild | 16 +++++++++------- |
39 |
app-emulation/wine-staging/wine-staging-3.13-r1.ebuild | 16 +++++++++------- |
40 |
app-emulation/wine-staging/wine-staging-3.13.ebuild | 16 +++++++++------- |
41 |
app-emulation/wine-staging/wine-staging-3.14.ebuild | 16 +++++++++------- |
42 |
app-emulation/wine-staging/wine-staging-3.15.ebuild | 16 +++++++++------- |
43 |
app-emulation/wine-staging/wine-staging-3.16.ebuild | 16 +++++++++------- |
44 |
app-emulation/wine-staging/wine-staging-3.17.ebuild | 16 +++++++++------- |
45 |
app-emulation/wine-staging/wine-staging-3.18.ebuild | 16 +++++++++------- |
46 |
app-emulation/wine-staging/wine-staging-3.3.ebuild | 16 +++++++++------- |
47 |
app-emulation/wine-staging/wine-staging-3.4.ebuild | 16 +++++++++------- |
48 |
app-emulation/wine-staging/wine-staging-3.5.ebuild | 16 +++++++++------- |
49 |
app-emulation/wine-staging/wine-staging-3.6.ebuild | 16 +++++++++------- |
50 |
app-emulation/wine-staging/wine-staging-3.7.ebuild | 16 +++++++++------- |
51 |
app-emulation/wine-staging/wine-staging-3.8.ebuild | 16 +++++++++------- |
52 |
app-emulation/wine-staging/wine-staging-3.9.ebuild | 16 +++++++++------- |
53 |
app-emulation/wine-staging/wine-staging-9999.ebuild | 16 +++++++++------- |
54 |
40 files changed, 360 insertions(+), 280 deletions(-) |
55 |
|
56 |
diff --git a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild |
57 |
index 2eb9fbd..e71203b 100644 |
58 |
--- a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild |
59 |
+++ b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild |
60 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
61 |
if use staging; 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, and STAGING_COMMIT." |
65 |
+ eerror "environment variables:" |
66 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
67 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
68 |
eerror |
69 |
return 1 |
70 |
fi |
71 |
fi |
72 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
73 |
- eerror "Commits must now be specified using the environmental variables" |
74 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
75 |
+ eerror "Commits must now be specified using the environment variables:" |
76 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
77 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
78 |
eerror |
79 |
return 1 |
80 |
fi |
81 |
@@ -312,19 +315,18 @@ pkg_setup() { |
82 |
|
83 |
src_unpack() { |
84 |
if [[ ${PV} == "9999" ]] ; then |
85 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
86 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
87 |
if use staging; then |
88 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
89 |
|
90 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
91 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
92 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
93 |
|
94 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
95 |
|
96 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
97 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
98 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
99 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
100 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
101 |
fi |
102 |
fi |
103 |
fi |
104 |
|
105 |
diff --git a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild |
106 |
index f046389..6ffcc82 100644 |
107 |
--- a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild |
108 |
+++ b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild |
109 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
110 |
if use staging; then |
111 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
112 |
eerror "cannot be used to set the commit. Instead, you may use the" |
113 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
114 |
+ eerror "environment variables:" |
115 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
116 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
117 |
eerror |
118 |
return 1 |
119 |
fi |
120 |
fi |
121 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
122 |
- eerror "Commits must now be specified using the environmental variables" |
123 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
124 |
+ eerror "Commits must now be specified using the environment variables:" |
125 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
126 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
127 |
eerror |
128 |
return 1 |
129 |
fi |
130 |
@@ -312,19 +315,18 @@ pkg_setup() { |
131 |
|
132 |
src_unpack() { |
133 |
if [[ ${PV} == "9999" ]] ; then |
134 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
135 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
136 |
if use staging; then |
137 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
138 |
|
139 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
140 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
141 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
142 |
|
143 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
144 |
|
145 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
146 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
147 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
148 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
149 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
150 |
fi |
151 |
fi |
152 |
fi |
153 |
|
154 |
diff --git a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild |
155 |
index 8aaef30..7330e98 100644 |
156 |
--- a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild |
157 |
+++ b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild |
158 |
@@ -267,14 +267,17 @@ wine_env_vcs_vars() { |
159 |
if use staging; then |
160 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
161 |
eerror "cannot be used to set the commit. Instead, you may use the" |
162 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
163 |
+ eerror "environment variables:" |
164 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
165 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
166 |
eerror |
167 |
return 1 |
168 |
fi |
169 |
fi |
170 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
171 |
- eerror "Commits must now be specified using the environmental variables" |
172 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
173 |
+ eerror "Commits must now be specified using the environment variables:" |
174 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
175 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
176 |
eerror |
177 |
return 1 |
178 |
fi |
179 |
@@ -313,19 +316,18 @@ pkg_setup() { |
180 |
|
181 |
src_unpack() { |
182 |
if [[ ${PV} == "9999" ]] ; then |
183 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
184 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
185 |
if use staging; then |
186 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
187 |
|
188 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
189 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
190 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
191 |
|
192 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
193 |
|
194 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
195 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
196 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
197 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
198 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
199 |
fi |
200 |
fi |
201 |
fi |
202 |
|
203 |
diff --git a/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild |
204 |
index 8aaef30..7330e98 100644 |
205 |
--- a/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild |
206 |
+++ b/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild |
207 |
@@ -267,14 +267,17 @@ wine_env_vcs_vars() { |
208 |
if use staging; then |
209 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
210 |
eerror "cannot be used to set the commit. Instead, you may use the" |
211 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
212 |
+ eerror "environment variables:" |
213 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
214 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
215 |
eerror |
216 |
return 1 |
217 |
fi |
218 |
fi |
219 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
220 |
- eerror "Commits must now be specified using the environmental variables" |
221 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
222 |
+ eerror "Commits must now be specified using the environment variables:" |
223 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
224 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
225 |
eerror |
226 |
return 1 |
227 |
fi |
228 |
@@ -313,19 +316,18 @@ pkg_setup() { |
229 |
|
230 |
src_unpack() { |
231 |
if [[ ${PV} == "9999" ]] ; then |
232 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
233 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
234 |
if use staging; then |
235 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
236 |
|
237 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
238 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
239 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
240 |
|
241 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
242 |
|
243 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
244 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
245 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
246 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
247 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
248 |
fi |
249 |
fi |
250 |
fi |
251 |
|
252 |
diff --git a/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild |
253 |
index 8aaef30..7330e98 100644 |
254 |
--- a/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild |
255 |
+++ b/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild |
256 |
@@ -267,14 +267,17 @@ wine_env_vcs_vars() { |
257 |
if use staging; then |
258 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
259 |
eerror "cannot be used to set the commit. Instead, you may use the" |
260 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
261 |
+ eerror "environment variables:" |
262 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
263 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
264 |
eerror |
265 |
return 1 |
266 |
fi |
267 |
fi |
268 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
269 |
- eerror "Commits must now be specified using the environmental variables" |
270 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
271 |
+ eerror "Commits must now be specified using the environment variables:" |
272 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
273 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
274 |
eerror |
275 |
return 1 |
276 |
fi |
277 |
@@ -313,19 +316,18 @@ pkg_setup() { |
278 |
|
279 |
src_unpack() { |
280 |
if [[ ${PV} == "9999" ]] ; then |
281 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
282 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
283 |
if use staging; then |
284 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
285 |
|
286 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
287 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
288 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
289 |
|
290 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
291 |
|
292 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
293 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
294 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
295 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
296 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
297 |
fi |
298 |
fi |
299 |
fi |
300 |
|
301 |
diff --git a/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild |
302 |
index 8aaef30..7330e98 100644 |
303 |
--- a/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild |
304 |
+++ b/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild |
305 |
@@ -267,14 +267,17 @@ wine_env_vcs_vars() { |
306 |
if use staging; then |
307 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
308 |
eerror "cannot be used to set the commit. Instead, you may use the" |
309 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
310 |
+ eerror "environment variables:" |
311 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
312 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
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 |
324 |
return 1 |
325 |
fi |
326 |
@@ -313,19 +316,18 @@ pkg_setup() { |
327 |
|
328 |
src_unpack() { |
329 |
if [[ ${PV} == "9999" ]] ; then |
330 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
331 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
332 |
if use staging; then |
333 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
334 |
|
335 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
336 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
337 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
338 |
|
339 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
340 |
|
341 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
342 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
343 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
344 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
345 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
346 |
fi |
347 |
fi |
348 |
fi |
349 |
|
350 |
diff --git a/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild |
351 |
index aca612b..0091e24 100644 |
352 |
--- a/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild |
353 |
+++ b/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild |
354 |
@@ -267,14 +267,17 @@ wine_env_vcs_vars() { |
355 |
if use staging; then |
356 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
357 |
eerror "cannot be used to set the commit. Instead, you may use the" |
358 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
359 |
+ eerror "environment variables:" |
360 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
361 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
362 |
eerror |
363 |
return 1 |
364 |
fi |
365 |
fi |
366 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
367 |
- eerror "Commits must now be specified using the environmental variables" |
368 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
369 |
+ eerror "Commits must now be specified using the environment variables:" |
370 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
371 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
372 |
eerror |
373 |
return 1 |
374 |
fi |
375 |
@@ -313,19 +316,18 @@ pkg_setup() { |
376 |
|
377 |
src_unpack() { |
378 |
if [[ ${PV} == "9999" ]] ; then |
379 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
380 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
381 |
if use staging; then |
382 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
383 |
|
384 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
385 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
386 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
387 |
|
388 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
389 |
|
390 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
391 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
392 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
393 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
394 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
395 |
fi |
396 |
fi |
397 |
fi |
398 |
|
399 |
diff --git a/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild |
400 |
index aca612b..0091e24 100644 |
401 |
--- a/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild |
402 |
+++ b/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild |
403 |
@@ -267,14 +267,17 @@ wine_env_vcs_vars() { |
404 |
if use staging; then |
405 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
406 |
eerror "cannot be used to set the commit. Instead, you may use the" |
407 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
408 |
+ eerror "environment variables:" |
409 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
410 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
411 |
eerror |
412 |
return 1 |
413 |
fi |
414 |
fi |
415 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
416 |
- eerror "Commits must now be specified using the environmental variables" |
417 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
418 |
+ eerror "Commits must now be specified using the environment variables:" |
419 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
420 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
421 |
eerror |
422 |
return 1 |
423 |
fi |
424 |
@@ -313,19 +316,18 @@ pkg_setup() { |
425 |
|
426 |
src_unpack() { |
427 |
if [[ ${PV} == "9999" ]] ; then |
428 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
429 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
430 |
if use staging; then |
431 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
432 |
|
433 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
434 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
435 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
436 |
|
437 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
438 |
|
439 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
440 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
441 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
442 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
443 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
444 |
fi |
445 |
fi |
446 |
fi |
447 |
|
448 |
diff --git a/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild |
449 |
index aca612b..0091e24 100644 |
450 |
--- a/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild |
451 |
+++ b/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild |
452 |
@@ -267,14 +267,17 @@ wine_env_vcs_vars() { |
453 |
if use staging; then |
454 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
455 |
eerror "cannot be used to set the commit. Instead, you may use the" |
456 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
457 |
+ eerror "environment variables:" |
458 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
459 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
460 |
eerror |
461 |
return 1 |
462 |
fi |
463 |
fi |
464 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
465 |
- eerror "Commits must now be specified using the environmental variables" |
466 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
467 |
+ eerror "Commits must now be specified using the environment variables:" |
468 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
469 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
470 |
eerror |
471 |
return 1 |
472 |
fi |
473 |
@@ -313,19 +316,18 @@ pkg_setup() { |
474 |
|
475 |
src_unpack() { |
476 |
if [[ ${PV} == "9999" ]] ; then |
477 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
478 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
479 |
if use staging; then |
480 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
481 |
|
482 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
483 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
484 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
485 |
|
486 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
487 |
|
488 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
489 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
490 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
491 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
492 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
493 |
fi |
494 |
fi |
495 |
fi |
496 |
|
497 |
diff --git a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild |
498 |
index aca612b..0091e24 100644 |
499 |
--- a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild |
500 |
+++ b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild |
501 |
@@ -267,14 +267,17 @@ wine_env_vcs_vars() { |
502 |
if use staging; then |
503 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
504 |
eerror "cannot be used to set the commit. Instead, you may use the" |
505 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
506 |
+ eerror "environment variables:" |
507 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
508 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
509 |
eerror |
510 |
return 1 |
511 |
fi |
512 |
fi |
513 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
514 |
- eerror "Commits must now be specified using the environmental variables" |
515 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
516 |
+ eerror "Commits must now be specified using the environment variables:" |
517 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
518 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
519 |
eerror |
520 |
return 1 |
521 |
fi |
522 |
@@ -313,19 +316,18 @@ pkg_setup() { |
523 |
|
524 |
src_unpack() { |
525 |
if [[ ${PV} == "9999" ]] ; then |
526 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
527 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
528 |
if use staging; then |
529 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
530 |
|
531 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
532 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
533 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
534 |
|
535 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
536 |
|
537 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
538 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
539 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
540 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
541 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
542 |
fi |
543 |
fi |
544 |
fi |
545 |
|
546 |
diff --git a/app-emulation/wine-staging/wine-staging-2.18.ebuild b/app-emulation/wine-staging/wine-staging-2.18.ebuild |
547 |
index 933b53a..e52f5f1 100644 |
548 |
--- a/app-emulation/wine-staging/wine-staging-2.18.ebuild |
549 |
+++ b/app-emulation/wine-staging/wine-staging-2.18.ebuild |
550 |
@@ -263,14 +263,17 @@ wine_env_vcs_vars() { |
551 |
if use staging; then |
552 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
553 |
eerror "cannot be used to set the commit. Instead, you may use the" |
554 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
555 |
+ eerror "environment variables:" |
556 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
557 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
558 |
eerror |
559 |
return 1 |
560 |
fi |
561 |
fi |
562 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
563 |
- eerror "Commits must now be specified using the environmental variables" |
564 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
565 |
+ eerror "Commits must now be specified using the environment variables:" |
566 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
567 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
568 |
eerror |
569 |
return 1 |
570 |
fi |
571 |
@@ -309,19 +312,18 @@ 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 |
|
580 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
581 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
582 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
583 |
|
584 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
585 |
|
586 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
587 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
588 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
589 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
590 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
591 |
fi |
592 |
fi |
593 |
fi |
594 |
|
595 |
diff --git a/app-emulation/wine-staging/wine-staging-2.19.ebuild b/app-emulation/wine-staging/wine-staging-2.19.ebuild |
596 |
index 933b53a..e52f5f1 100644 |
597 |
--- a/app-emulation/wine-staging/wine-staging-2.19.ebuild |
598 |
+++ b/app-emulation/wine-staging/wine-staging-2.19.ebuild |
599 |
@@ -263,14 +263,17 @@ wine_env_vcs_vars() { |
600 |
if use staging; then |
601 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
602 |
eerror "cannot be used to set the commit. Instead, you may use the" |
603 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
604 |
+ eerror "environment variables:" |
605 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
606 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
607 |
eerror |
608 |
return 1 |
609 |
fi |
610 |
fi |
611 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
612 |
- eerror "Commits must now be specified using the environmental variables" |
613 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
614 |
+ eerror "Commits must now be specified using the environment variables:" |
615 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
616 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
617 |
eerror |
618 |
return 1 |
619 |
fi |
620 |
@@ -309,19 +312,18 @@ pkg_setup() { |
621 |
|
622 |
src_unpack() { |
623 |
if [[ ${PV} == "9999" ]] ; then |
624 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
625 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
626 |
if use staging; then |
627 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
628 |
|
629 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
630 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
631 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
632 |
|
633 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
634 |
|
635 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
636 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
637 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
638 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
639 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
640 |
fi |
641 |
fi |
642 |
fi |
643 |
|
644 |
diff --git a/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild |
645 |
index f046389..6ffcc82 100644 |
646 |
--- a/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild |
647 |
+++ b/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild |
648 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
649 |
if use staging; then |
650 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
651 |
eerror "cannot be used to set the commit. Instead, you may use the" |
652 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
653 |
+ eerror "environment variables:" |
654 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
655 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
656 |
eerror |
657 |
return 1 |
658 |
fi |
659 |
fi |
660 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
661 |
- eerror "Commits must now be specified using the environmental variables" |
662 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
663 |
+ eerror "Commits must now be specified using the environment variables:" |
664 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
665 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
666 |
eerror |
667 |
return 1 |
668 |
fi |
669 |
@@ -312,19 +315,18 @@ pkg_setup() { |
670 |
|
671 |
src_unpack() { |
672 |
if [[ ${PV} == "9999" ]] ; then |
673 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
674 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
675 |
if use staging; then |
676 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
677 |
|
678 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
679 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
680 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
681 |
|
682 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
683 |
|
684 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
685 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
686 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
687 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
688 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
689 |
fi |
690 |
fi |
691 |
fi |
692 |
|
693 |
diff --git a/app-emulation/wine-staging/wine-staging-2.20.ebuild b/app-emulation/wine-staging/wine-staging-2.20.ebuild |
694 |
index e3bcca8..9f331b3 100644 |
695 |
--- a/app-emulation/wine-staging/wine-staging-2.20.ebuild |
696 |
+++ b/app-emulation/wine-staging/wine-staging-2.20.ebuild |
697 |
@@ -264,14 +264,17 @@ wine_env_vcs_vars() { |
698 |
if use staging; then |
699 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
700 |
eerror "cannot be used to set the commit. Instead, you may use the" |
701 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
702 |
+ eerror "environment variables:" |
703 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
704 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
705 |
eerror |
706 |
return 1 |
707 |
fi |
708 |
fi |
709 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
710 |
- eerror "Commits must now be specified using the environmental variables" |
711 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
712 |
+ eerror "Commits must now be specified using the environment variables:" |
713 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
714 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
715 |
eerror |
716 |
return 1 |
717 |
fi |
718 |
@@ -310,19 +313,18 @@ pkg_setup() { |
719 |
|
720 |
src_unpack() { |
721 |
if [[ ${PV} == "9999" ]] ; then |
722 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
723 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
724 |
if use staging; then |
725 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
726 |
|
727 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
728 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
729 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
730 |
|
731 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
732 |
|
733 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
734 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
735 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
736 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
737 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
738 |
fi |
739 |
fi |
740 |
fi |
741 |
|
742 |
diff --git a/app-emulation/wine-staging/wine-staging-2.21.ebuild b/app-emulation/wine-staging/wine-staging-2.21.ebuild |
743 |
index e3bcca8..9f331b3 100644 |
744 |
--- a/app-emulation/wine-staging/wine-staging-2.21.ebuild |
745 |
+++ b/app-emulation/wine-staging/wine-staging-2.21.ebuild |
746 |
@@ -264,14 +264,17 @@ wine_env_vcs_vars() { |
747 |
if use staging; then |
748 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
749 |
eerror "cannot be used to set the commit. Instead, you may use the" |
750 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
751 |
+ eerror "environment variables:" |
752 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
753 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
754 |
eerror |
755 |
return 1 |
756 |
fi |
757 |
fi |
758 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
759 |
- eerror "Commits must now be specified using the environmental variables" |
760 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
761 |
+ eerror "Commits must now be specified using the environment variables:" |
762 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
763 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
764 |
eerror |
765 |
return 1 |
766 |
fi |
767 |
@@ -310,19 +313,18 @@ pkg_setup() { |
768 |
|
769 |
src_unpack() { |
770 |
if [[ ${PV} == "9999" ]] ; then |
771 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
772 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
773 |
if use staging; then |
774 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
775 |
|
776 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
777 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
778 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
779 |
|
780 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
781 |
|
782 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
783 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
784 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
785 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
786 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
787 |
fi |
788 |
fi |
789 |
fi |
790 |
|
791 |
diff --git a/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild |
792 |
index f046389..6ffcc82 100644 |
793 |
--- a/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild |
794 |
+++ b/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild |
795 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
796 |
if use staging; then |
797 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
798 |
eerror "cannot be used to set the commit. Instead, you may use the" |
799 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
800 |
+ eerror "environment variables:" |
801 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
802 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
803 |
eerror |
804 |
return 1 |
805 |
fi |
806 |
fi |
807 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
808 |
- eerror "Commits must now be specified using the environmental variables" |
809 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
810 |
+ eerror "Commits must now be specified using the environment variables:" |
811 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
812 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
813 |
eerror |
814 |
return 1 |
815 |
fi |
816 |
@@ -312,19 +315,18 @@ pkg_setup() { |
817 |
|
818 |
src_unpack() { |
819 |
if [[ ${PV} == "9999" ]] ; then |
820 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
821 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
822 |
if use staging; then |
823 |
local CURRENT_WINE_COMMIT=${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 |
|
831 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
832 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
833 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
834 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
835 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
836 |
fi |
837 |
fi |
838 |
fi |
839 |
|
840 |
diff --git a/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild |
841 |
index 1e58470..5a05653 100644 |
842 |
--- a/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild |
843 |
+++ b/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild |
844 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
845 |
if use staging; then |
846 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
847 |
eerror "cannot be used to set the commit. Instead, you may use the" |
848 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
849 |
+ eerror "environment variables:" |
850 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
851 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
852 |
eerror |
853 |
return 1 |
854 |
fi |
855 |
fi |
856 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
857 |
- eerror "Commits must now be specified using the environmental variables" |
858 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
859 |
+ eerror "Commits must now be specified using the environment variables:" |
860 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
861 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
862 |
eerror |
863 |
return 1 |
864 |
fi |
865 |
@@ -312,19 +315,18 @@ pkg_setup() { |
866 |
|
867 |
src_unpack() { |
868 |
if [[ ${PV} == "9999" ]] ; then |
869 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
870 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
871 |
if use staging; then |
872 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
873 |
|
874 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
875 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
876 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
877 |
|
878 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
879 |
|
880 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
881 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
882 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
883 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
884 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
885 |
fi |
886 |
fi |
887 |
fi |
888 |
|
889 |
diff --git a/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild |
890 |
index 1e58470..5a05653 100644 |
891 |
--- a/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild |
892 |
+++ b/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild |
893 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
894 |
if use staging; then |
895 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
896 |
eerror "cannot be used to set the commit. Instead, you may use the" |
897 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
898 |
+ eerror "environment variables:" |
899 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
900 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
901 |
eerror |
902 |
return 1 |
903 |
fi |
904 |
fi |
905 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
906 |
- eerror "Commits must now be specified using the environmental variables" |
907 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
908 |
+ eerror "Commits must now be specified using the environment variables:" |
909 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
910 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
911 |
eerror |
912 |
return 1 |
913 |
fi |
914 |
@@ -312,19 +315,18 @@ pkg_setup() { |
915 |
|
916 |
src_unpack() { |
917 |
if [[ ${PV} == "9999" ]] ; then |
918 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
919 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
920 |
if use staging; then |
921 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
922 |
|
923 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
924 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
925 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
926 |
|
927 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
928 |
|
929 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
930 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
931 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
932 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
933 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
934 |
fi |
935 |
fi |
936 |
fi |
937 |
|
938 |
diff --git a/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild |
939 |
index 1e58470..5a05653 100644 |
940 |
--- a/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild |
941 |
+++ b/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild |
942 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
943 |
if use staging; then |
944 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
945 |
eerror "cannot be used to set the commit. Instead, you may use the" |
946 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
947 |
+ eerror "environment variables:" |
948 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
949 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
950 |
eerror |
951 |
return 1 |
952 |
fi |
953 |
fi |
954 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
955 |
- eerror "Commits must now be specified using the environmental variables" |
956 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
957 |
+ eerror "Commits must now be specified using the environment variables:" |
958 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
959 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
960 |
eerror |
961 |
return 1 |
962 |
fi |
963 |
@@ -312,19 +315,18 @@ pkg_setup() { |
964 |
|
965 |
src_unpack() { |
966 |
if [[ ${PV} == "9999" ]] ; then |
967 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
968 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
969 |
if use staging; then |
970 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
971 |
|
972 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
973 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
974 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
975 |
|
976 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
977 |
|
978 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
979 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
980 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
981 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
982 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
983 |
fi |
984 |
fi |
985 |
fi |
986 |
|
987 |
diff --git a/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild |
988 |
index 1e58470..5a05653 100644 |
989 |
--- a/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild |
990 |
+++ b/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild |
991 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
992 |
if use staging; then |
993 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
994 |
eerror "cannot be used to set the commit. Instead, you may use the" |
995 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
996 |
+ eerror "environment variables:" |
997 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
998 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
999 |
eerror |
1000 |
return 1 |
1001 |
fi |
1002 |
fi |
1003 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1004 |
- eerror "Commits must now be specified using the environmental variables" |
1005 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1006 |
+ eerror "Commits must now be specified using the environment variables:" |
1007 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1008 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
1009 |
eerror |
1010 |
return 1 |
1011 |
fi |
1012 |
@@ -312,19 +315,18 @@ pkg_setup() { |
1013 |
|
1014 |
src_unpack() { |
1015 |
if [[ ${PV} == "9999" ]] ; then |
1016 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1017 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1018 |
if use staging; then |
1019 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1020 |
|
1021 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1022 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1023 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1024 |
|
1025 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1026 |
|
1027 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1028 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1029 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1030 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1031 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1032 |
fi |
1033 |
fi |
1034 |
fi |
1035 |
|
1036 |
diff --git a/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild |
1037 |
index 1e58470..5a05653 100644 |
1038 |
--- a/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild |
1039 |
+++ b/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild |
1040 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
1041 |
if use staging; then |
1042 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1043 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1044 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1045 |
+ eerror "environment variables:" |
1046 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1047 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
1048 |
eerror |
1049 |
return 1 |
1050 |
fi |
1051 |
fi |
1052 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1053 |
- eerror "Commits must now be specified using the environmental variables" |
1054 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1055 |
+ eerror "Commits must now be specified using the environment variables:" |
1056 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1057 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
1058 |
eerror |
1059 |
return 1 |
1060 |
fi |
1061 |
@@ -312,19 +315,18 @@ pkg_setup() { |
1062 |
|
1063 |
src_unpack() { |
1064 |
if [[ ${PV} == "9999" ]] ; then |
1065 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1066 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1067 |
if use staging; then |
1068 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1069 |
|
1070 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1071 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1072 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1073 |
|
1074 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1075 |
|
1076 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1077 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1078 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1079 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1080 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1081 |
fi |
1082 |
fi |
1083 |
fi |
1084 |
|
1085 |
diff --git a/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild |
1086 |
index 8aaef30..7330e98 100644 |
1087 |
--- a/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild |
1088 |
+++ b/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild |
1089 |
@@ -267,14 +267,17 @@ wine_env_vcs_vars() { |
1090 |
if use staging; then |
1091 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1092 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1093 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1094 |
+ eerror "environment variables:" |
1095 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1096 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
1097 |
eerror |
1098 |
return 1 |
1099 |
fi |
1100 |
fi |
1101 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1102 |
- eerror "Commits must now be specified using the environmental variables" |
1103 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1104 |
+ eerror "Commits must now be specified using the environment variables:" |
1105 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1106 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING" |
1107 |
eerror |
1108 |
return 1 |
1109 |
fi |
1110 |
@@ -313,19 +316,18 @@ pkg_setup() { |
1111 |
|
1112 |
src_unpack() { |
1113 |
if [[ ${PV} == "9999" ]] ; then |
1114 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1115 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1116 |
if use staging; then |
1117 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1118 |
|
1119 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1120 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1121 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1122 |
|
1123 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1124 |
|
1125 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1126 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1127 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1128 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1129 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1130 |
fi |
1131 |
fi |
1132 |
fi |
1133 |
|
1134 |
diff --git a/app-emulation/wine-staging/wine-staging-3.10.ebuild b/app-emulation/wine-staging/wine-staging-3.10.ebuild |
1135 |
index ddc12b3..e2001b7 100644 |
1136 |
--- a/app-emulation/wine-staging/wine-staging-3.10.ebuild |
1137 |
+++ b/app-emulation/wine-staging/wine-staging-3.10.ebuild |
1138 |
@@ -268,14 +268,17 @@ wine_env_vcs_vars() { |
1139 |
if use staging; then |
1140 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1141 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1142 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1143 |
+ eerror "environment variables:" |
1144 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1145 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1146 |
eerror |
1147 |
return 1 |
1148 |
fi |
1149 |
fi |
1150 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1151 |
- eerror "Commits must now be specified using the environmental variables" |
1152 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1153 |
+ eerror "Commits must now be specified using the environment variables:" |
1154 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1155 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1156 |
eerror |
1157 |
return 1 |
1158 |
fi |
1159 |
@@ -314,19 +317,18 @@ pkg_setup() { |
1160 |
|
1161 |
src_unpack() { |
1162 |
if [[ ${PV} == "9999" ]] ; then |
1163 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1164 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1165 |
if use staging; then |
1166 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1167 |
|
1168 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1169 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1170 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1171 |
|
1172 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1173 |
|
1174 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1175 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1176 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1177 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1178 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1179 |
fi |
1180 |
fi |
1181 |
fi |
1182 |
|
1183 |
diff --git a/app-emulation/wine-staging/wine-staging-3.11.ebuild b/app-emulation/wine-staging/wine-staging-3.11.ebuild |
1184 |
index 3075b93..4733f23 100644 |
1185 |
--- a/app-emulation/wine-staging/wine-staging-3.11.ebuild |
1186 |
+++ b/app-emulation/wine-staging/wine-staging-3.11.ebuild |
1187 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
1188 |
if use staging; then |
1189 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1190 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1191 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1192 |
+ eerror "environment variables:" |
1193 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1194 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1195 |
eerror |
1196 |
return 1 |
1197 |
fi |
1198 |
fi |
1199 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1200 |
- eerror "Commits must now be specified using the environmental variables" |
1201 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1202 |
+ eerror "Commits must now be specified using the environment variables:" |
1203 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1204 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1205 |
eerror |
1206 |
return 1 |
1207 |
fi |
1208 |
@@ -312,19 +315,18 @@ pkg_setup() { |
1209 |
|
1210 |
src_unpack() { |
1211 |
if [[ ${PV} == "9999" ]] ; then |
1212 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1213 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1214 |
if use staging; then |
1215 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1216 |
|
1217 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1218 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1219 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1220 |
|
1221 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1222 |
|
1223 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1224 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1225 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1226 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1227 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1228 |
fi |
1229 |
fi |
1230 |
fi |
1231 |
|
1232 |
diff --git a/app-emulation/wine-staging/wine-staging-3.12.ebuild b/app-emulation/wine-staging/wine-staging-3.12.ebuild |
1233 |
index 5f2b2ec..e170148 100644 |
1234 |
--- a/app-emulation/wine-staging/wine-staging-3.12.ebuild |
1235 |
+++ b/app-emulation/wine-staging/wine-staging-3.12.ebuild |
1236 |
@@ -268,14 +268,17 @@ wine_env_vcs_vars() { |
1237 |
if use staging; then |
1238 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1239 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1240 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1241 |
+ eerror "environment variables:" |
1242 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1243 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1244 |
eerror |
1245 |
return 1 |
1246 |
fi |
1247 |
fi |
1248 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1249 |
- eerror "Commits must now be specified using the environmental variables" |
1250 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1251 |
+ eerror "Commits must now be specified using the environment variables:" |
1252 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1253 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1254 |
eerror |
1255 |
return 1 |
1256 |
fi |
1257 |
@@ -314,19 +317,18 @@ pkg_setup() { |
1258 |
|
1259 |
src_unpack() { |
1260 |
if [[ ${PV} == "9999" ]] ; then |
1261 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1262 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1263 |
if use staging; then |
1264 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1265 |
|
1266 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1267 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1268 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1269 |
|
1270 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1271 |
|
1272 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1273 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1274 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1275 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1276 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1277 |
fi |
1278 |
fi |
1279 |
fi |
1280 |
|
1281 |
diff --git a/app-emulation/wine-staging/wine-staging-3.13-r1.ebuild b/app-emulation/wine-staging/wine-staging-3.13-r1.ebuild |
1282 |
index 2977288..3972957 100644 |
1283 |
--- a/app-emulation/wine-staging/wine-staging-3.13-r1.ebuild |
1284 |
+++ b/app-emulation/wine-staging/wine-staging-3.13-r1.ebuild |
1285 |
@@ -268,14 +268,17 @@ wine_env_vcs_vars() { |
1286 |
if use staging; then |
1287 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1288 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1289 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1290 |
+ eerror "environment variables:" |
1291 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1292 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1293 |
eerror |
1294 |
return 1 |
1295 |
fi |
1296 |
fi |
1297 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1298 |
- eerror "Commits must now be specified using the environmental variables" |
1299 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1300 |
+ eerror "Commits must now be specified using the environment variables:" |
1301 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1302 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1303 |
eerror |
1304 |
return 1 |
1305 |
fi |
1306 |
@@ -314,19 +317,18 @@ pkg_setup() { |
1307 |
|
1308 |
src_unpack() { |
1309 |
if [[ ${PV} == "9999" ]] ; then |
1310 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1311 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1312 |
if use staging; then |
1313 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1314 |
|
1315 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1316 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1317 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1318 |
|
1319 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1320 |
|
1321 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; 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 "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1326 |
fi |
1327 |
fi |
1328 |
fi |
1329 |
|
1330 |
diff --git a/app-emulation/wine-staging/wine-staging-3.13.ebuild b/app-emulation/wine-staging/wine-staging-3.13.ebuild |
1331 |
index 2977288..3972957 100644 |
1332 |
--- a/app-emulation/wine-staging/wine-staging-3.13.ebuild |
1333 |
+++ b/app-emulation/wine-staging/wine-staging-3.13.ebuild |
1334 |
@@ -268,14 +268,17 @@ wine_env_vcs_vars() { |
1335 |
if use staging; then |
1336 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1337 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1338 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1339 |
+ eerror "environment variables:" |
1340 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1341 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1342 |
eerror |
1343 |
return 1 |
1344 |
fi |
1345 |
fi |
1346 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1347 |
- eerror "Commits must now be specified using the environmental variables" |
1348 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1349 |
+ eerror "Commits must now be specified using the environment variables:" |
1350 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1351 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1352 |
eerror |
1353 |
return 1 |
1354 |
fi |
1355 |
@@ -314,19 +317,18 @@ pkg_setup() { |
1356 |
|
1357 |
src_unpack() { |
1358 |
if [[ ${PV} == "9999" ]] ; then |
1359 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1360 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1361 |
if use staging; then |
1362 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1363 |
|
1364 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1365 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1366 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1367 |
|
1368 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1369 |
|
1370 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1371 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1372 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1373 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1374 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1375 |
fi |
1376 |
fi |
1377 |
fi |
1378 |
|
1379 |
diff --git a/app-emulation/wine-staging/wine-staging-3.14.ebuild b/app-emulation/wine-staging/wine-staging-3.14.ebuild |
1380 |
index 2977288..3972957 100644 |
1381 |
--- a/app-emulation/wine-staging/wine-staging-3.14.ebuild |
1382 |
+++ b/app-emulation/wine-staging/wine-staging-3.14.ebuild |
1383 |
@@ -268,14 +268,17 @@ wine_env_vcs_vars() { |
1384 |
if use staging; then |
1385 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1386 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1387 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1388 |
+ eerror "environment variables:" |
1389 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1390 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1391 |
eerror |
1392 |
return 1 |
1393 |
fi |
1394 |
fi |
1395 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1396 |
- eerror "Commits must now be specified using the environmental variables" |
1397 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1398 |
+ eerror "Commits must now be specified using the environment variables:" |
1399 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1400 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1401 |
eerror |
1402 |
return 1 |
1403 |
fi |
1404 |
@@ -314,19 +317,18 @@ pkg_setup() { |
1405 |
|
1406 |
src_unpack() { |
1407 |
if [[ ${PV} == "9999" ]] ; then |
1408 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1409 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1410 |
if use staging; then |
1411 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1412 |
|
1413 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1414 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1415 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1416 |
|
1417 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1418 |
|
1419 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1420 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1421 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1422 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1423 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1424 |
fi |
1425 |
fi |
1426 |
fi |
1427 |
|
1428 |
diff --git a/app-emulation/wine-staging/wine-staging-3.15.ebuild b/app-emulation/wine-staging/wine-staging-3.15.ebuild |
1429 |
index 2977288..3972957 100644 |
1430 |
--- a/app-emulation/wine-staging/wine-staging-3.15.ebuild |
1431 |
+++ b/app-emulation/wine-staging/wine-staging-3.15.ebuild |
1432 |
@@ -268,14 +268,17 @@ wine_env_vcs_vars() { |
1433 |
if use staging; then |
1434 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1435 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1436 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1437 |
+ eerror "environment variables:" |
1438 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1439 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1440 |
eerror |
1441 |
return 1 |
1442 |
fi |
1443 |
fi |
1444 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1445 |
- eerror "Commits must now be specified using the environmental variables" |
1446 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1447 |
+ eerror "Commits must now be specified using the environment variables:" |
1448 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1449 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1450 |
eerror |
1451 |
return 1 |
1452 |
fi |
1453 |
@@ -314,19 +317,18 @@ pkg_setup() { |
1454 |
|
1455 |
src_unpack() { |
1456 |
if [[ ${PV} == "9999" ]] ; then |
1457 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1458 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1459 |
if use staging; then |
1460 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1461 |
|
1462 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1463 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1464 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1465 |
|
1466 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1467 |
|
1468 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1469 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1470 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1471 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1472 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1473 |
fi |
1474 |
fi |
1475 |
fi |
1476 |
|
1477 |
diff --git a/app-emulation/wine-staging/wine-staging-3.16.ebuild b/app-emulation/wine-staging/wine-staging-3.16.ebuild |
1478 |
index 2977288..3972957 100644 |
1479 |
--- a/app-emulation/wine-staging/wine-staging-3.16.ebuild |
1480 |
+++ b/app-emulation/wine-staging/wine-staging-3.16.ebuild |
1481 |
@@ -268,14 +268,17 @@ wine_env_vcs_vars() { |
1482 |
if use staging; then |
1483 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1484 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1485 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1486 |
+ eerror "environment variables:" |
1487 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1488 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1489 |
eerror |
1490 |
return 1 |
1491 |
fi |
1492 |
fi |
1493 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1494 |
- eerror "Commits must now be specified using the environmental variables" |
1495 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1496 |
+ eerror "Commits must now be specified using the environment variables:" |
1497 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1498 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1499 |
eerror |
1500 |
return 1 |
1501 |
fi |
1502 |
@@ -314,19 +317,18 @@ pkg_setup() { |
1503 |
|
1504 |
src_unpack() { |
1505 |
if [[ ${PV} == "9999" ]] ; then |
1506 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1507 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1508 |
if use staging; then |
1509 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1510 |
|
1511 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1512 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1513 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1514 |
|
1515 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1516 |
|
1517 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1518 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1519 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1520 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1521 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1522 |
fi |
1523 |
fi |
1524 |
fi |
1525 |
|
1526 |
diff --git a/app-emulation/wine-staging/wine-staging-3.17.ebuild b/app-emulation/wine-staging/wine-staging-3.17.ebuild |
1527 |
index fcac594..d14f02c 100644 |
1528 |
--- a/app-emulation/wine-staging/wine-staging-3.17.ebuild |
1529 |
+++ b/app-emulation/wine-staging/wine-staging-3.17.ebuild |
1530 |
@@ -268,14 +268,17 @@ wine_env_vcs_vars() { |
1531 |
if use staging; then |
1532 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1533 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1534 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1535 |
+ eerror "environment variables:" |
1536 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1537 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1538 |
eerror |
1539 |
return 1 |
1540 |
fi |
1541 |
fi |
1542 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1543 |
- eerror "Commits must now be specified using the environmental variables" |
1544 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1545 |
+ eerror "Commits must now be specified using the environment variables:" |
1546 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1547 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1548 |
eerror |
1549 |
return 1 |
1550 |
fi |
1551 |
@@ -314,19 +317,18 @@ pkg_setup() { |
1552 |
|
1553 |
src_unpack() { |
1554 |
if [[ ${PV} == "9999" ]] ; then |
1555 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1556 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1557 |
if use staging; then |
1558 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1559 |
|
1560 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1561 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1562 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1563 |
|
1564 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1565 |
|
1566 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1567 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1568 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1569 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1570 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1571 |
fi |
1572 |
fi |
1573 |
fi |
1574 |
|
1575 |
diff --git a/app-emulation/wine-staging/wine-staging-3.18.ebuild b/app-emulation/wine-staging/wine-staging-3.18.ebuild |
1576 |
index fcac594..d14f02c 100644 |
1577 |
--- a/app-emulation/wine-staging/wine-staging-3.18.ebuild |
1578 |
+++ b/app-emulation/wine-staging/wine-staging-3.18.ebuild |
1579 |
@@ -268,14 +268,17 @@ wine_env_vcs_vars() { |
1580 |
if use staging; then |
1581 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1582 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1583 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1584 |
+ eerror "environment variables:" |
1585 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1586 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1587 |
eerror |
1588 |
return 1 |
1589 |
fi |
1590 |
fi |
1591 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1592 |
- eerror "Commits must now be specified using the environmental variables" |
1593 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1594 |
+ eerror "Commits must now be specified using the environment variables:" |
1595 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1596 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1597 |
eerror |
1598 |
return 1 |
1599 |
fi |
1600 |
@@ -314,19 +317,18 @@ pkg_setup() { |
1601 |
|
1602 |
src_unpack() { |
1603 |
if [[ ${PV} == "9999" ]] ; then |
1604 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1605 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1606 |
if use staging; then |
1607 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1608 |
|
1609 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1610 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1611 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1612 |
|
1613 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1614 |
|
1615 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1616 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1617 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1618 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1619 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1620 |
fi |
1621 |
fi |
1622 |
fi |
1623 |
|
1624 |
diff --git a/app-emulation/wine-staging/wine-staging-3.3.ebuild b/app-emulation/wine-staging/wine-staging-3.3.ebuild |
1625 |
index 7ba4e02..27d7435 100644 |
1626 |
--- a/app-emulation/wine-staging/wine-staging-3.3.ebuild |
1627 |
+++ b/app-emulation/wine-staging/wine-staging-3.3.ebuild |
1628 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
1629 |
if use staging; then |
1630 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1631 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1632 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1633 |
+ eerror "environment variables:" |
1634 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1635 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1636 |
eerror |
1637 |
return 1 |
1638 |
fi |
1639 |
fi |
1640 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1641 |
- eerror "Commits must now be specified using the environmental variables" |
1642 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1643 |
+ eerror "Commits must now be specified using the environment variables:" |
1644 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1645 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1646 |
eerror |
1647 |
return 1 |
1648 |
fi |
1649 |
@@ -312,19 +315,18 @@ pkg_setup() { |
1650 |
|
1651 |
src_unpack() { |
1652 |
if [[ ${PV} == "9999" ]] ; then |
1653 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1654 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1655 |
if use staging; then |
1656 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1657 |
|
1658 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1659 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1660 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1661 |
|
1662 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1663 |
|
1664 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1665 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1666 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1667 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1668 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1669 |
fi |
1670 |
fi |
1671 |
fi |
1672 |
|
1673 |
diff --git a/app-emulation/wine-staging/wine-staging-3.4.ebuild b/app-emulation/wine-staging/wine-staging-3.4.ebuild |
1674 |
index 7ba4e02..27d7435 100644 |
1675 |
--- a/app-emulation/wine-staging/wine-staging-3.4.ebuild |
1676 |
+++ b/app-emulation/wine-staging/wine-staging-3.4.ebuild |
1677 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
1678 |
if use staging; then |
1679 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1680 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1681 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1682 |
+ eerror "environment variables:" |
1683 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1684 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1685 |
eerror |
1686 |
return 1 |
1687 |
fi |
1688 |
fi |
1689 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1690 |
- eerror "Commits must now be specified using the environmental variables" |
1691 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1692 |
+ eerror "Commits must now be specified using the environment variables:" |
1693 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1694 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1695 |
eerror |
1696 |
return 1 |
1697 |
fi |
1698 |
@@ -312,19 +315,18 @@ pkg_setup() { |
1699 |
|
1700 |
src_unpack() { |
1701 |
if [[ ${PV} == "9999" ]] ; then |
1702 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1703 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1704 |
if use staging; then |
1705 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1706 |
|
1707 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1708 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1709 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1710 |
|
1711 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1712 |
|
1713 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1714 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1715 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1716 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1717 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1718 |
fi |
1719 |
fi |
1720 |
fi |
1721 |
|
1722 |
diff --git a/app-emulation/wine-staging/wine-staging-3.5.ebuild b/app-emulation/wine-staging/wine-staging-3.5.ebuild |
1723 |
index 7ba4e02..27d7435 100644 |
1724 |
--- a/app-emulation/wine-staging/wine-staging-3.5.ebuild |
1725 |
+++ b/app-emulation/wine-staging/wine-staging-3.5.ebuild |
1726 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
1727 |
if use staging; then |
1728 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1729 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1730 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1731 |
+ eerror "environment variables:" |
1732 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1733 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1734 |
eerror |
1735 |
return 1 |
1736 |
fi |
1737 |
fi |
1738 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1739 |
- eerror "Commits must now be specified using the environmental variables" |
1740 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1741 |
+ eerror "Commits must now be specified using the environment variables:" |
1742 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1743 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1744 |
eerror |
1745 |
return 1 |
1746 |
fi |
1747 |
@@ -312,19 +315,18 @@ pkg_setup() { |
1748 |
|
1749 |
src_unpack() { |
1750 |
if [[ ${PV} == "9999" ]] ; then |
1751 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1752 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1753 |
if use staging; then |
1754 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1755 |
|
1756 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1757 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1758 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1759 |
|
1760 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1761 |
|
1762 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1763 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1764 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1765 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1766 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1767 |
fi |
1768 |
fi |
1769 |
fi |
1770 |
|
1771 |
diff --git a/app-emulation/wine-staging/wine-staging-3.6.ebuild b/app-emulation/wine-staging/wine-staging-3.6.ebuild |
1772 |
index 7ba4e02..27d7435 100644 |
1773 |
--- a/app-emulation/wine-staging/wine-staging-3.6.ebuild |
1774 |
+++ b/app-emulation/wine-staging/wine-staging-3.6.ebuild |
1775 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
1776 |
if use staging; then |
1777 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1778 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1779 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1780 |
+ eerror "environment variables:" |
1781 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1782 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1783 |
eerror |
1784 |
return 1 |
1785 |
fi |
1786 |
fi |
1787 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1788 |
- eerror "Commits must now be specified using the environmental variables" |
1789 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1790 |
+ eerror "Commits must now be specified using the environment variables:" |
1791 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1792 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1793 |
eerror |
1794 |
return 1 |
1795 |
fi |
1796 |
@@ -312,19 +315,18 @@ pkg_setup() { |
1797 |
|
1798 |
src_unpack() { |
1799 |
if [[ ${PV} == "9999" ]] ; then |
1800 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1801 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1802 |
if use staging; then |
1803 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1804 |
|
1805 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1806 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1807 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1808 |
|
1809 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1810 |
|
1811 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1812 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1813 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1814 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1815 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1816 |
fi |
1817 |
fi |
1818 |
fi |
1819 |
|
1820 |
diff --git a/app-emulation/wine-staging/wine-staging-3.7.ebuild b/app-emulation/wine-staging/wine-staging-3.7.ebuild |
1821 |
index 7ba4e02..27d7435 100644 |
1822 |
--- a/app-emulation/wine-staging/wine-staging-3.7.ebuild |
1823 |
+++ b/app-emulation/wine-staging/wine-staging-3.7.ebuild |
1824 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
1825 |
if use staging; then |
1826 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1827 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1828 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1829 |
+ eerror "environment variables:" |
1830 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1831 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1832 |
eerror |
1833 |
return 1 |
1834 |
fi |
1835 |
fi |
1836 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1837 |
- eerror "Commits must now be specified using the environmental variables" |
1838 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1839 |
+ eerror "Commits must now be specified using the environment variables:" |
1840 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1841 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1842 |
eerror |
1843 |
return 1 |
1844 |
fi |
1845 |
@@ -312,19 +315,18 @@ pkg_setup() { |
1846 |
|
1847 |
src_unpack() { |
1848 |
if [[ ${PV} == "9999" ]] ; then |
1849 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1850 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1851 |
if use staging; then |
1852 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1853 |
|
1854 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1855 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1856 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1857 |
|
1858 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1859 |
|
1860 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1861 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1862 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1863 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1864 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1865 |
fi |
1866 |
fi |
1867 |
fi |
1868 |
|
1869 |
diff --git a/app-emulation/wine-staging/wine-staging-3.8.ebuild b/app-emulation/wine-staging/wine-staging-3.8.ebuild |
1870 |
index 7ba4e02..27d7435 100644 |
1871 |
--- a/app-emulation/wine-staging/wine-staging-3.8.ebuild |
1872 |
+++ b/app-emulation/wine-staging/wine-staging-3.8.ebuild |
1873 |
@@ -266,14 +266,17 @@ wine_env_vcs_vars() { |
1874 |
if use staging; then |
1875 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1876 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1877 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1878 |
+ eerror "environment variables:" |
1879 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1880 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1881 |
eerror |
1882 |
return 1 |
1883 |
fi |
1884 |
fi |
1885 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1886 |
- eerror "Commits must now be specified using the environmental variables" |
1887 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1888 |
+ eerror "Commits must now be specified using the environment variables:" |
1889 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1890 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1891 |
eerror |
1892 |
return 1 |
1893 |
fi |
1894 |
@@ -312,19 +315,18 @@ pkg_setup() { |
1895 |
|
1896 |
src_unpack() { |
1897 |
if [[ ${PV} == "9999" ]] ; then |
1898 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1899 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1900 |
if use staging; then |
1901 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1902 |
|
1903 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1904 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1905 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1906 |
|
1907 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1908 |
|
1909 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1910 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1911 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1912 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1913 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1914 |
fi |
1915 |
fi |
1916 |
fi |
1917 |
|
1918 |
diff --git a/app-emulation/wine-staging/wine-staging-3.9.ebuild b/app-emulation/wine-staging/wine-staging-3.9.ebuild |
1919 |
index ddc12b3..e2001b7 100644 |
1920 |
--- a/app-emulation/wine-staging/wine-staging-3.9.ebuild |
1921 |
+++ b/app-emulation/wine-staging/wine-staging-3.9.ebuild |
1922 |
@@ -268,14 +268,17 @@ wine_env_vcs_vars() { |
1923 |
if use staging; then |
1924 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1925 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1926 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1927 |
+ eerror "environment variables:" |
1928 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1929 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1930 |
eerror |
1931 |
return 1 |
1932 |
fi |
1933 |
fi |
1934 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1935 |
- eerror "Commits must now be specified using the environmental variables" |
1936 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1937 |
+ eerror "Commits must now be specified using the environment variables:" |
1938 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1939 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1940 |
eerror |
1941 |
return 1 |
1942 |
fi |
1943 |
@@ -314,19 +317,18 @@ pkg_setup() { |
1944 |
|
1945 |
src_unpack() { |
1946 |
if [[ ${PV} == "9999" ]] ; then |
1947 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1948 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1949 |
if use staging; then |
1950 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
1951 |
|
1952 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
1953 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
1954 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
1955 |
|
1956 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
1957 |
|
1958 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
1959 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
1960 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
1961 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1962 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
1963 |
fi |
1964 |
fi |
1965 |
fi |
1966 |
|
1967 |
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild |
1968 |
index 2977288..3972957 100644 |
1969 |
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild |
1970 |
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild |
1971 |
@@ -268,14 +268,17 @@ wine_env_vcs_vars() { |
1972 |
if use staging; then |
1973 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1974 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1975 |
- eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." |
1976 |
+ eerror "environment variables:" |
1977 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1978 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1979 |
eerror |
1980 |
return 1 |
1981 |
fi |
1982 |
fi |
1983 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1984 |
- eerror "Commits must now be specified using the environmental variables" |
1985 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
1986 |
+ eerror "Commits must now be specified using the environment variables:" |
1987 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1988 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
1989 |
eerror |
1990 |
return 1 |
1991 |
fi |
1992 |
@@ -314,19 +317,18 @@ pkg_setup() { |
1993 |
|
1994 |
src_unpack() { |
1995 |
if [[ ${PV} == "9999" ]] ; then |
1996 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1997 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1998 |
if use staging; then |
1999 |
local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
2000 |
|
2001 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
2002 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
2003 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
2004 |
|
2005 |
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
2006 |
|
2007 |
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
2008 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
2009 |
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
2010 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
2011 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" |
2012 |
fi |
2013 |
fi |
2014 |
fi |