From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E2E5A138335 for ; Sun, 14 Apr 2019 09:22:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA72FE08F6; Sun, 14 Apr 2019 09:22:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9442BE08F6 for ; Sun, 14 Apr 2019 09:22:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F38B2340FEB for ; Sun, 14 Apr 2019 09:22:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E37325A6 for ; Sun, 14 Apr 2019 09:22:41 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1555233749.798aac56ff17973cdf1343e9f1d088b499c49074.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust/rust-1.34.0-r1.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 798aac56ff17973cdf1343e9f1d088b499c49074 X-VCS-Branch: master Date: Sun, 14 Apr 2019 09:22:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1fe4542f-7459-4b11-bbee-518c634c9d3e X-Archives-Hash: e327d4c7295046d57283111448863116 commit: 798aac56ff17973cdf1343e9f1d088b499c49074 Author: Fabian Groffen gentoo org> AuthorDate: Sun Apr 14 09:20:42 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Apr 14 09:22:29 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=798aac56 dev-lang/rust: fix for Prefix, based on patch by Matthias Gerstner Closes: https://bugs.gentoo.org/611118 Signed-off-by: Fabian Groffen gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 dev-lang/rust/rust-1.34.0-r1.ebuild | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dev-lang/rust/rust-1.34.0-r1.ebuild b/dev-lang/rust/rust-1.34.0-r1.ebuild index 4c34807181a..fd69e01c52b 100644 --- a/dev-lang/rust/rust-1.34.0-r1.ebuild +++ b/dev-lang/rust/rust-1.34.0-r1.ebuild @@ -235,21 +235,21 @@ src_install() { env DESTDIR="${D}" "${EPYTHON}" ./x.py install -v || die - mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die - mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die - mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die - mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die - mv "${D}/usr/bin/cargo" "${D}/usr/bin/cargo-${PV}" || die + mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die + mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die + mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die + mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die + mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die if use clippy; then - mv "${D}/usr/bin/clippy-driver" "${D}/usr/bin/clippy-driver-${PV}" || die - mv "${D}/usr/bin/cargo-clippy" "${D}/usr/bin/cargo-clippy-${PV}" || die + mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die + mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die fi if use rls; then - mv "${D}/usr/bin/rls" "${D}/usr/bin/rls-${PV}" || die + mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die fi if use rustfmt; then - mv "${D}/usr/bin/rustfmt" "${D}/usr/bin/rustfmt-${PV}" || die - mv "${D}/usr/bin/cargo-fmt" "${D}/usr/bin/cargo-fmt-${PV}" || die + mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die + mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die fi # Copy shared library versions of standard libraries for all targets @@ -261,9 +261,9 @@ src_install() { fi abi_libdir=$(get_abi_LIBDIR ${v##*.}) rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) - mkdir -p "${D}/usr/${abi_libdir}" - cp "${D}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \ - "${D}/usr/${abi_libdir}" || die + mkdir -p "${ED}/usr/${abi_libdir}" + cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \ + "${ED}/usr/${abi_libdir}" || die done dodoc COPYRIGHT @@ -271,11 +271,12 @@ src_install() { # FIXME: # Really not sure if that env is needed, specailly LDPATH cat <<-EOF > "${T}"/50${P} - LDPATH="/usr/$(get_libdir)/${P}" - MANPATH="/usr/share/${P}/man" + LDPATH="${EPREFIX}/usr/$(get_libdir)/${P}" + MANPATH="${EPREFIX}/usr/share/${P}/man" EOF doenvd "${T}"/50${P} + # note: eselect-rust adds EROOT to all paths below cat <<-EOF > "${T}/provider-${P}" /usr/bin/rustdoc /usr/bin/rust-gdb