From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Fri, 6 Dec 2019 19:51:34 +0000 (-0800)
Subject: cargo.eclass: fix cargo_src_install() on prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2ee4123a38e4a84f0f74530054477b4336b1fcb0;p=gentoo.git

cargo.eclass: fix cargo_src_install() on prefix

Closes: https://bugs.gentoo.org/702168
Closes: https://bugs.gentoo.org/702042
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---

diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 44d11cdb8380..5b6d1f050f17 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -156,9 +156,9 @@ cargo_src_compile() {
 cargo_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	cargo install -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") "$@" \
+	cargo install -j $(makeopts_jobs) --root="${ED}/usr" $(usex debug --debug "") "$@" \
 		|| die "cargo install failed"
-	rm -f "${D}/usr/.crates.toml"
+	rm -f "${ED}/usr/.crates.toml"
 
 	[ -d "${S}/man" ] && doman "${S}/man" || return 0
 }