diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
| commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
| tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-lang/rust | |
| parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) | |
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-lang/rust')
| -rw-r--r-- | dev-lang/rust/Manifest | 2 | ||||
| -rw-r--r-- | dev-lang/rust/rust-1.39.0.ebuild | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest index 1bddfb3b4a74..2000dfb1d7bc 100644 --- a/dev-lang/rust/Manifest +++ b/dev-lang/rust/Manifest @@ -95,5 +95,5 @@ EBUILD rust-1.35.0.ebuild 9867 BLAKE2B 58de6eb2d6178caf33dd494ce9bb9e51a4c69407a EBUILD rust-1.36.0.ebuild 8933 BLAKE2B 30f4c5bef8337244f6452245cddff17c9472d108f4ca022603c0f410597639543e4316aea7921e5d3f054b4b526c55bc044959bcd5e792936a69aba211c33dca SHA512 4f941b3722fbb4debacf2095577eff60a3b7b40a9affa74939e1f78c8cf53abc232435ea47acda8adcf6943ed223900b26dea90c84f6f1c81f8c24cac0e3a6d5 EBUILD rust-1.37.0.ebuild 8925 BLAKE2B b2ea8d88b2514bb141af417589b073b44c8cebf4aa4522c3f6d0983ea32983214882f019fe4080af34e345302c4b3ca700cd8b0524328123bb8f59443d7367dd SHA512 595484513ce5aeb6dd98d01acd2ec3f40f63ec557fff0cb70258d604d158fe0b03fdef8fd087ac810a39cea2d09146813e7c70a93055abd580a9fc18f799c6e2 EBUILD rust-1.38.0.ebuild 8878 BLAKE2B 1f21e03b7bbf616021c9d9512558e29ca76efeeada69c5b780807f46eba6f608faf4acea054704368218e486e2a503ebe203a33ba00cbfba5acada45cb18b1bd SHA512 2e05a65745acdd15469d13d79899522a31907b0f4936234479dff2e0ea0b2d32fc5a3fe3ff18d4b809e15b048b2da71a8ae3fe03c34ead461733e4d7487201d5 -EBUILD rust-1.39.0.ebuild 8777 BLAKE2B 0b887553d66683dca9dbbbc90ed07a213fb79f1767016fce09164c6ca8bdfe8fbf91f2585dd8f71d83656d1c294918322e454170efe44f0bb885829f98c61af3 SHA512 71a7a4c65548250a888b58a8024b620393e50b4b744cc4dc6c64e16ed2e69110bf32f8c31270e7602ec53416ce6e05a011830984fa4c2e41c120745ba5dbeaf0 +EBUILD rust-1.39.0.ebuild 9031 BLAKE2B a83cdacf595174ac165c545ac18e02a6465680abb1a2f4626579182967a7c7c666388a813a297c25d73e6755261529c03c6a2a9259621964a2990eccc4c52286 SHA512 23856cd4b6c285f5ce88477206f8cc6768b29ae33816a71e7bd918599d58c15e0d101f600b80352e3080130d6363f9055e4935e6b737eca5ccbed592a781ef03 MISC metadata.xml 560 BLAKE2B c2d499593b39271f1185356988667d0d04845debf6d963adde0874c0e22a4e6958d987da7983d8294b74f6ab1807c9f74b9a79d82f00e6d77f294107d0e30b67 SHA512 621ecee45168efc07d8e6584977c9a0ec3bf870a1e4af79512ef21c34c1ddc4563979cd0c47f3d198b27952741f8246e38893d0c137e72c57a2793901d9f82fe 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 |