Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine/
Date: Mon, 22 Oct 2018 23:36:56
Message-Id: 1540251349.a967b96f909b94a4a45bd4f22ecfe694a98dea9e.sarnex@gentoo
1 commit: a967b96f909b94a4a45bd4f22ecfe694a98dea9e
2 Author: Rob Walker <bob.mt.wya <AT> gmail <DOT> com>
3 AuthorDate: Sun Oct 21 18:50:46 2018 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 22 23:35:49 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=a967b96f
7
8 app-emulation/wine: 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/wine-2.0.ebuild | 2 +-
15 app-emulation/wine/wine-2.1.ebuild | 21 ++++++++++++---------
16 app-emulation/wine/wine-2.2.ebuild | 21 ++++++++++++---------
17 app-emulation/wine/wine-2.3.ebuild | 21 ++++++++++++---------
18 app-emulation/wine/wine-9999.ebuild | 21 ++++++++++++---------
19 5 files changed, 49 insertions(+), 37 deletions(-)
20
21 diff --git a/app-emulation/wine/wine-2.0.ebuild b/app-emulation/wine/wine-2.0.ebuild
22 index 99a23d9..093e5b8 100644
23 --- a/app-emulation/wine/wine-2.0.ebuild
24 +++ b/app-emulation/wine/wine-2.0.ebuild
25 @@ -248,7 +248,7 @@ pkg_setup() {
26
27 src_unpack() {
28 if [[ ${PV} == "9999" ]] ; then
29 - EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
30 + git-r3_src_unpack
31 fi
32
33 default
34
35 diff --git a/app-emulation/wine/wine-2.1.ebuild b/app-emulation/wine/wine-2.1.ebuild
36 index c0a183e..7605faf 100644
37 --- a/app-emulation/wine/wine-2.1.ebuild
38 +++ b/app-emulation/wine/wine-2.1.ebuild
39 @@ -281,14 +281,19 @@ wine_env_vcs_vars() {
40 if use staging || use d3d9; then
41 eerror "Because of the multi-repo nature of ${PN}, ${pn_live_var}"
42 eerror "cannot be used to set the commit. Instead, you may use the"
43 - eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT."
44 + eerror "environment variables:"
45 + eerror " EGIT_OVERRIDE_COMMIT_WINE"
46 + eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING"
47 + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
48 eerror
49 return 1
50 fi
51 fi
52 if [[ ! -z ${EGIT_COMMIT} ]]; then
53 eerror "Commits must now be specified using the environmental variables"
54 - eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
55 + eerror " EGIT_OVERRIDE_COMMIT_WINE"
56 + eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING"
57 + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
58 eerror
59 return 1
60 fi
61 @@ -322,24 +327,22 @@ pkg_setup() {
62
63 src_unpack() {
64 if [[ ${PV} == "9999" ]] ; then
65 - EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
66 + git-r3_src_unpack
67 if use staging; then
68 local CURRENT_WINE_COMMIT=${EGIT_VERSION}
69
70 - git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
71 - git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
72 + EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
73
74 local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
75
76 if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
77 einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
78 - einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
79 - einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
80 + einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE."
81 + einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
82 fi
83 fi
84 if use d3d9; then
85 - git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
86 - git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
87 + EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
88 fi
89 fi
90
91
92 diff --git a/app-emulation/wine/wine-2.2.ebuild b/app-emulation/wine/wine-2.2.ebuild
93 index c0a183e..7605faf 100644
94 --- a/app-emulation/wine/wine-2.2.ebuild
95 +++ b/app-emulation/wine/wine-2.2.ebuild
96 @@ -281,14 +281,19 @@ wine_env_vcs_vars() {
97 if use staging || use d3d9; then
98 eerror "Because of the multi-repo nature of ${PN}, ${pn_live_var}"
99 eerror "cannot be used to set the commit. Instead, you may use the"
100 - eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT."
101 + eerror "environment variables:"
102 + eerror " EGIT_OVERRIDE_COMMIT_WINE"
103 + eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING"
104 + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
105 eerror
106 return 1
107 fi
108 fi
109 if [[ ! -z ${EGIT_COMMIT} ]]; then
110 eerror "Commits must now be specified using the environmental variables"
111 - eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
112 + eerror " EGIT_OVERRIDE_COMMIT_WINE"
113 + eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING"
114 + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
115 eerror
116 return 1
117 fi
118 @@ -322,24 +327,22 @@ pkg_setup() {
119
120 src_unpack() {
121 if [[ ${PV} == "9999" ]] ; then
122 - EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
123 + git-r3_src_unpack
124 if use staging; then
125 local CURRENT_WINE_COMMIT=${EGIT_VERSION}
126
127 - git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
128 - git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
129 + EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
130
131 local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
132
133 if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
134 einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
135 - einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
136 - einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
137 + einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE."
138 + einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
139 fi
140 fi
141 if use d3d9; then
142 - git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
143 - git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
144 + EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
145 fi
146 fi
147
148
149 diff --git a/app-emulation/wine/wine-2.3.ebuild b/app-emulation/wine/wine-2.3.ebuild
150 index c0a183e..7605faf 100644
151 --- a/app-emulation/wine/wine-2.3.ebuild
152 +++ b/app-emulation/wine/wine-2.3.ebuild
153 @@ -281,14 +281,19 @@ wine_env_vcs_vars() {
154 if use staging || use d3d9; then
155 eerror "Because of the multi-repo nature of ${PN}, ${pn_live_var}"
156 eerror "cannot be used to set the commit. Instead, you may use the"
157 - eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT."
158 + eerror "environment variables:"
159 + eerror " EGIT_OVERRIDE_COMMIT_WINE"
160 + eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING"
161 + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
162 eerror
163 return 1
164 fi
165 fi
166 if [[ ! -z ${EGIT_COMMIT} ]]; then
167 eerror "Commits must now be specified using the environmental variables"
168 - eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
169 + eerror " EGIT_OVERRIDE_COMMIT_WINE"
170 + eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING"
171 + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
172 eerror
173 return 1
174 fi
175 @@ -322,24 +327,22 @@ pkg_setup() {
176
177 src_unpack() {
178 if [[ ${PV} == "9999" ]] ; then
179 - EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
180 + git-r3_src_unpack
181 if use staging; then
182 local CURRENT_WINE_COMMIT=${EGIT_VERSION}
183
184 - git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
185 - git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
186 + EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
187
188 local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
189
190 if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
191 einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
192 - einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
193 - einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
194 + einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE."
195 + einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
196 fi
197 fi
198 if use d3d9; then
199 - git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
200 - git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
201 + EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
202 fi
203 fi
204
205
206 diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
207 index a872411..16495a9 100644
208 --- a/app-emulation/wine/wine-9999.ebuild
209 +++ b/app-emulation/wine/wine-9999.ebuild
210 @@ -281,14 +281,19 @@ wine_env_vcs_vars() {
211 if use staging || use d3d9; then
212 eerror "Because of the multi-repo nature of ${PN}, ${pn_live_var}"
213 eerror "cannot be used to set the commit. Instead, you may use the"
214 - eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT."
215 + eerror "environment variables:"
216 + eerror " EGIT_OVERRIDE_COMMIT_WINE"
217 + eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING"
218 + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
219 eerror
220 return 1
221 fi
222 fi
223 if [[ ! -z ${EGIT_COMMIT} ]]; then
224 eerror "Commits must now be specified using the environmental variables"
225 - eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
226 + eerror " EGIT_OVERRIDE_COMMIT_WINE"
227 + eerror " EGIT_OVERRIDE_COMMIT_WINE_COMPHOLIO_WINE_STAGING"
228 + eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
229 eerror
230 return 1
231 fi
232 @@ -322,24 +327,22 @@ pkg_setup() {
233
234 src_unpack() {
235 if [[ ${PV} == "9999" ]] ; then
236 - EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
237 + git-r3_src_unpack
238 if use staging; then
239 local CURRENT_WINE_COMMIT=${EGIT_VERSION}
240
241 - git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
242 - git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
243 + EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
244
245 local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
246
247 if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
248 einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
249 - einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
250 - einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
251 + einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE."
252 + einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
253 fi
254 fi
255 if use d3d9; then
256 - git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
257 - git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
258 + EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
259 fi
260 fi
Report Message
Find on MARC Find on Google Groups