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 F3DDF138335 for ; Tue, 9 Jul 2019 18:53:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA316E0827; Tue, 9 Jul 2019 18:53:09 +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 9CA37E0827 for ; Tue, 9 Jul 2019 18:53:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 372053474B7 for ; Tue, 9 Jul 2019 18:53:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E72C6E3 for ; Tue, 9 Jul 2019 18:53:06 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1562698337.faee74e644fd7839e2dc2b9525f2abf8adc9620a.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust-bin/rust-bin-1.34.2.ebuild X-VCS-Directories: dev-lang/rust-bin/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: faee74e644fd7839e2dc2b9525f2abf8adc9620a X-VCS-Branch: master Date: Tue, 9 Jul 2019 18:53:06 +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: 9a1acc39-a9bd-4725-8a47-c062b6a2afba X-Archives-Hash: 1ae8f2d9b7bd86f527be6392a92c6623 commit: faee74e644fd7839e2dc2b9525f2abf8adc9620a Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Jul 9 18:43:40 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Jul 9 18:52:17 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faee74e6 dev-lang/rust-bin: fix prefix installation for 1.34.2 Closes: https://bugs.gentoo.org/687556 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust-bin/rust-bin-1.34.2.ebuild | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dev-lang/rust-bin/rust-bin-1.34.2.ebuild b/dev-lang/rust-bin/rust-bin-1.34.2.ebuild index 3d0796628f6..f7d54470c20 100644 --- a/dev-lang/rust-bin/rust-bin-1.34.2.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.34.2.ebuild @@ -56,8 +56,8 @@ src_install() { ./install.sh \ --components="${components}" \ --disable-verify \ - --prefix="${D}/opt/${P}" \ - --mandir="${D}/usr/share/${P}/man" \ + --prefix="${ED}/opt/${P}" \ + --mandir="${ED}/usr/share/${P}/man" \ --disable-ldconfig \ || die @@ -67,11 +67,11 @@ src_install() { local rustgdbgui=rust-gdbgui-bin-${PV} local rustlldb=rust-lldb-bin-${PV} - mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die - mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die - mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die - mv "${D}/opt/${P}/bin/rust-gdbgui" "${D}/opt/${P}/bin/${rustgdbgui}" || die - mv "${D}/opt/${P}/bin/rust-lldb" "${D}/opt/${P}/bin/${rustlldb}" || die + mv "${ED}/opt/${P}/bin/rustc" "${ED}/opt/${P}/bin/${rustc}" || die + mv "${ED}/opt/${P}/bin/rustdoc" "${ED}/opt/${P}/bin/${rustdoc}" || die + mv "${ED}/opt/${P}/bin/rust-gdb" "${ED}/opt/${P}/bin/${rustgdb}" || die + mv "${ED}/opt/${P}/bin/rust-gdbgui" "${ED}/opt/${P}/bin/${rustgdbgui}" || die + mv "${ED}/opt/${P}/bin/rust-lldb" "${ED}/opt/${P}/bin/${rustlldb}" || die dosym "${rustc}" "/opt/${P}/bin/rustc" dosym "${rustdoc}" "/opt/${P}/bin/rustdoc" @@ -88,23 +88,23 @@ src_install() { local cargo=cargo-bin-${PV} # ugly hack for https://bugs.gentoo.org/679806 if use ppc64; then - mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}".bin || die - sed -i 's/getentropy/gEtEnTrOpY/g' "${D}/opt/${P}/bin/${cargo}".bin || die - cat <<- 'EOF' > "${D}/opt/${P}/bin/${cargo}" + mv "${ED}/opt/${P}/bin/cargo" "${ED}/opt/${P}/bin/${cargo}".bin || die + sed -i 's/getentropy/gEtEnTrOpY/g' "${ED}/opt/${P}/bin/${cargo}".bin || die + cat <<- 'EOF' > "${ED}/opt/${P}/bin/${cargo}" #!/bin/sh OPENSSL_ppccap=0 $(realpath $0).bin "${@}" EOF fperms +x "/opt/${P}/bin/${cargo}" else - mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die + mv "${ED}/opt/${P}/bin/cargo" "${ED}/opt/${P}/bin/${cargo}" || die fi dosym "${cargo}" "/opt/${P}/bin/cargo" dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}" if use clippy; then local clippy_driver=clippy-driver-bin-${PV} local cargo_clippy=cargo-clippy-bin-${PV} - mv "${D}/opt/${P}/bin/clippy-driver" "${D}/opt/${P}/bin/${clippy_driver}" || die - mv "${D}/opt/${P}/bin/cargo-clippy" "${D}/opt/${P}/bin/${cargo_clippy}" || die + mv "${ED}/opt/${P}/bin/clippy-driver" "${ED}/opt/${P}/bin/${clippy_driver}" || die + mv "${ED}/opt/${P}/bin/cargo-clippy" "${ED}/opt/${P}/bin/${cargo_clippy}" || die dosym "${clippy_driver}" "/opt/${P}/bin/clippy-driver" dosym "${cargo_clippy}" "/opt/${P}/bin/cargo-clippy" dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}" @@ -113,8 +113,8 @@ src_install() { if use rustfmt; then local rustfmt=rustfmt-bin-${PV} local cargo_fmt=cargo-fmt-bin-${PV} - mv "${D}/opt/${P}/bin/rustfmt" "${D}/opt/${P}/bin/${rustfmt}" || die - mv "${D}/opt/${P}/bin/cargo-fmt" "${D}/opt/${P}/bin/${cargo_fmt}" || die + mv "${ED}/opt/${P}/bin/rustfmt" "${ED}/opt/${P}/bin/${rustfmt}" || die + mv "${ED}/opt/${P}/bin/cargo-fmt" "${ED}/opt/${P}/bin/${cargo_fmt}" || die dosym "${rustfmt}" "/opt/${P}/bin/rustfmt" dosym "${cargo_fmt}" "/opt/${P}/bin/cargo-fmt" dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}" @@ -127,6 +127,7 @@ src_install() { 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