From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- dev-lang/rust/rust-1.39.0.ebuild | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'dev-lang/rust/rust-1.39.0.ebuild') diff --git a/dev-lang/rust/rust-1.39.0.ebuild b/dev-lang/rust/rust-1.39.0.ebuild index 8a80a66450bd..6f66984bd72b 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,13 @@ 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 + pushd "${D}" > /dev/null || die + rmdir -p etc/bash_completion.d || die + popd > /dev/null || 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 -- cgit v1.2.3