[gentoo-commits] repo/gentoo:master commit in: eclass/

[Georgy Yakovlev]

commit:     2ee4123a38e4a84f0f74530054477b4336b1fcb0
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 19:51:34 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 20:04:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee4123a

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 <AT> gentoo.org>

 eclass/cargo.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 44d11cdb838..5b6d1f050f1 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
 }