1 |
commit: 5ec7dc81dc637aad663561262948419a4f9c19df |
2 |
Author: Rob Walker <bob.mt.wya <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Oct 21 14:57:33 2018 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 22 23:30:56 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=5ec7dc81 |
7 |
|
8 |
app-emulation/wine-d3d9: 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-d3d9/wine-d3d9-2.0-r1.ebuild | 14 ++++++++------ |
15 |
app-emulation/wine-d3d9/wine-d3d9-2.1-r1.ebuild | 14 ++++++++------ |
16 |
app-emulation/wine-d3d9/wine-d3d9-2.10-r1.ebuild | 14 ++++++++------ |
17 |
app-emulation/wine-d3d9/wine-d3d9-2.11-r1.ebuild | 14 ++++++++------ |
18 |
app-emulation/wine-d3d9/wine-d3d9-2.12-r1.ebuild | 14 ++++++++------ |
19 |
app-emulation/wine-d3d9/wine-d3d9-2.13-r1.ebuild | 14 ++++++++------ |
20 |
app-emulation/wine-d3d9/wine-d3d9-2.14-r1.ebuild | 14 ++++++++------ |
21 |
app-emulation/wine-d3d9/wine-d3d9-2.15-r1.ebuild | 14 ++++++++------ |
22 |
app-emulation/wine-d3d9/wine-d3d9-2.16-r1.ebuild | 14 ++++++++------ |
23 |
app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild | 14 ++++++++------ |
24 |
app-emulation/wine-d3d9/wine-d3d9-2.18.ebuild | 14 ++++++++------ |
25 |
app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild | 14 ++++++++------ |
26 |
app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild | 14 ++++++++------ |
27 |
app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild | 14 ++++++++------ |
28 |
app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild | 14 ++++++++------ |
29 |
app-emulation/wine-d3d9/wine-d3d9-2.3-r1.ebuild | 14 ++++++++------ |
30 |
app-emulation/wine-d3d9/wine-d3d9-2.4-r1.ebuild | 14 ++++++++------ |
31 |
app-emulation/wine-d3d9/wine-d3d9-2.5-r1.ebuild | 14 ++++++++------ |
32 |
app-emulation/wine-d3d9/wine-d3d9-2.6-r1.ebuild | 14 ++++++++------ |
33 |
app-emulation/wine-d3d9/wine-d3d9-2.7-r1.ebuild | 14 ++++++++------ |
34 |
app-emulation/wine-d3d9/wine-d3d9-2.8-r1.ebuild | 14 ++++++++------ |
35 |
app-emulation/wine-d3d9/wine-d3d9-2.9-r1.ebuild | 14 ++++++++------ |
36 |
app-emulation/wine-d3d9/wine-d3d9-3.10.ebuild | 14 ++++++++------ |
37 |
app-emulation/wine-d3d9/wine-d3d9-3.11.ebuild | 14 ++++++++------ |
38 |
app-emulation/wine-d3d9/wine-d3d9-3.12.ebuild | 14 ++++++++------ |
39 |
app-emulation/wine-d3d9/wine-d3d9-3.13-r1.ebuild | 14 ++++++++------ |
40 |
app-emulation/wine-d3d9/wine-d3d9-3.13.ebuild | 14 ++++++++------ |
41 |
app-emulation/wine-d3d9/wine-d3d9-3.14.ebuild | 14 ++++++++------ |
42 |
app-emulation/wine-d3d9/wine-d3d9-3.15.ebuild | 14 ++++++++------ |
43 |
app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild | 14 ++++++++------ |
44 |
app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild | 14 ++++++++------ |
45 |
app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild | 14 ++++++++------ |
46 |
app-emulation/wine-d3d9/wine-d3d9-3.3.ebuild | 14 ++++++++------ |
47 |
app-emulation/wine-d3d9/wine-d3d9-3.4.ebuild | 14 ++++++++------ |
48 |
app-emulation/wine-d3d9/wine-d3d9-3.5.ebuild | 14 ++++++++------ |
49 |
app-emulation/wine-d3d9/wine-d3d9-3.6.ebuild | 14 ++++++++------ |
50 |
app-emulation/wine-d3d9/wine-d3d9-3.7.ebuild | 14 ++++++++------ |
51 |
app-emulation/wine-d3d9/wine-d3d9-3.8.ebuild | 14 ++++++++------ |
52 |
app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild | 14 ++++++++------ |
53 |
app-emulation/wine-d3d9/wine-d3d9-9999.ebuild | 14 ++++++++------ |
54 |
40 files changed, 320 insertions(+), 240 deletions(-) |
55 |
|
56 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild |
57 |
index 6adf524..2edf136 100644 |
58 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild |
59 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild |
60 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
61 |
if use d3d9; then |
62 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
63 |
eerror "cannot be used to set the commit. Instead, you may use the" |
64 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
65 |
+ eerror "environment variables:" |
66 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
67 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
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, 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_SARNEX_WINE_D3D9_PATCHES" |
78 |
eerror |
79 |
return 1 |
80 |
fi |
81 |
@@ -302,10 +305,9 @@ 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 d3d9; then |
88 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
89 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
90 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
91 |
fi |
92 |
fi |
93 |
|
94 |
|
95 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.1-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.1-r1.ebuild |
96 |
index 1e396c9..d68d277 100644 |
97 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.1-r1.ebuild |
98 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.1-r1.ebuild |
99 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
100 |
if use d3d9; then |
101 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
102 |
eerror "cannot be used to set the commit. Instead, you may use the" |
103 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
104 |
+ eerror "environment variables:" |
105 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
106 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
107 |
eerror |
108 |
return 1 |
109 |
fi |
110 |
fi |
111 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
112 |
- eerror "Commits must now be specified using the environmental variables" |
113 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
114 |
+ eerror "Commits must now be specified using the environment variables:" |
115 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
116 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
117 |
eerror |
118 |
return 1 |
119 |
fi |
120 |
@@ -302,10 +305,9 @@ pkg_setup() { |
121 |
|
122 |
src_unpack() { |
123 |
if [[ ${PV} == "9999" ]] ; then |
124 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
125 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
126 |
if use d3d9; then |
127 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
128 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
129 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
130 |
fi |
131 |
fi |
132 |
|
133 |
|
134 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.10-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.10-r1.ebuild |
135 |
index 6e13ba9..165db97 100644 |
136 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.10-r1.ebuild |
137 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.10-r1.ebuild |
138 |
@@ -257,14 +257,17 @@ wine_env_vcs_vars() { |
139 |
if use d3d9; then |
140 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
141 |
eerror "cannot be used to set the commit. Instead, you may use the" |
142 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
143 |
+ eerror "environment variables:" |
144 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
145 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
146 |
eerror |
147 |
return 1 |
148 |
fi |
149 |
fi |
150 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
151 |
- eerror "Commits must now be specified using the environmental variables" |
152 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
153 |
+ eerror "Commits must now be specified using the environment variables:" |
154 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
155 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
156 |
eerror |
157 |
return 1 |
158 |
fi |
159 |
@@ -303,10 +306,9 @@ pkg_setup() { |
160 |
|
161 |
src_unpack() { |
162 |
if [[ ${PV} == "9999" ]] ; then |
163 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
164 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
165 |
if use d3d9; then |
166 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
167 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
168 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
169 |
fi |
170 |
fi |
171 |
|
172 |
|
173 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.11-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.11-r1.ebuild |
174 |
index 6e13ba9..165db97 100644 |
175 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.11-r1.ebuild |
176 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.11-r1.ebuild |
177 |
@@ -257,14 +257,17 @@ wine_env_vcs_vars() { |
178 |
if use d3d9; then |
179 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
180 |
eerror "cannot be used to set the commit. Instead, you may use the" |
181 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
182 |
+ eerror "environment variables:" |
183 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
184 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
185 |
eerror |
186 |
return 1 |
187 |
fi |
188 |
fi |
189 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
190 |
- eerror "Commits must now be specified using the environmental variables" |
191 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
192 |
+ eerror "Commits must now be specified using the environment variables:" |
193 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
194 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
195 |
eerror |
196 |
return 1 |
197 |
fi |
198 |
@@ -303,10 +306,9 @@ pkg_setup() { |
199 |
|
200 |
src_unpack() { |
201 |
if [[ ${PV} == "9999" ]] ; then |
202 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
203 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
204 |
if use d3d9; then |
205 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
206 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
207 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
208 |
fi |
209 |
fi |
210 |
|
211 |
|
212 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.12-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.12-r1.ebuild |
213 |
index 6e13ba9..165db97 100644 |
214 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.12-r1.ebuild |
215 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.12-r1.ebuild |
216 |
@@ -257,14 +257,17 @@ wine_env_vcs_vars() { |
217 |
if use d3d9; then |
218 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
219 |
eerror "cannot be used to set the commit. Instead, you may use the" |
220 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
221 |
+ eerror "environment variables:" |
222 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
223 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
224 |
eerror |
225 |
return 1 |
226 |
fi |
227 |
fi |
228 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
229 |
- eerror "Commits must now be specified using the environmental variables" |
230 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
231 |
+ eerror "Commits must now be specified using the environment variables:" |
232 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
233 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
234 |
eerror |
235 |
return 1 |
236 |
fi |
237 |
@@ -303,10 +306,9 @@ pkg_setup() { |
238 |
|
239 |
src_unpack() { |
240 |
if [[ ${PV} == "9999" ]] ; then |
241 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
242 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
243 |
if use d3d9; then |
244 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
245 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
246 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
247 |
fi |
248 |
fi |
249 |
|
250 |
|
251 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.13-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.13-r1.ebuild |
252 |
index 6e13ba9..165db97 100644 |
253 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.13-r1.ebuild |
254 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.13-r1.ebuild |
255 |
@@ -257,14 +257,17 @@ wine_env_vcs_vars() { |
256 |
if use d3d9; then |
257 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
258 |
eerror "cannot be used to set the commit. Instead, you may use the" |
259 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
260 |
+ eerror "environment variables:" |
261 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
262 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
263 |
eerror |
264 |
return 1 |
265 |
fi |
266 |
fi |
267 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
268 |
- eerror "Commits must now be specified using the environmental variables" |
269 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
270 |
+ eerror "Commits must now be specified using the environment variables:" |
271 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
272 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
273 |
eerror |
274 |
return 1 |
275 |
fi |
276 |
@@ -303,10 +306,9 @@ pkg_setup() { |
277 |
|
278 |
src_unpack() { |
279 |
if [[ ${PV} == "9999" ]] ; then |
280 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
281 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
282 |
if use d3d9; then |
283 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
284 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
285 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
286 |
fi |
287 |
fi |
288 |
|
289 |
|
290 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.14-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.14-r1.ebuild |
291 |
index c447110..19ed7be 100644 |
292 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.14-r1.ebuild |
293 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.14-r1.ebuild |
294 |
@@ -257,14 +257,17 @@ wine_env_vcs_vars() { |
295 |
if use d3d9; then |
296 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
297 |
eerror "cannot be used to set the commit. Instead, you may use the" |
298 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
299 |
+ eerror "environment variables:" |
300 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
301 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
302 |
eerror |
303 |
return 1 |
304 |
fi |
305 |
fi |
306 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
307 |
- eerror "Commits must now be specified using the environmental variables" |
308 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
309 |
+ eerror "Commits must now be specified using the environment variables:" |
310 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
311 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
312 |
eerror |
313 |
return 1 |
314 |
fi |
315 |
@@ -303,10 +306,9 @@ pkg_setup() { |
316 |
|
317 |
src_unpack() { |
318 |
if [[ ${PV} == "9999" ]] ; then |
319 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
320 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
321 |
if use d3d9; then |
322 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
323 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
324 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
325 |
fi |
326 |
fi |
327 |
|
328 |
|
329 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.15-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.15-r1.ebuild |
330 |
index c447110..19ed7be 100644 |
331 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.15-r1.ebuild |
332 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.15-r1.ebuild |
333 |
@@ -257,14 +257,17 @@ wine_env_vcs_vars() { |
334 |
if use d3d9; then |
335 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
336 |
eerror "cannot be used to set the commit. Instead, you may use the" |
337 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
338 |
+ eerror "environment variables:" |
339 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
340 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
341 |
eerror |
342 |
return 1 |
343 |
fi |
344 |
fi |
345 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
346 |
- eerror "Commits must now be specified using the environmental variables" |
347 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
348 |
+ eerror "Commits must now be specified using the environment variables:" |
349 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
350 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
351 |
eerror |
352 |
return 1 |
353 |
fi |
354 |
@@ -303,10 +306,9 @@ pkg_setup() { |
355 |
|
356 |
src_unpack() { |
357 |
if [[ ${PV} == "9999" ]] ; then |
358 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
359 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
360 |
if use d3d9; then |
361 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
362 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
363 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
364 |
fi |
365 |
fi |
366 |
|
367 |
|
368 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.16-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.16-r1.ebuild |
369 |
index c447110..19ed7be 100644 |
370 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.16-r1.ebuild |
371 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.16-r1.ebuild |
372 |
@@ -257,14 +257,17 @@ wine_env_vcs_vars() { |
373 |
if use d3d9; then |
374 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
375 |
eerror "cannot be used to set the commit. Instead, you may use the" |
376 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
377 |
+ eerror "environment variables:" |
378 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
379 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
380 |
eerror |
381 |
return 1 |
382 |
fi |
383 |
fi |
384 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
385 |
- eerror "Commits must now be specified using the environmental variables" |
386 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
387 |
+ eerror "Commits must now be specified using the environment variables:" |
388 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
389 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
390 |
eerror |
391 |
return 1 |
392 |
fi |
393 |
@@ -303,10 +306,9 @@ pkg_setup() { |
394 |
|
395 |
src_unpack() { |
396 |
if [[ ${PV} == "9999" ]] ; then |
397 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
398 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
399 |
if use d3d9; then |
400 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
401 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
402 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
403 |
fi |
404 |
fi |
405 |
|
406 |
|
407 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild |
408 |
index c447110..19ed7be 100644 |
409 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild |
410 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild |
411 |
@@ -257,14 +257,17 @@ wine_env_vcs_vars() { |
412 |
if use d3d9; then |
413 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
414 |
eerror "cannot be used to set the commit. Instead, you may use the" |
415 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
416 |
+ eerror "environment variables:" |
417 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
418 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
419 |
eerror |
420 |
return 1 |
421 |
fi |
422 |
fi |
423 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
424 |
- eerror "Commits must now be specified using the environmental variables" |
425 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
426 |
+ eerror "Commits must now be specified using the environment variables:" |
427 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
428 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
429 |
eerror |
430 |
return 1 |
431 |
fi |
432 |
@@ -303,10 +306,9 @@ pkg_setup() { |
433 |
|
434 |
src_unpack() { |
435 |
if [[ ${PV} == "9999" ]] ; then |
436 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
437 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
438 |
if use d3d9; then |
439 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
440 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
441 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
442 |
fi |
443 |
fi |
444 |
|
445 |
|
446 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.18.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.18.ebuild |
447 |
index 472c437..1c5b6cd 100644 |
448 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.18.ebuild |
449 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.18.ebuild |
450 |
@@ -253,14 +253,17 @@ wine_env_vcs_vars() { |
451 |
if use d3d9; then |
452 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
453 |
eerror "cannot be used to set the commit. Instead, you may use the" |
454 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
455 |
+ eerror "environment variables:" |
456 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
457 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
458 |
eerror |
459 |
return 1 |
460 |
fi |
461 |
fi |
462 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
463 |
- eerror "Commits must now be specified using the environmental variables" |
464 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
465 |
+ eerror "Commits must now be specified using the environment variables:" |
466 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
467 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
468 |
eerror |
469 |
return 1 |
470 |
fi |
471 |
@@ -299,10 +302,9 @@ pkg_setup() { |
472 |
|
473 |
src_unpack() { |
474 |
if [[ ${PV} == "9999" ]] ; then |
475 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
476 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
477 |
if use d3d9; then |
478 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
479 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
480 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
481 |
fi |
482 |
fi |
483 |
|
484 |
|
485 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild |
486 |
index 472c437..1c5b6cd 100644 |
487 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild |
488 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild |
489 |
@@ -253,14 +253,17 @@ wine_env_vcs_vars() { |
490 |
if use d3d9; then |
491 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
492 |
eerror "cannot be used to set the commit. Instead, you may use the" |
493 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
494 |
+ eerror "environment variables:" |
495 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
496 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
497 |
eerror |
498 |
return 1 |
499 |
fi |
500 |
fi |
501 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
502 |
- eerror "Commits must now be specified using the environmental variables" |
503 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
504 |
+ eerror "Commits must now be specified using the environment variables:" |
505 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
506 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
507 |
eerror |
508 |
return 1 |
509 |
fi |
510 |
@@ -299,10 +302,9 @@ pkg_setup() { |
511 |
|
512 |
src_unpack() { |
513 |
if [[ ${PV} == "9999" ]] ; then |
514 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
515 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
516 |
if use d3d9; then |
517 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
518 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
519 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
520 |
fi |
521 |
fi |
522 |
|
523 |
|
524 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild |
525 |
index 1e396c9..d68d277 100644 |
526 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild |
527 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild |
528 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
529 |
if use d3d9; then |
530 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
531 |
eerror "cannot be used to set the commit. Instead, you may use the" |
532 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
533 |
+ eerror "environment variables:" |
534 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
535 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
536 |
eerror |
537 |
return 1 |
538 |
fi |
539 |
fi |
540 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
541 |
- eerror "Commits must now be specified using the environmental variables" |
542 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
543 |
+ eerror "Commits must now be specified using the environment variables:" |
544 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
545 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
546 |
eerror |
547 |
return 1 |
548 |
fi |
549 |
@@ -302,10 +305,9 @@ pkg_setup() { |
550 |
|
551 |
src_unpack() { |
552 |
if [[ ${PV} == "9999" ]] ; then |
553 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
554 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
555 |
if use d3d9; then |
556 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
557 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
558 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
559 |
fi |
560 |
fi |
561 |
|
562 |
|
563 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild |
564 |
index 45d1401..48929ff 100644 |
565 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild |
566 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild |
567 |
@@ -254,14 +254,17 @@ wine_env_vcs_vars() { |
568 |
if use d3d9; then |
569 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
570 |
eerror "cannot be used to set the commit. Instead, you may use the" |
571 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
572 |
+ eerror "environment variables:" |
573 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
574 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
575 |
eerror |
576 |
return 1 |
577 |
fi |
578 |
fi |
579 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
580 |
- eerror "Commits must now be specified using the environmental variables" |
581 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
582 |
+ eerror "Commits must now be specified using the environment variables:" |
583 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
584 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
585 |
eerror |
586 |
return 1 |
587 |
fi |
588 |
@@ -300,10 +303,9 @@ pkg_setup() { |
589 |
|
590 |
src_unpack() { |
591 |
if [[ ${PV} == "9999" ]] ; then |
592 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
593 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
594 |
if use d3d9; then |
595 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
596 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
597 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
598 |
fi |
599 |
fi |
600 |
|
601 |
|
602 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild |
603 |
index 45d1401..48929ff 100644 |
604 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild |
605 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild |
606 |
@@ -254,14 +254,17 @@ wine_env_vcs_vars() { |
607 |
if use d3d9; then |
608 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
609 |
eerror "cannot be used to set the commit. Instead, you may use the" |
610 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
611 |
+ eerror "environment variables:" |
612 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
613 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
614 |
eerror |
615 |
return 1 |
616 |
fi |
617 |
fi |
618 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
619 |
- eerror "Commits must now be specified using the environmental variables" |
620 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
621 |
+ eerror "Commits must now be specified using the environment variables:" |
622 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
623 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
624 |
eerror |
625 |
return 1 |
626 |
fi |
627 |
@@ -300,10 +303,9 @@ pkg_setup() { |
628 |
|
629 |
src_unpack() { |
630 |
if [[ ${PV} == "9999" ]] ; then |
631 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
632 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
633 |
if use d3d9; then |
634 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
635 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
636 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
637 |
fi |
638 |
fi |
639 |
|
640 |
|
641 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.3-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.3-r1.ebuild |
642 |
index 1e396c9..d68d277 100644 |
643 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.3-r1.ebuild |
644 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.3-r1.ebuild |
645 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
646 |
if use d3d9; then |
647 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
648 |
eerror "cannot be used to set the commit. Instead, you may use the" |
649 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
650 |
+ eerror "environment variables:" |
651 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
652 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
653 |
eerror |
654 |
return 1 |
655 |
fi |
656 |
fi |
657 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
658 |
- eerror "Commits must now be specified using the environmental variables" |
659 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
660 |
+ eerror "Commits must now be specified using the environment variables:" |
661 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
662 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
663 |
eerror |
664 |
return 1 |
665 |
fi |
666 |
@@ -302,10 +305,9 @@ pkg_setup() { |
667 |
|
668 |
src_unpack() { |
669 |
if [[ ${PV} == "9999" ]] ; then |
670 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
671 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
672 |
if use d3d9; then |
673 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
674 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
675 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
676 |
fi |
677 |
fi |
678 |
|
679 |
|
680 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.4-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.4-r1.ebuild |
681 |
index 220ca63..bd027f1 100644 |
682 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.4-r1.ebuild |
683 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.4-r1.ebuild |
684 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
685 |
if use d3d9; then |
686 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
687 |
eerror "cannot be used to set the commit. Instead, you may use the" |
688 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
689 |
+ eerror "environment variables:" |
690 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
691 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
692 |
eerror |
693 |
return 1 |
694 |
fi |
695 |
fi |
696 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
697 |
- eerror "Commits must now be specified using the environmental variables" |
698 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
699 |
+ eerror "Commits must now be specified using the environment variables:" |
700 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
701 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
702 |
eerror |
703 |
return 1 |
704 |
fi |
705 |
@@ -302,10 +305,9 @@ pkg_setup() { |
706 |
|
707 |
src_unpack() { |
708 |
if [[ ${PV} == "9999" ]] ; then |
709 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
710 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
711 |
if use d3d9; then |
712 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
713 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
714 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
715 |
fi |
716 |
fi |
717 |
|
718 |
|
719 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.5-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.5-r1.ebuild |
720 |
index 220ca63..bd027f1 100644 |
721 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.5-r1.ebuild |
722 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.5-r1.ebuild |
723 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
724 |
if use d3d9; then |
725 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
726 |
eerror "cannot be used to set the commit. Instead, you may use the" |
727 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
728 |
+ eerror "environment variables:" |
729 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
730 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
731 |
eerror |
732 |
return 1 |
733 |
fi |
734 |
fi |
735 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
736 |
- eerror "Commits must now be specified using the environmental variables" |
737 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
738 |
+ eerror "Commits must now be specified using the environment variables:" |
739 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
740 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
741 |
eerror |
742 |
return 1 |
743 |
fi |
744 |
@@ -302,10 +305,9 @@ pkg_setup() { |
745 |
|
746 |
src_unpack() { |
747 |
if [[ ${PV} == "9999" ]] ; then |
748 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
749 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
750 |
if use d3d9; then |
751 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
752 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
753 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
754 |
fi |
755 |
fi |
756 |
|
757 |
|
758 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.6-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.6-r1.ebuild |
759 |
index 220ca63..bd027f1 100644 |
760 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.6-r1.ebuild |
761 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.6-r1.ebuild |
762 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
763 |
if use d3d9; then |
764 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
765 |
eerror "cannot be used to set the commit. Instead, you may use the" |
766 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
767 |
+ eerror "environment variables:" |
768 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
769 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
770 |
eerror |
771 |
return 1 |
772 |
fi |
773 |
fi |
774 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
775 |
- eerror "Commits must now be specified using the environmental variables" |
776 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
777 |
+ eerror "Commits must now be specified using the environment variables:" |
778 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
779 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
780 |
eerror |
781 |
return 1 |
782 |
fi |
783 |
@@ -302,10 +305,9 @@ pkg_setup() { |
784 |
|
785 |
src_unpack() { |
786 |
if [[ ${PV} == "9999" ]] ; then |
787 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
788 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
789 |
if use d3d9; then |
790 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
791 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
792 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
793 |
fi |
794 |
fi |
795 |
|
796 |
|
797 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.7-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.7-r1.ebuild |
798 |
index 220ca63..bd027f1 100644 |
799 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.7-r1.ebuild |
800 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.7-r1.ebuild |
801 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
802 |
if use d3d9; then |
803 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
804 |
eerror "cannot be used to set the commit. Instead, you may use the" |
805 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
806 |
+ eerror "environment variables:" |
807 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
808 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
809 |
eerror |
810 |
return 1 |
811 |
fi |
812 |
fi |
813 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
814 |
- eerror "Commits must now be specified using the environmental variables" |
815 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
816 |
+ eerror "Commits must now be specified using the environment variables:" |
817 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
818 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
819 |
eerror |
820 |
return 1 |
821 |
fi |
822 |
@@ -302,10 +305,9 @@ pkg_setup() { |
823 |
|
824 |
src_unpack() { |
825 |
if [[ ${PV} == "9999" ]] ; then |
826 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
827 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
828 |
if use d3d9; then |
829 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
830 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
831 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
832 |
fi |
833 |
fi |
834 |
|
835 |
|
836 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.8-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.8-r1.ebuild |
837 |
index 220ca63..bd027f1 100644 |
838 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.8-r1.ebuild |
839 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.8-r1.ebuild |
840 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
841 |
if use d3d9; then |
842 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
843 |
eerror "cannot be used to set the commit. Instead, you may use the" |
844 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
845 |
+ eerror "environment variables:" |
846 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
847 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
848 |
eerror |
849 |
return 1 |
850 |
fi |
851 |
fi |
852 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
853 |
- eerror "Commits must now be specified using the environmental variables" |
854 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
855 |
+ eerror "Commits must now be specified using the environment variables:" |
856 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
857 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
858 |
eerror |
859 |
return 1 |
860 |
fi |
861 |
@@ -302,10 +305,9 @@ pkg_setup() { |
862 |
|
863 |
src_unpack() { |
864 |
if [[ ${PV} == "9999" ]] ; then |
865 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
866 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
867 |
if use d3d9; then |
868 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
869 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
870 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
871 |
fi |
872 |
fi |
873 |
|
874 |
|
875 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.9-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.9-r1.ebuild |
876 |
index 6e13ba9..165db97 100644 |
877 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.9-r1.ebuild |
878 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.9-r1.ebuild |
879 |
@@ -257,14 +257,17 @@ wine_env_vcs_vars() { |
880 |
if use d3d9; then |
881 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
882 |
eerror "cannot be used to set the commit. Instead, you may use the" |
883 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
884 |
+ eerror "environment variables:" |
885 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
886 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
887 |
eerror |
888 |
return 1 |
889 |
fi |
890 |
fi |
891 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
892 |
- eerror "Commits must now be specified using the environmental variables" |
893 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
894 |
+ eerror "Commits must now be specified using the environment variables:" |
895 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
896 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
897 |
eerror |
898 |
return 1 |
899 |
fi |
900 |
@@ -303,10 +306,9 @@ pkg_setup() { |
901 |
|
902 |
src_unpack() { |
903 |
if [[ ${PV} == "9999" ]] ; then |
904 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
905 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
906 |
if use d3d9; then |
907 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
908 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
909 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
910 |
fi |
911 |
fi |
912 |
|
913 |
|
914 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.10.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.10.ebuild |
915 |
index f6f0da5..b5debdb 100644 |
916 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.10.ebuild |
917 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.10.ebuild |
918 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
919 |
if use d3d9; then |
920 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
921 |
eerror "cannot be used to set the commit. Instead, you may use the" |
922 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
923 |
+ eerror "environment variables:" |
924 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
925 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
926 |
eerror |
927 |
return 1 |
928 |
fi |
929 |
fi |
930 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
931 |
- eerror "Commits must now be specified using the environmental variables" |
932 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
933 |
+ eerror "Commits must now be specified using the environment variables:" |
934 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
935 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
936 |
eerror |
937 |
return 1 |
938 |
fi |
939 |
@@ -304,10 +307,9 @@ pkg_setup() { |
940 |
|
941 |
src_unpack() { |
942 |
if [[ ${PV} == "9999" ]] ; then |
943 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
944 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
945 |
if use d3d9; then |
946 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
947 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
948 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
949 |
fi |
950 |
fi |
951 |
|
952 |
|
953 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.11.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.11.ebuild |
954 |
index f6f0da5..b5debdb 100644 |
955 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.11.ebuild |
956 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.11.ebuild |
957 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
958 |
if use d3d9; then |
959 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
960 |
eerror "cannot be used to set the commit. Instead, you may use the" |
961 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
962 |
+ eerror "environment variables:" |
963 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
964 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
965 |
eerror |
966 |
return 1 |
967 |
fi |
968 |
fi |
969 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
970 |
- eerror "Commits must now be specified using the environmental variables" |
971 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
972 |
+ eerror "Commits must now be specified using the environment variables:" |
973 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
974 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
975 |
eerror |
976 |
return 1 |
977 |
fi |
978 |
@@ -304,10 +307,9 @@ pkg_setup() { |
979 |
|
980 |
src_unpack() { |
981 |
if [[ ${PV} == "9999" ]] ; then |
982 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
983 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
984 |
if use d3d9; then |
985 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
986 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
987 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
988 |
fi |
989 |
fi |
990 |
|
991 |
|
992 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.12.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.12.ebuild |
993 |
index f6f0da5..b5debdb 100644 |
994 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.12.ebuild |
995 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.12.ebuild |
996 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
997 |
if use d3d9; then |
998 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
999 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1000 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1001 |
+ eerror "environment variables:" |
1002 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1003 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1004 |
eerror |
1005 |
return 1 |
1006 |
fi |
1007 |
fi |
1008 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1009 |
- eerror "Commits must now be specified using the environmental variables" |
1010 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1011 |
+ eerror "Commits must now be specified using the environment variables:" |
1012 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1013 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1014 |
eerror |
1015 |
return 1 |
1016 |
fi |
1017 |
@@ -304,10 +307,9 @@ pkg_setup() { |
1018 |
|
1019 |
src_unpack() { |
1020 |
if [[ ${PV} == "9999" ]] ; then |
1021 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1022 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1023 |
if use d3d9; then |
1024 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1025 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1026 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1027 |
fi |
1028 |
fi |
1029 |
|
1030 |
|
1031 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.13-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.13-r1.ebuild |
1032 |
index 75a6bfe..5bed605 100644 |
1033 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.13-r1.ebuild |
1034 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.13-r1.ebuild |
1035 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
1036 |
if use d3d9; then |
1037 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1038 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1039 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1040 |
+ eerror "environment variables:" |
1041 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1042 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1043 |
eerror |
1044 |
return 1 |
1045 |
fi |
1046 |
fi |
1047 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1048 |
- eerror "Commits must now be specified using the environmental variables" |
1049 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1050 |
+ eerror "Commits must now be specified using the environment variables:" |
1051 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1052 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1053 |
eerror |
1054 |
return 1 |
1055 |
fi |
1056 |
@@ -304,10 +307,9 @@ pkg_setup() { |
1057 |
|
1058 |
src_unpack() { |
1059 |
if [[ ${PV} == "9999" ]] ; then |
1060 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1061 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1062 |
if use d3d9; then |
1063 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1064 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1065 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1066 |
fi |
1067 |
fi |
1068 |
|
1069 |
|
1070 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.13.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.13.ebuild |
1071 |
index 75a6bfe..5bed605 100644 |
1072 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.13.ebuild |
1073 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.13.ebuild |
1074 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
1075 |
if use d3d9; then |
1076 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1077 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1078 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1079 |
+ eerror "environment variables:" |
1080 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1081 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1082 |
eerror |
1083 |
return 1 |
1084 |
fi |
1085 |
fi |
1086 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1087 |
- eerror "Commits must now be specified using the environmental variables" |
1088 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1089 |
+ eerror "Commits must now be specified using the environment variables:" |
1090 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1091 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1092 |
eerror |
1093 |
return 1 |
1094 |
fi |
1095 |
@@ -304,10 +307,9 @@ pkg_setup() { |
1096 |
|
1097 |
src_unpack() { |
1098 |
if [[ ${PV} == "9999" ]] ; then |
1099 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1100 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1101 |
if use d3d9; then |
1102 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1103 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1104 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1105 |
fi |
1106 |
fi |
1107 |
|
1108 |
|
1109 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.14.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.14.ebuild |
1110 |
index 75a6bfe..5bed605 100644 |
1111 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.14.ebuild |
1112 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.14.ebuild |
1113 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
1114 |
if use d3d9; then |
1115 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1116 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1117 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1118 |
+ eerror "environment variables:" |
1119 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1120 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1121 |
eerror |
1122 |
return 1 |
1123 |
fi |
1124 |
fi |
1125 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1126 |
- eerror "Commits must now be specified using the environmental variables" |
1127 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1128 |
+ eerror "Commits must now be specified using the environment variables:" |
1129 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1130 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1131 |
eerror |
1132 |
return 1 |
1133 |
fi |
1134 |
@@ -304,10 +307,9 @@ pkg_setup() { |
1135 |
|
1136 |
src_unpack() { |
1137 |
if [[ ${PV} == "9999" ]] ; then |
1138 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1139 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1140 |
if use d3d9; then |
1141 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1142 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1143 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1144 |
fi |
1145 |
fi |
1146 |
|
1147 |
|
1148 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.15.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.15.ebuild |
1149 |
index 75a6bfe..5bed605 100644 |
1150 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.15.ebuild |
1151 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.15.ebuild |
1152 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
1153 |
if use d3d9; then |
1154 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1155 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1156 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1157 |
+ eerror "environment variables:" |
1158 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1159 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1160 |
eerror |
1161 |
return 1 |
1162 |
fi |
1163 |
fi |
1164 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1165 |
- eerror "Commits must now be specified using the environmental variables" |
1166 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1167 |
+ eerror "Commits must now be specified using the environment variables:" |
1168 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1169 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1170 |
eerror |
1171 |
return 1 |
1172 |
fi |
1173 |
@@ -304,10 +307,9 @@ pkg_setup() { |
1174 |
|
1175 |
src_unpack() { |
1176 |
if [[ ${PV} == "9999" ]] ; then |
1177 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1178 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1179 |
if use d3d9; then |
1180 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1181 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1182 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1183 |
fi |
1184 |
fi |
1185 |
|
1186 |
|
1187 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild |
1188 |
index 75a6bfe..5bed605 100644 |
1189 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild |
1190 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild |
1191 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
1192 |
if use d3d9; then |
1193 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1194 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1195 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1196 |
+ eerror "environment variables:" |
1197 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1198 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1199 |
eerror |
1200 |
return 1 |
1201 |
fi |
1202 |
fi |
1203 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1204 |
- eerror "Commits must now be specified using the environmental variables" |
1205 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1206 |
+ eerror "Commits must now be specified using the environment variables:" |
1207 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1208 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1209 |
eerror |
1210 |
return 1 |
1211 |
fi |
1212 |
@@ -304,10 +307,9 @@ pkg_setup() { |
1213 |
|
1214 |
src_unpack() { |
1215 |
if [[ ${PV} == "9999" ]] ; then |
1216 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1217 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1218 |
if use d3d9; then |
1219 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1220 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1221 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1222 |
fi |
1223 |
fi |
1224 |
|
1225 |
|
1226 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild |
1227 |
index 7ec9c71..fb4d194 100644 |
1228 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild |
1229 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild |
1230 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
1231 |
if use d3d9; then |
1232 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1233 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1234 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1235 |
+ eerror "environment variables:" |
1236 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1237 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1238 |
eerror |
1239 |
return 1 |
1240 |
fi |
1241 |
fi |
1242 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1243 |
- eerror "Commits must now be specified using the environmental variables" |
1244 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1245 |
+ eerror "Commits must now be specified using the environment variables:" |
1246 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1247 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1248 |
eerror |
1249 |
return 1 |
1250 |
fi |
1251 |
@@ -304,10 +307,9 @@ pkg_setup() { |
1252 |
|
1253 |
src_unpack() { |
1254 |
if [[ ${PV} == "9999" ]] ; then |
1255 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1256 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1257 |
if use d3d9; then |
1258 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1259 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1260 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1261 |
fi |
1262 |
fi |
1263 |
|
1264 |
|
1265 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild |
1266 |
index 7ec9c71..fb4d194 100644 |
1267 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild |
1268 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild |
1269 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
1270 |
if use d3d9; then |
1271 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1272 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1273 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1274 |
+ eerror "environment variables:" |
1275 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1276 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1277 |
eerror |
1278 |
return 1 |
1279 |
fi |
1280 |
fi |
1281 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1282 |
- eerror "Commits must now be specified using the environmental variables" |
1283 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1284 |
+ eerror "Commits must now be specified using the environment variables:" |
1285 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1286 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1287 |
eerror |
1288 |
return 1 |
1289 |
fi |
1290 |
@@ -304,10 +307,9 @@ pkg_setup() { |
1291 |
|
1292 |
src_unpack() { |
1293 |
if [[ ${PV} == "9999" ]] ; then |
1294 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1295 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1296 |
if use d3d9; then |
1297 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1298 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1299 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1300 |
fi |
1301 |
fi |
1302 |
|
1303 |
|
1304 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.3.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.3.ebuild |
1305 |
index 1ac4305..4ebef49 100644 |
1306 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.3.ebuild |
1307 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.3.ebuild |
1308 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
1309 |
if use d3d9; then |
1310 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1311 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1312 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1313 |
+ eerror "environment variables:" |
1314 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1315 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1316 |
eerror |
1317 |
return 1 |
1318 |
fi |
1319 |
fi |
1320 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1321 |
- eerror "Commits must now be specified using the environmental variables" |
1322 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1323 |
+ eerror "Commits must now be specified using the environment variables:" |
1324 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1325 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1326 |
eerror |
1327 |
return 1 |
1328 |
fi |
1329 |
@@ -302,10 +305,9 @@ pkg_setup() { |
1330 |
|
1331 |
src_unpack() { |
1332 |
if [[ ${PV} == "9999" ]] ; then |
1333 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1334 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1335 |
if use d3d9; then |
1336 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1337 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1338 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1339 |
fi |
1340 |
fi |
1341 |
|
1342 |
|
1343 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.4.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.4.ebuild |
1344 |
index 1ac4305..4ebef49 100644 |
1345 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.4.ebuild |
1346 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.4.ebuild |
1347 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
1348 |
if use d3d9; then |
1349 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1350 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1351 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1352 |
+ eerror "environment variables:" |
1353 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1354 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1355 |
eerror |
1356 |
return 1 |
1357 |
fi |
1358 |
fi |
1359 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1360 |
- eerror "Commits must now be specified using the environmental variables" |
1361 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1362 |
+ eerror "Commits must now be specified using the environment variables:" |
1363 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1364 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1365 |
eerror |
1366 |
return 1 |
1367 |
fi |
1368 |
@@ -302,10 +305,9 @@ pkg_setup() { |
1369 |
|
1370 |
src_unpack() { |
1371 |
if [[ ${PV} == "9999" ]] ; then |
1372 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1373 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1374 |
if use d3d9; then |
1375 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1376 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1377 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1378 |
fi |
1379 |
fi |
1380 |
|
1381 |
|
1382 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.5.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.5.ebuild |
1383 |
index 1ac4305..4ebef49 100644 |
1384 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.5.ebuild |
1385 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.5.ebuild |
1386 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
1387 |
if use d3d9; then |
1388 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1389 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1390 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1391 |
+ eerror "environment variables:" |
1392 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1393 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1394 |
eerror |
1395 |
return 1 |
1396 |
fi |
1397 |
fi |
1398 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1399 |
- eerror "Commits must now be specified using the environmental variables" |
1400 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1401 |
+ eerror "Commits must now be specified using the environment variables:" |
1402 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1403 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1404 |
eerror |
1405 |
return 1 |
1406 |
fi |
1407 |
@@ -302,10 +305,9 @@ pkg_setup() { |
1408 |
|
1409 |
src_unpack() { |
1410 |
if [[ ${PV} == "9999" ]] ; then |
1411 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1412 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1413 |
if use d3d9; then |
1414 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1415 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1416 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1417 |
fi |
1418 |
fi |
1419 |
|
1420 |
|
1421 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.6.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.6.ebuild |
1422 |
index 1ac4305..4ebef49 100644 |
1423 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.6.ebuild |
1424 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.6.ebuild |
1425 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
1426 |
if use d3d9; then |
1427 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1428 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1429 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1430 |
+ eerror "environment variables:" |
1431 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1432 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1433 |
eerror |
1434 |
return 1 |
1435 |
fi |
1436 |
fi |
1437 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1438 |
- eerror "Commits must now be specified using the environmental variables" |
1439 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1440 |
+ eerror "Commits must now be specified using the environment variables:" |
1441 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1442 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1443 |
eerror |
1444 |
return 1 |
1445 |
fi |
1446 |
@@ -302,10 +305,9 @@ pkg_setup() { |
1447 |
|
1448 |
src_unpack() { |
1449 |
if [[ ${PV} == "9999" ]] ; then |
1450 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1451 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1452 |
if use d3d9; then |
1453 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1454 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1455 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1456 |
fi |
1457 |
fi |
1458 |
|
1459 |
|
1460 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.7.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.7.ebuild |
1461 |
index 1ac4305..4ebef49 100644 |
1462 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.7.ebuild |
1463 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.7.ebuild |
1464 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
1465 |
if use d3d9; then |
1466 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1467 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1468 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1469 |
+ eerror "environment variables:" |
1470 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1471 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1472 |
eerror |
1473 |
return 1 |
1474 |
fi |
1475 |
fi |
1476 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1477 |
- eerror "Commits must now be specified using the environmental variables" |
1478 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1479 |
+ eerror "Commits must now be specified using the environment variables:" |
1480 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1481 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1482 |
eerror |
1483 |
return 1 |
1484 |
fi |
1485 |
@@ -302,10 +305,9 @@ pkg_setup() { |
1486 |
|
1487 |
src_unpack() { |
1488 |
if [[ ${PV} == "9999" ]] ; then |
1489 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1490 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1491 |
if use d3d9; then |
1492 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1493 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1494 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1495 |
fi |
1496 |
fi |
1497 |
|
1498 |
|
1499 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.8.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.8.ebuild |
1500 |
index 1ac4305..4ebef49 100644 |
1501 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.8.ebuild |
1502 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.8.ebuild |
1503 |
@@ -256,14 +256,17 @@ wine_env_vcs_vars() { |
1504 |
if use d3d9; then |
1505 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1506 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1507 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1508 |
+ eerror "environment variables:" |
1509 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1510 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1511 |
eerror |
1512 |
return 1 |
1513 |
fi |
1514 |
fi |
1515 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1516 |
- eerror "Commits must now be specified using the environmental variables" |
1517 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1518 |
+ eerror "Commits must now be specified using the environment variables:" |
1519 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1520 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1521 |
eerror |
1522 |
return 1 |
1523 |
fi |
1524 |
@@ -302,10 +305,9 @@ pkg_setup() { |
1525 |
|
1526 |
src_unpack() { |
1527 |
if [[ ${PV} == "9999" ]] ; then |
1528 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1529 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1530 |
if use d3d9; then |
1531 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1532 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1533 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1534 |
fi |
1535 |
fi |
1536 |
|
1537 |
|
1538 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild |
1539 |
index f6f0da5..b5debdb 100644 |
1540 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild |
1541 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild |
1542 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
1543 |
if use d3d9; then |
1544 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1545 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1546 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1547 |
+ eerror "environment variables:" |
1548 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1549 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1550 |
eerror |
1551 |
return 1 |
1552 |
fi |
1553 |
fi |
1554 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1555 |
- eerror "Commits must now be specified using the environmental variables" |
1556 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1557 |
+ eerror "Commits must now be specified using the environment variables:" |
1558 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1559 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1560 |
eerror |
1561 |
return 1 |
1562 |
fi |
1563 |
@@ -304,10 +307,9 @@ pkg_setup() { |
1564 |
|
1565 |
src_unpack() { |
1566 |
if [[ ${PV} == "9999" ]] ; then |
1567 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1568 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1569 |
if use d3d9; then |
1570 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1571 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1572 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1573 |
fi |
1574 |
fi |
1575 |
|
1576 |
|
1577 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
1578 |
index 75a6bfe..5bed605 100644 |
1579 |
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
1580 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
1581 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
1582 |
if use d3d9; then |
1583 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
1584 |
eerror "cannot be used to set the commit. Instead, you may use the" |
1585 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
1586 |
+ eerror "environment variables:" |
1587 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1588 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1589 |
eerror |
1590 |
return 1 |
1591 |
fi |
1592 |
fi |
1593 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
1594 |
- eerror "Commits must now be specified using the environmental variables" |
1595 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
1596 |
+ eerror "Commits must now be specified using the environment variables:" |
1597 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
1598 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
1599 |
eerror |
1600 |
return 1 |
1601 |
fi |
1602 |
@@ -304,10 +307,9 @@ pkg_setup() { |
1603 |
|
1604 |
src_unpack() { |
1605 |
if [[ ${PV} == "9999" ]] ; then |
1606 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
1607 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
1608 |
if use d3d9; then |
1609 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
1610 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
1611 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
1612 |
fi |
1613 |
fi |