1 |
commit: 43c2a717e665e94232f46379013706959207c51a |
2 |
Author: Doug Goldstein <cardoe <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 23 03:30:33 2019 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 27 01:59:29 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43c2a717 |
7 |
|
8 |
eclass/cargo.eclass: specify --path . to install |
9 |
|
10 |
cargo install has long required --path . for 2018 edition crates but not |
11 |
required it for 2015 edition crates. It is supported however for 2015 |
12 |
edition crates and works for all versions in the tree so it makes sense |
13 |
to make it the default. Added CARGO_INSTALL_PATH as an eclass variable |
14 |
allowing to override the default. |
15 |
|
16 |
Closes: https://bugs.gentoo.org/703590 |
17 |
Signed-off-by: Doug Goldstein <cardoe <AT> gentoo.org> |
18 |
Closes: https://github.com/gentoo/gentoo/pull/14097 |
19 |
Tested-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
20 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
21 |
|
22 |
app-crypt/nitrocli/nitrocli-0.2.4.ebuild | 2 +- |
23 |
app-crypt/nitrocli/nitrocli-0.3.0.ebuild | 2 +- |
24 |
app-misc/cargo-license/cargo-license-0.3.0.ebuild | 2 +- |
25 |
app-misc/rpick/rpick-0.4.0.ebuild | 2 +- |
26 |
app-misc/rpick/rpick-0.5.0.ebuild | 2 +- |
27 |
app-misc/skim/skim-0.5.4.ebuild | 2 +- |
28 |
app-misc/skim/skim-0.5.5.ebuild | 2 +- |
29 |
app-misc/skim/skim-0.6.4.ebuild | 2 +- |
30 |
app-misc/skim/skim-0.6.6.ebuild | 2 +- |
31 |
app-misc/skim/skim-0.6.7.ebuild | 2 +- |
32 |
app-misc/skim/skim-0.6.8.ebuild | 2 +- |
33 |
app-shells/mcfly/mcfly-0.3.4.ebuild | 2 +- |
34 |
app-text/fblog/fblog-1.3.1.ebuild | 2 +- |
35 |
dev-util/cargo-tree/cargo-tree-0.23.0.ebuild | 2 +- |
36 |
dev-util/cargo-tree/cargo-tree-0.24.0.ebuild | 2 +- |
37 |
dev-util/cargo-tree/cargo-tree-0.25.0.ebuild | 2 +- |
38 |
dev-util/cargo-tree/cargo-tree-0.26.0.ebuild | 2 +- |
39 |
dev-util/cargo-tree/cargo-tree-0.27.0.ebuild | 2 +- |
40 |
dev-util/sccache/sccache-0.2.10.ebuild | 2 +- |
41 |
dev-util/sccache/sccache-0.2.8-r2.ebuild | 2 +- |
42 |
dev-util/sccache/sccache-0.2.9.ebuild | 2 +- |
43 |
dev-util/wasmer/wasmer-0.11.0.ebuild | 2 +- |
44 |
eclass/cargo.eclass | 8 +++++++- |
45 |
media-video/rav1e/rav1e-9999.ebuild | 4 ---- |
46 |
sys-apps/bat/bat-0.12.0.ebuild | 2 +- |
47 |
sys-apps/exa/exa-0.9.0.ebuild | 2 +- |
48 |
sys-apps/fd/fd-7.3.0-r1.ebuild | 2 +- |
49 |
sys-apps/lsd/lsd-0.14.0.ebuild | 2 +- |
50 |
sys-apps/lsd/lsd-0.15.1.ebuild | 2 +- |
51 |
sys-apps/lsd/lsd-0.16.0.ebuild | 2 +- |
52 |
sys-apps/ripgrep/ripgrep-11.0.1.ebuild | 2 +- |
53 |
sys-apps/ripgrep/ripgrep-11.0.2.ebuild | 2 +- |
54 |
x11-terms/alacritty/alacritty-0.3.3-r1.ebuild | 4 +++- |
55 |
x11-terms/alacritty/alacritty-0.4.0.ebuild | 4 +++- |
56 |
x11-terms/alacritty/alacritty-9999.ebuild | 4 +++- |
57 |
35 files changed, 46 insertions(+), 38 deletions(-) |
58 |
|
59 |
diff --git a/app-crypt/nitrocli/nitrocli-0.2.4.ebuild b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild |
60 |
index ff6f4c8d139..8003f3ae49a 100644 |
61 |
--- a/app-crypt/nitrocli/nitrocli-0.2.4.ebuild |
62 |
+++ b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild |
63 |
@@ -67,7 +67,7 @@ RESTRICT="test" |
64 |
QA_FLAGS_IGNORED="/usr/bin/nitrocli" |
65 |
|
66 |
src_install() { |
67 |
- cargo_src_install --path=. |
68 |
+ cargo_src_install |
69 |
|
70 |
einstalldocs |
71 |
doman "doc/nitrocli.1" |
72 |
|
73 |
diff --git a/app-crypt/nitrocli/nitrocli-0.3.0.ebuild b/app-crypt/nitrocli/nitrocli-0.3.0.ebuild |
74 |
index 7f040b5669e..a39e5325f96 100644 |
75 |
--- a/app-crypt/nitrocli/nitrocli-0.3.0.ebuild |
76 |
+++ b/app-crypt/nitrocli/nitrocli-0.3.0.ebuild |
77 |
@@ -67,7 +67,7 @@ RESTRICT="test" |
78 |
QA_FLAGS_IGNORED="/usr/bin/nitrocli" |
79 |
|
80 |
src_install() { |
81 |
- cargo_src_install --path=. |
82 |
+ cargo_src_install |
83 |
|
84 |
einstalldocs |
85 |
doman "doc/nitrocli.1" |
86 |
|
87 |
diff --git a/app-misc/cargo-license/cargo-license-0.3.0.ebuild b/app-misc/cargo-license/cargo-license-0.3.0.ebuild |
88 |
index dce7c3b9fee..b159a850681 100644 |
89 |
--- a/app-misc/cargo-license/cargo-license-0.3.0.ebuild |
90 |
+++ b/app-misc/cargo-license/cargo-license-0.3.0.ebuild |
91 |
@@ -69,6 +69,6 @@ KEYWORDS="~amd64 ~x86" |
92 |
QA_FLAGS_IGNORED="/usr/bin/cargo-license" |
93 |
|
94 |
src_install() { |
95 |
- cargo_src_install --path=. |
96 |
+ cargo_src_install |
97 |
einstalldocs |
98 |
} |
99 |
|
100 |
diff --git a/app-misc/rpick/rpick-0.4.0.ebuild b/app-misc/rpick/rpick-0.4.0.ebuild |
101 |
index 70cd73d6a23..4f9ccd1a476 100644 |
102 |
--- a/app-misc/rpick/rpick-0.4.0.ebuild |
103 |
+++ b/app-misc/rpick/rpick-0.4.0.ebuild |
104 |
@@ -90,7 +90,7 @@ DOCS=( CHANGELOG.md README.md ) |
105 |
QA_FLAGS_IGNORED="usr/bin/rpick" |
106 |
|
107 |
src_install() { |
108 |
- cargo_src_install --path=. |
109 |
+ cargo_src_install |
110 |
|
111 |
einstalldocs |
112 |
} |
113 |
|
114 |
diff --git a/app-misc/rpick/rpick-0.5.0.ebuild b/app-misc/rpick/rpick-0.5.0.ebuild |
115 |
index c11bb5b083d..eb0b0d6af03 100644 |
116 |
--- a/app-misc/rpick/rpick-0.5.0.ebuild |
117 |
+++ b/app-misc/rpick/rpick-0.5.0.ebuild |
118 |
@@ -91,7 +91,7 @@ DOCS=( CHANGELOG.md README.md ) |
119 |
QA_FLAGS_IGNORED="usr/bin/rpick" |
120 |
|
121 |
src_install() { |
122 |
- cargo_src_install --path=. |
123 |
+ cargo_src_install |
124 |
|
125 |
einstalldocs |
126 |
} |
127 |
|
128 |
diff --git a/app-misc/skim/skim-0.5.4.ebuild b/app-misc/skim/skim-0.5.4.ebuild |
129 |
index ea4eeca24d4..a5f5292682d 100644 |
130 |
--- a/app-misc/skim/skim-0.5.4.ebuild |
131 |
+++ b/app-misc/skim/skim-0.5.4.ebuild |
132 |
@@ -58,7 +58,7 @@ RDEPEND=" |
133 |
QA_FLAGS_IGNORED="usr/bin/sk" |
134 |
|
135 |
src_install() { |
136 |
- cargo_src_install --path=. |
137 |
+ cargo_src_install |
138 |
dodoc CHANGELOG.md README.md |
139 |
|
140 |
use tmux && dobin bin/sk-tmux |
141 |
|
142 |
diff --git a/app-misc/skim/skim-0.5.5.ebuild b/app-misc/skim/skim-0.5.5.ebuild |
143 |
index 37e18dab525..3c47ec961a9 100644 |
144 |
--- a/app-misc/skim/skim-0.5.5.ebuild |
145 |
+++ b/app-misc/skim/skim-0.5.5.ebuild |
146 |
@@ -57,7 +57,7 @@ RDEPEND=" |
147 |
QA_FLAGS_IGNORED="usr/bin/sk" |
148 |
|
149 |
src_install() { |
150 |
- cargo_src_install --path=. |
151 |
+ cargo_src_install |
152 |
dodoc CHANGELOG.md README.md |
153 |
|
154 |
use tmux && dobin bin/sk-tmux |
155 |
|
156 |
diff --git a/app-misc/skim/skim-0.6.4.ebuild b/app-misc/skim/skim-0.6.4.ebuild |
157 |
index 7eab30978e9..8c683ced2c7 100644 |
158 |
--- a/app-misc/skim/skim-0.6.4.ebuild |
159 |
+++ b/app-misc/skim/skim-0.6.4.ebuild |
160 |
@@ -90,7 +90,7 @@ src_install() { |
161 |
# prevent cargo_src_install() blowing up on man installation |
162 |
mv man manpages || die |
163 |
|
164 |
- cargo_src_install --path=. |
165 |
+ cargo_src_install |
166 |
dodoc CHANGELOG.md README.md |
167 |
doman manpages/man1/* |
168 |
|
169 |
|
170 |
diff --git a/app-misc/skim/skim-0.6.6.ebuild b/app-misc/skim/skim-0.6.6.ebuild |
171 |
index 406e8b4abca..ae934bd00fd 100644 |
172 |
--- a/app-misc/skim/skim-0.6.6.ebuild |
173 |
+++ b/app-misc/skim/skim-0.6.6.ebuild |
174 |
@@ -94,7 +94,7 @@ src_install() { |
175 |
# prevent cargo_src_install() blowing up on man installation |
176 |
mv man manpages || die |
177 |
|
178 |
- cargo_src_install --path=. |
179 |
+ cargo_src_install |
180 |
dodoc CHANGELOG.md README.md |
181 |
doman manpages/man1/* |
182 |
|
183 |
|
184 |
diff --git a/app-misc/skim/skim-0.6.7.ebuild b/app-misc/skim/skim-0.6.7.ebuild |
185 |
index cc50f91bb4d..d52d62ad9ed 100644 |
186 |
--- a/app-misc/skim/skim-0.6.7.ebuild |
187 |
+++ b/app-misc/skim/skim-0.6.7.ebuild |
188 |
@@ -98,7 +98,7 @@ src_install() { |
189 |
# prevent cargo_src_install() blowing up on man installation |
190 |
mv man manpages || die |
191 |
|
192 |
- cargo_src_install --path=. |
193 |
+ cargo_src_install |
194 |
dodoc CHANGELOG.md README.md |
195 |
doman manpages/man1/* |
196 |
|
197 |
|
198 |
diff --git a/app-misc/skim/skim-0.6.8.ebuild b/app-misc/skim/skim-0.6.8.ebuild |
199 |
index 0290b225d1d..2ce7a1d1d13 100644 |
200 |
--- a/app-misc/skim/skim-0.6.8.ebuild |
201 |
+++ b/app-misc/skim/skim-0.6.8.ebuild |
202 |
@@ -97,7 +97,7 @@ src_install() { |
203 |
# prevent cargo_src_install() blowing up on man installation |
204 |
mv man manpages || die |
205 |
|
206 |
- cargo_src_install --path=. |
207 |
+ cargo_src_install |
208 |
dodoc CHANGELOG.md README.md |
209 |
doman manpages/man1/* |
210 |
|
211 |
|
212 |
diff --git a/app-shells/mcfly/mcfly-0.3.4.ebuild b/app-shells/mcfly/mcfly-0.3.4.ebuild |
213 |
index 1ce9fc5247a..282ad8132c0 100644 |
214 |
--- a/app-shells/mcfly/mcfly-0.3.4.ebuild |
215 |
+++ b/app-shells/mcfly/mcfly-0.3.4.ebuild |
216 |
@@ -76,7 +76,7 @@ DEPEND="" |
217 |
RDEPEND="" |
218 |
|
219 |
src_install() { |
220 |
- cargo_src_install --path=. |
221 |
+ cargo_src_install |
222 |
|
223 |
insinto "/usr/share/${PN}" |
224 |
doins "${PN}.bash" |
225 |
|
226 |
diff --git a/app-text/fblog/fblog-1.3.1.ebuild b/app-text/fblog/fblog-1.3.1.ebuild |
227 |
index f4b44651c60..c7194a216f9 100644 |
228 |
--- a/app-text/fblog/fblog-1.3.1.ebuild |
229 |
+++ b/app-text/fblog/fblog-1.3.1.ebuild |
230 |
@@ -59,6 +59,6 @@ DOCS=( README.org sample.json.log ) |
231 |
QA_FLAGS_IGNORED="/usr/bin/fblog" |
232 |
|
233 |
src_install() { |
234 |
- cargo_src_install --path=. |
235 |
+ cargo_src_install |
236 |
einstalldocs |
237 |
} |
238 |
|
239 |
diff --git a/dev-util/cargo-tree/cargo-tree-0.23.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.23.0.ebuild |
240 |
index 360f71e835a..52eba65bc49 100644 |
241 |
--- a/dev-util/cargo-tree/cargo-tree-0.23.0.ebuild |
242 |
+++ b/dev-util/cargo-tree/cargo-tree-0.23.0.ebuild |
243 |
@@ -184,6 +184,6 @@ RDEPEND=" |
244 |
DEPEND="${RDEPEND}" |
245 |
|
246 |
src_install(){ |
247 |
- cargo_src_install --path=. |
248 |
+ cargo_src_install |
249 |
einstalldocs |
250 |
} |
251 |
|
252 |
diff --git a/dev-util/cargo-tree/cargo-tree-0.24.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.24.0.ebuild |
253 |
index ac198d10045..131d1816df0 100644 |
254 |
--- a/dev-util/cargo-tree/cargo-tree-0.24.0.ebuild |
255 |
+++ b/dev-util/cargo-tree/cargo-tree-0.24.0.ebuild |
256 |
@@ -176,6 +176,6 @@ RDEPEND=" |
257 |
DEPEND="${RDEPEND}" |
258 |
|
259 |
src_install(){ |
260 |
- cargo_src_install --path=. |
261 |
+ cargo_src_install |
262 |
einstalldocs |
263 |
} |
264 |
|
265 |
diff --git a/dev-util/cargo-tree/cargo-tree-0.25.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.25.0.ebuild |
266 |
index cb4b4eb835f..c291745eb47 100644 |
267 |
--- a/dev-util/cargo-tree/cargo-tree-0.25.0.ebuild |
268 |
+++ b/dev-util/cargo-tree/cargo-tree-0.25.0.ebuild |
269 |
@@ -177,6 +177,6 @@ RDEPEND=" |
270 |
DEPEND="${RDEPEND}" |
271 |
|
272 |
src_install(){ |
273 |
- cargo_src_install --path=. |
274 |
+ cargo_src_install |
275 |
einstalldocs |
276 |
} |
277 |
|
278 |
diff --git a/dev-util/cargo-tree/cargo-tree-0.26.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.26.0.ebuild |
279 |
index 6e53a2e0be2..94af6ea62fc 100644 |
280 |
--- a/dev-util/cargo-tree/cargo-tree-0.26.0.ebuild |
281 |
+++ b/dev-util/cargo-tree/cargo-tree-0.26.0.ebuild |
282 |
@@ -181,6 +181,6 @@ RDEPEND=" |
283 |
DEPEND="${RDEPEND}" |
284 |
|
285 |
src_install(){ |
286 |
- cargo_src_install --path=. |
287 |
+ cargo_src_install |
288 |
einstalldocs |
289 |
} |
290 |
|
291 |
diff --git a/dev-util/cargo-tree/cargo-tree-0.27.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.27.0.ebuild |
292 |
index e0917ba37b5..cdcc8337e70 100644 |
293 |
--- a/dev-util/cargo-tree/cargo-tree-0.27.0.ebuild |
294 |
+++ b/dev-util/cargo-tree/cargo-tree-0.27.0.ebuild |
295 |
@@ -183,6 +183,6 @@ DEPEND="${RDEPEND} |
296 |
" |
297 |
|
298 |
src_install(){ |
299 |
- cargo_src_install --path=. |
300 |
+ cargo_src_install |
301 |
einstalldocs |
302 |
} |
303 |
|
304 |
diff --git a/dev-util/sccache/sccache-0.2.10.ebuild b/dev-util/sccache/sccache-0.2.10.ebuild |
305 |
index 09322dc521c..79d25139c15 100644 |
306 |
--- a/dev-util/sccache/sccache-0.2.10.ebuild |
307 |
+++ b/dev-util/sccache/sccache-0.2.10.ebuild |
308 |
@@ -331,7 +331,7 @@ src_compile(){ |
309 |
} |
310 |
|
311 |
src_install() { |
312 |
- cargo_src_install --path=. ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features |
313 |
+ cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features |
314 |
|
315 |
keepdir /etc/sccache |
316 |
|
317 |
|
318 |
diff --git a/dev-util/sccache/sccache-0.2.8-r2.ebuild b/dev-util/sccache/sccache-0.2.8-r2.ebuild |
319 |
index 21a6f2c2688..3cec993ae5e 100644 |
320 |
--- a/dev-util/sccache/sccache-0.2.8-r2.ebuild |
321 |
+++ b/dev-util/sccache/sccache-0.2.8-r2.ebuild |
322 |
@@ -328,7 +328,7 @@ src_compile(){ |
323 |
} |
324 |
|
325 |
src_install() { |
326 |
- cargo_src_install --path=. ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features |
327 |
+ cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features |
328 |
|
329 |
keepdir /etc/sccache |
330 |
|
331 |
|
332 |
diff --git a/dev-util/sccache/sccache-0.2.9.ebuild b/dev-util/sccache/sccache-0.2.9.ebuild |
333 |
index d1941557a46..9995856c362 100644 |
334 |
--- a/dev-util/sccache/sccache-0.2.9.ebuild |
335 |
+++ b/dev-util/sccache/sccache-0.2.9.ebuild |
336 |
@@ -331,7 +331,7 @@ src_compile(){ |
337 |
} |
338 |
|
339 |
src_install() { |
340 |
- cargo_src_install --path=. ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features |
341 |
+ cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features |
342 |
|
343 |
keepdir /etc/sccache |
344 |
|
345 |
|
346 |
diff --git a/dev-util/wasmer/wasmer-0.11.0.ebuild b/dev-util/wasmer/wasmer-0.11.0.ebuild |
347 |
index fbef79ddf28..336e379622d 100644 |
348 |
--- a/dev-util/wasmer/wasmer-0.11.0.ebuild |
349 |
+++ b/dev-util/wasmer/wasmer-0.11.0.ebuild |
350 |
@@ -191,6 +191,6 @@ src_prepare() { |
351 |
} |
352 |
|
353 |
src_install() { |
354 |
- cargo_src_install --path=. |
355 |
+ cargo_src_install |
356 |
einstalldocs |
357 |
} |
358 |
|
359 |
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass |
360 |
index 13dd5c355fb..fb759f95903 100644 |
361 |
--- a/eclass/cargo.eclass |
362 |
+++ b/eclass/cargo.eclass |
363 |
@@ -34,6 +34,11 @@ IUSE="${IUSE} debug" |
364 |
ECARGO_HOME="${WORKDIR}/cargo_home" |
365 |
ECARGO_VENDOR="${ECARGO_HOME}/gentoo" |
366 |
|
367 |
+# @ECLASS-VARIABLE: CARGO_INSTALL_PATH |
368 |
+# @DESCRIPTION: |
369 |
+# Allows overriding the default cwd to run cargo install from |
370 |
+: ${CARGO_INSTALL_PATH:=.} |
371 |
+ |
372 |
# @FUNCTION: cargo_crate_uris |
373 |
# @DESCRIPTION: |
374 |
# Generates the URIs to put in SRC_URI to help fetch dependencies. |
375 |
@@ -156,7 +161,8 @@ cargo_src_compile() { |
376 |
cargo_src_install() { |
377 |
debug-print-function ${FUNCNAME} "$@" |
378 |
|
379 |
- cargo install -vv -j $(makeopts_jobs) --root="${ED}/usr" $(usex debug --debug "") "$@" \ |
380 |
+ cargo install -vv -j $(makeopts_jobs) --path ${CARGO_INSTALL_PATH} \ |
381 |
+ --root="${ED}/usr" $(usex debug --debug "") "$@" \ |
382 |
|| die "cargo install failed" |
383 |
rm -f "${ED}/usr/.crates.toml" |
384 |
|
385 |
|
386 |
diff --git a/media-video/rav1e/rav1e-9999.ebuild b/media-video/rav1e/rav1e-9999.ebuild |
387 |
index 0136a727b3a..131796f9e62 100644 |
388 |
--- a/media-video/rav1e/rav1e-9999.ebuild |
389 |
+++ b/media-video/rav1e/rav1e-9999.ebuild |
390 |
@@ -32,7 +32,3 @@ src_unpack() { |
391 |
cargo_live_src_unpack |
392 |
fi |
393 |
} |
394 |
- |
395 |
-src_install() { |
396 |
- cargo_src_install --path . |
397 |
-} |
398 |
|
399 |
diff --git a/sys-apps/bat/bat-0.12.0.ebuild b/sys-apps/bat/bat-0.12.0.ebuild |
400 |
index b64e6923594..e48ae145f2d 100644 |
401 |
--- a/sys-apps/bat/bat-0.12.0.ebuild |
402 |
+++ b/sys-apps/bat/bat-0.12.0.ebuild |
403 |
@@ -169,7 +169,7 @@ DOCS=( README.md doc/alternatives.md ) |
404 |
QA_FLAGS_IGNORED="/usr/bin/bat" |
405 |
|
406 |
src_install() { |
407 |
- cargo_src_install --path=. |
408 |
+ cargo_src_install |
409 |
doman doc/bat.1 |
410 |
einstalldocs |
411 |
insinto /usr/share/fish/vendor_completions.d/ |
412 |
|
413 |
diff --git a/sys-apps/exa/exa-0.9.0.ebuild b/sys-apps/exa/exa-0.9.0.ebuild |
414 |
index 633657fe1c8..5ef9de3fb7b 100644 |
415 |
--- a/sys-apps/exa/exa-0.9.0.ebuild |
416 |
+++ b/sys-apps/exa/exa-0.9.0.ebuild |
417 |
@@ -99,7 +99,7 @@ src_compile() { |
418 |
} |
419 |
|
420 |
src_install() { |
421 |
- cargo_src_install --path=./ $(usex git "" --no-default-features) |
422 |
+ cargo_src_install $(usex git "" --no-default-features) |
423 |
|
424 |
newbashcomp contrib/completions.bash exa |
425 |
|
426 |
|
427 |
diff --git a/sys-apps/fd/fd-7.3.0-r1.ebuild b/sys-apps/fd/fd-7.3.0-r1.ebuild |
428 |
index 3afbc07ff76..66ffd10fadf 100644 |
429 |
--- a/sys-apps/fd/fd-7.3.0-r1.ebuild |
430 |
+++ b/sys-apps/fd/fd-7.3.0-r1.ebuild |
431 |
@@ -86,7 +86,7 @@ src_compile() { |
432 |
} |
433 |
|
434 |
src_install() { |
435 |
- cargo_src_install --path=. |
436 |
+ cargo_src_install |
437 |
|
438 |
newbashcomp "${T}"/shell_completions/fd.bash fd |
439 |
insinto /usr/share/zsh/site-functions |
440 |
|
441 |
diff --git a/sys-apps/lsd/lsd-0.14.0.ebuild b/sys-apps/lsd/lsd-0.14.0.ebuild |
442 |
index b7706acf02f..e8451f70638 100644 |
443 |
--- a/sys-apps/lsd/lsd-0.14.0.ebuild |
444 |
+++ b/sys-apps/lsd/lsd-0.14.0.ebuild |
445 |
@@ -59,6 +59,6 @@ BDEPEND=">=virtual/rust-1.31.0" |
446 |
QA_FLAGS_IGNORED="/usr/bin/lsd" |
447 |
|
448 |
src_install() { |
449 |
- cargo_src_install --path . |
450 |
+ cargo_src_install |
451 |
einstalldocs |
452 |
} |
453 |
|
454 |
diff --git a/sys-apps/lsd/lsd-0.15.1.ebuild b/sys-apps/lsd/lsd-0.15.1.ebuild |
455 |
index 25a04b987bf..4eb55bcbe8f 100644 |
456 |
--- a/sys-apps/lsd/lsd-0.15.1.ebuild |
457 |
+++ b/sys-apps/lsd/lsd-0.15.1.ebuild |
458 |
@@ -62,6 +62,6 @@ BDEPEND=">=virtual/rust-1.31.0" |
459 |
QA_FLAGS_IGNORED="/usr/bin/lsd" |
460 |
|
461 |
src_install() { |
462 |
- cargo_src_install --path . |
463 |
+ cargo_src_install |
464 |
einstalldocs |
465 |
} |
466 |
|
467 |
diff --git a/sys-apps/lsd/lsd-0.16.0.ebuild b/sys-apps/lsd/lsd-0.16.0.ebuild |
468 |
index 9e3d88dadba..4f51333bfcb 100644 |
469 |
--- a/sys-apps/lsd/lsd-0.16.0.ebuild |
470 |
+++ b/sys-apps/lsd/lsd-0.16.0.ebuild |
471 |
@@ -74,6 +74,6 @@ BDEPEND=">=virtual/rust-1.31.0" |
472 |
QA_FLAGS_IGNORED="/usr/bin/lsd" |
473 |
|
474 |
src_install() { |
475 |
- cargo_src_install --path . |
476 |
+ cargo_src_install |
477 |
einstalldocs |
478 |
} |
479 |
|
480 |
diff --git a/sys-apps/ripgrep/ripgrep-11.0.1.ebuild b/sys-apps/ripgrep/ripgrep-11.0.1.ebuild |
481 |
index 7c2dbd8ad9f..bac0e66e227 100644 |
482 |
--- a/sys-apps/ripgrep/ripgrep-11.0.1.ebuild |
483 |
+++ b/sys-apps/ripgrep/ripgrep-11.0.1.ebuild |
484 |
@@ -115,7 +115,7 @@ src_compile() { |
485 |
} |
486 |
|
487 |
src_install() { |
488 |
- cargo_src_install --path=. $(usex pcre "--features pcre2" "") |
489 |
+ cargo_src_install $(usex pcre "--features pcre2" "") |
490 |
|
491 |
# hack to find/install generated files |
492 |
# stamp file can be present in multiple dirs if we build additional features |
493 |
|
494 |
diff --git a/sys-apps/ripgrep/ripgrep-11.0.2.ebuild b/sys-apps/ripgrep/ripgrep-11.0.2.ebuild |
495 |
index 3d20e3a68a9..fb7f5349baa 100644 |
496 |
--- a/sys-apps/ripgrep/ripgrep-11.0.2.ebuild |
497 |
+++ b/sys-apps/ripgrep/ripgrep-11.0.2.ebuild |
498 |
@@ -99,7 +99,7 @@ src_compile() { |
499 |
} |
500 |
|
501 |
src_install() { |
502 |
- cargo_src_install --path=. $(usex pcre "--features pcre2" "") |
503 |
+ cargo_src_install $(usex pcre "--features pcre2" "") |
504 |
|
505 |
# hack to find/install generated files |
506 |
# stamp file can be present in multiple dirs if we build additional features |
507 |
|
508 |
diff --git a/x11-terms/alacritty/alacritty-0.3.3-r1.ebuild b/x11-terms/alacritty/alacritty-0.3.3-r1.ebuild |
509 |
index 71741cd37be..20c79816962 100644 |
510 |
--- a/x11-terms/alacritty/alacritty-0.3.3-r1.ebuild |
511 |
+++ b/x11-terms/alacritty/alacritty-0.3.3-r1.ebuild |
512 |
@@ -320,8 +320,10 @@ QA_FLAGS_IGNORED="usr/bin/alacritty" |
513 |
|
514 |
S="${WORKDIR}/${PN}-${MY_PV}" |
515 |
|
516 |
+CARGO_INSTALL_PATH="alacritty" |
517 |
+ |
518 |
src_install() { |
519 |
- cargo_src_install --path=alacritty |
520 |
+ cargo_src_install |
521 |
|
522 |
newbashcomp extra/completions/alacritty.bash alacritty |
523 |
|
524 |
|
525 |
diff --git a/x11-terms/alacritty/alacritty-0.4.0.ebuild b/x11-terms/alacritty/alacritty-0.4.0.ebuild |
526 |
index 15df72e2bcc..6fdd26ebf94 100644 |
527 |
--- a/x11-terms/alacritty/alacritty-0.4.0.ebuild |
528 |
+++ b/x11-terms/alacritty/alacritty-0.4.0.ebuild |
529 |
@@ -335,6 +335,8 @@ QA_FLAGS_IGNORED="usr/bin/alacritty" |
530 |
|
531 |
S="${WORKDIR}/${PN}-${MY_PV}" |
532 |
|
533 |
+CARGO_INSTALL_PATH="alacritty" |
534 |
+ |
535 |
src_unpack() { |
536 |
if [[ "${PV}" == *9999* ]]; then |
537 |
git-r3_src_unpack |
538 |
@@ -350,7 +352,7 @@ src_prepare() { |
539 |
} |
540 |
|
541 |
src_install() { |
542 |
- cargo_src_install --path=alacritty --offline |
543 |
+ cargo_src_install --offline |
544 |
|
545 |
newbashcomp extra/completions/alacritty.bash alacritty |
546 |
|
547 |
|
548 |
diff --git a/x11-terms/alacritty/alacritty-9999.ebuild b/x11-terms/alacritty/alacritty-9999.ebuild |
549 |
index bf9813cb8fa..719e516f5db 100644 |
550 |
--- a/x11-terms/alacritty/alacritty-9999.ebuild |
551 |
+++ b/x11-terms/alacritty/alacritty-9999.ebuild |
552 |
@@ -50,6 +50,8 @@ QA_FLAGS_IGNORED="usr/bin/alacritty" |
553 |
|
554 |
S="${WORKDIR}/${PN}-${MY_PV}" |
555 |
|
556 |
+CARGO_INSTALL_PATH="alacritty" |
557 |
+ |
558 |
src_unpack() { |
559 |
if [[ "${PV}" == *9999* ]]; then |
560 |
git-r3_src_unpack |
561 |
@@ -60,7 +62,7 @@ src_unpack() { |
562 |
} |
563 |
|
564 |
src_install() { |
565 |
- cargo_src_install --path=alacritty --offline |
566 |
+ cargo_src_install --offline |
567 |
|
568 |
newbashcomp extra/completions/alacritty.bash alacritty |