public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rustup/
Date: Sun, 18 Apr 2021 01:24:08 +0000 (UTC)	[thread overview]
Message-ID: <1618709002.6287b48604097fe3369bd845ad931f4261ff6354.gyakovlev@gentoo> (raw)

commit:     6287b48604097fe3369bd845ad931f4261ff6354
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 01:03:53 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Apr 18 01:23:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6287b486

dev-util/rustup: use sed in src_prepare

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-util/rustup/rustup-1.23.1.ebuild | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/dev-util/rustup/rustup-1.23.1.ebuild b/dev-util/rustup/rustup-1.23.1.ebuild
index 2e5a86e9525..38bf4b1514c 100644
--- a/dev-util/rustup/rustup-1.23.1.ebuild
+++ b/dev-util/rustup/rustup-1.23.1.ebuild
@@ -313,14 +313,19 @@ src_unpack() {
 		cargo_live_src_unpack
 	else
 		cargo_src_unpack
-		# patch git dep to use pre-fetched tarball
-		#echo "" >> "${P}/Cargo.toml"
-		#echo '[patch."https://github.com/rbtcollins/home"]' >> "${P}/Cargo.toml"
-		local home_path="home = { path = '"${WORKDIR}/home-${HOME_COMMIT}"' }"
-		sed -i "s@^home =.*@${home_path}@" "${P}/Cargo.toml" || die
 	fi
 }
 
+src_prepare() {
+	# patch git dep to use pre-fetched tarball
+	#echo "" >> "${P}/Cargo.toml"
+	#echo '[patch."https://github.com/rbtcollins/home"]' >> "${P}/Cargo.toml"
+	local home_path="home = { path = '"${WORKDIR}/home-${HOME_COMMIT}"' }"
+	sed -i "s@^home =.*@${home_path}@" "${P}/Cargo.toml" || die
+
+	default
+}
+
 src_configure() {
 	local myfeatures=( no-self-update )
 	cargo_src_configure


             reply	other threads:[~2021-04-18  1:24 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-18  1:24 Georgy Yakovlev [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-18 10:50 [gentoo-commits] repo/gentoo:master commit in: dev-util/rustup/ Arthur Zamarin
2024-09-13 16:51 Arthur Zamarin
2024-03-15 12:24 Arthur Zamarin
2024-03-15 12:10 Arthur Zamarin
2024-03-15 12:10 Arthur Zamarin
2024-03-15 12:10 Arthur Zamarin
2023-02-13 21:01 Georgy Yakovlev
2023-02-08 20:29 Georgy Yakovlev
2023-02-08 20:15 Georgy Yakovlev
2022-09-24  4:13 Georgy Yakovlev
2022-09-20  1:32 Georgy Yakovlev
2022-09-20  1:32 Georgy Yakovlev
2021-06-14 21:59 Georgy Yakovlev
2021-06-14 21:58 Georgy Yakovlev
2021-06-14 21:58 Georgy Yakovlev
2021-05-17 17:17 Georgy Yakovlev
2021-05-01 12:22 Georgy Yakovlev
2021-05-01 12:22 Georgy Yakovlev
2021-05-01 12:22 Georgy Yakovlev
2021-04-18 19:41 Georgy Yakovlev
2021-04-18  1:24 Georgy Yakovlev
2021-04-18  1:24 Georgy Yakovlev
2021-04-18  1:24 Georgy Yakovlev
2020-11-28  7:54 Georgy Yakovlev
2020-09-23  6:33 Georgy Yakovlev
2020-09-23  2:47 Georgy Yakovlev
2020-09-23  2:47 Georgy Yakovlev
2020-09-09  6:50 Georgy Yakovlev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1618709002.6287b48604097fe3369bd845ad931f4261ff6354.gyakovlev@gentoo \
    --to=gyakovlev@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox