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 03D98138334 for ; Thu, 12 Dec 2019 00:40:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9CD94E08C4; Thu, 12 Dec 2019 00:40: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 75F08E08C4 for ; Thu, 12 Dec 2019 00:40: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 3B64134D93D for ; Thu, 12 Dec 2019 00:40:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D45728B0 for ; Thu, 12 Dec 2019 00:40:04 +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: <1576111002.79354e8855d6fcfac01f34d21708fb57c5b48c4a.gyakovlev@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.39.0.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 79354e8855d6fcfac01f34d21708fb57c5b48c4a X-VCS-Branch: master Date: Thu, 12 Dec 2019 00:40:04 +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: a99e4c8b-4bc7-4f5f-84db-7a5e4e4efc37 X-Archives-Hash: 033d6bb9e87d007f188f000d8065f004 commit: 79354e8855d6fcfac01f34d21708fb57c5b48c4a Author: Gerion Entrup flump de> AuthorDate: Thu Dec 5 14:42:14 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Dec 12 00:36:42 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79354e88 dev-lang/rust: fix bash completion location Bug: https://bugs.gentoo.org/689562 Bug: https://bugs.gentoo.org/689160 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Gerion Entrup flump.de> Closes: https://github.com/gentoo/gentoo/pull/13884 Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust/rust-1.39.0.ebuild | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev-lang/rust/rust-1.39.0.ebuild b/dev-lang/rust/rust-1.39.0.ebuild index 8a80a66450b..f918098e20c 100644 --- a/dev-lang/rust/rust-1.39.0.ebuild +++ b/dev-lang/rust/rust-1.39.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) -inherit check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs +inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs if [[ ${PV} = *beta* ]]; then betaver=${PV//*beta} @@ -234,6 +234,11 @@ src_install() { env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \ --exclude src/tools/miri || die + # bug #689562, #689160 + rm "${D}/etc/bash_completion.d/cargo" || die + rmdir -p "${D}/etc" || die + dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo + 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