Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rustup/
Date: Sun, 18 Apr 2021 01:24:12
Message-Id: 1618709002.6287b48604097fe3369bd845ad931f4261ff6354.gyakovlev@gentoo
1 commit: 6287b48604097fe3369bd845ad931f4261ff6354
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 18 01:03:53 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 18 01:23:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6287b486
7
8 dev-util/rustup: use sed in src_prepare
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 dev-util/rustup/rustup-1.23.1.ebuild | 15 ++++++++++-----
14 1 file changed, 10 insertions(+), 5 deletions(-)
15
16 diff --git a/dev-util/rustup/rustup-1.23.1.ebuild b/dev-util/rustup/rustup-1.23.1.ebuild
17 index 2e5a86e9525..38bf4b1514c 100644
18 --- a/dev-util/rustup/rustup-1.23.1.ebuild
19 +++ b/dev-util/rustup/rustup-1.23.1.ebuild
20 @@ -313,14 +313,19 @@ src_unpack() {
21 cargo_live_src_unpack
22 else
23 cargo_src_unpack
24 - # patch git dep to use pre-fetched tarball
25 - #echo "" >> "${P}/Cargo.toml"
26 - #echo '[patch."https://github.com/rbtcollins/home"]' >> "${P}/Cargo.toml"
27 - local home_path="home = { path = '"${WORKDIR}/home-${HOME_COMMIT}"' }"
28 - sed -i "s@^home =.*@${home_path}@" "${P}/Cargo.toml" || die
29 fi
30 }
31
32 +src_prepare() {
33 + # patch git dep to use pre-fetched tarball
34 + #echo "" >> "${P}/Cargo.toml"
35 + #echo '[patch."https://github.com/rbtcollins/home"]' >> "${P}/Cargo.toml"
36 + local home_path="home = { path = '"${WORKDIR}/home-${HOME_COMMIT}"' }"
37 + sed -i "s@^home =.*@${home_path}@" "${P}/Cargo.toml" || die
38 +
39 + default
40 +}
41 +
42 src_configure() {
43 local myfeatures=( no-self-update )
44 cargo_src_configure