commit:     5bbd64bd5a9b84a1a33a9bbcf7b725d26d947a50
Author:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  5 13:08:58 2018 +0000
Commit:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
CommitDate: Fri Oct  5 13:10:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bbd64bd

dev-lang/rust: remove old, vulnerable versions of rust

Bug: https://bugs.gentoo.org/show_bug.cgi?id=666976
Bug: https://bugs.gentoo.org/show_bug.cgi?id=662904
Signed-off-by: Dirkjan Ochtman <djc <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-lang/rust/Manifest              |   8 --
 dev-lang/rust/metadata.xml          |   2 -
 dev-lang/rust/rust-1.25.0.ebuild    | 172 ----------------------
 dev-lang/rust/rust-1.28.0-r1.ebuild | 276 ------------------------------------
 dev-lang/rust/rust-1.28.0.ebuild    | 268 ----------------------------------
 5 files changed, 726 deletions(-)

diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 9a79c051edc..2cb3a292859 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,12 +1,4 @@
-DIST rust-1.24.0-aarch64-unknown-linux-gnu.tar.gz 184157362 BLAKE2B 
68b1b9471b6d26dbb2c3bf897d2bffc15d2fcd1fde774d4f23389e9ccb96fc60d8ec8c343b5f93651bced05bdf228d549c747f3f3d4de9c8232e99aa1b6bef6a
 SHA512 
d15548a7b21ca4605ff24d098a59414548a315acd736ac4d8ac845399c9febdd810ba76fdf2dd9336325bd749866ee72f3d8c7c573b04a4d932d00cd7cac34c0
-DIST rust-1.24.0-i686-unknown-linux-gnu.tar.gz 193631843 BLAKE2B 
f19e9f717f5626b2267da4e661b53f45f7948a83a25156239af3cadb1184bf39669171364754f1787cdb78c3b62bd145bff1e3f4c3c7890f0dd52839bd8ae923
 SHA512 
3806bee5dccc080fae437bbc7f2e2062803244eb57c25e5e591e46279810c661bf016a4043e0af991b49b9e09a5d81ec275a852c3647a474507b03846d76aac0
-DIST rust-1.24.0-x86_64-unknown-linux-gnu.tar.gz 199663002 BLAKE2B 
2373637eb4410c07328b3cbaecb56ca465956ec1a2f14786e00922d74c4e68760538383960080348be003bee656761f5bbd0aa871ea21e22d029b3f8ab5344a7
 SHA512 
63ecb84b31f586c85e25229fb673892567edc2f557ac2ca1958caf3e26aa4e6c9a55b410aeeeadf1a61a5ebd66a517106e942f923a2884ce69ee92aec622187b
-DIST rust-1.27.2-aarch64-unknown-linux-gnu.tar.xz 94186748 BLAKE2B 
7e8f46128a7638217ef63caf479e1a6d9ebde7a225b7dad55082eb06e0206f0b1a5efa65badb15127a456ddc39702482407bbb9171a11397a31bc7c85d2cbcfa
 SHA512 
84022350f1e8fc34a353a09848333424a557ddea3b9445a1a5fc9d2f2abced942154e80888ab4091174d6d83c6766f583ef240ab2e2233de5d536633d2765040
-DIST rust-1.27.2-i686-unknown-linux-gnu.tar.xz 144776012 BLAKE2B 
98883f45637adf0920543da8951f29bf5ab11d1f39e9f4154b77e882eadce26ec5e8ed3e9bdcf560f8009fbaab4b7255ba8eb8eeb8beadad39ec6fa74b6dde45
 SHA512 
e17960120bdd18a527c0783ce8ca8d76cdc9b436f36a73a82fd2ea709b253f33feeb88310fab7a86305bad403eb5dad7ea43d0e5bc5ad1e3847f29e85040303a
-DIST rust-1.27.2-x86_64-unknown-linux-gnu.tar.xz 144218956 BLAKE2B 
40834086f211dd64ec76be37eb477697ff44783f261f0b9bfc10b46cc340cf3c15adf80d39a9df642b4985ea1239ad7f1d1803a44f3bd3d53f073bdc38a1de0e
 SHA512 
14861392dad81d2c040d0deb64d5dd34652d5cc2875e404609a0f13c8fb6bdc38f9bc7b1e309829365a00c42b610f2b7a73cffa232ecfdf0618b5508a8667198
 DIST rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz 98937652 BLAKE2B 
836d3dd4e583fa50dd317c3bea56257e6ea19defdb38c16be6debb2854e147c8a92c4832263e4ac314136022a176526fe7d3774a3c5a84cd8d364cd2a1532860
 SHA512 
8d9acbc90ddaa1e0de0234a21798b19b5365ea371a12f9a143c6ebacbb48f57344da6e827e867513be502bce2801de27a0dbbacdf8618c653aeb58026b6c469c
 DIST rust-1.28.0-i686-unknown-linux-gnu.tar.xz 136925948 BLAKE2B 
85d9239533920c3f16d7c61bada0caeabceceade29032b70bb4562bfd04fa0158cdd85b8a0a1119506416fa5916ade8a0466bf6c10da457299a6319aa25f9dd6
 SHA512 
ffdfab46db14f07354b553e02fdb9dc6602c2c52b78d8f17c499f4ddb1e257aa53479df836eb3f06a2548d34296b0277cdb6b4c6f3cec57265823df22752c135
 DIST rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz 134120432 BLAKE2B 
56fb79a98659d9c8e56b8eef87dea3302ee5901bc4507d1c204628370b20cf34b2875c9586faa0acc2bc2b1a5beedeb9b5ba199cfb85d52f268f084a02f04f27
 SHA512 
4f427c11a9cd22aedd01bd7ed5bee2ba5e00a27db25af4f596cf8627d88eff8e72625eb83729d2e6c6780aaffd44c0e7065a1c8fa22f4899349b72c726cf6a5f
-DIST rustc-1.25.0-src.tar.gz 98639156 BLAKE2B 
1408d5dd0611d4830de3b6b3d00e3fad4198a47599b639d0ac0bd05aaba401f743056a942e9df04a4d192c6b12e8cfe9a9cdf8cd26e48b72104ce9b423df049e
 SHA512 
7d8886f4d5a621eb794e814deb60be681fa38cf086f87ffa14e5a3500c640b237c549a632de1331a0f1b71963de41f6d31a4df3866b7e597424002316fed81ce
-DIST rustc-1.28.0-src.tar.xz 55838968 BLAKE2B 
1ff1f54dbae8c6481a6467d35b7c7dc340eba5e8c34f08ecb7b2300239c98a70c8459dacb8c8932ab6d9b3e2770e5b3508e23db7b01ff6014b7dbc076cf1de94
 SHA512 
a4885cd42a1006738cca2f0d8c0d5e4fd4014fc4629cbf691935bd36ffb896c553717022e67532359b5f1bd8e5050fc38b9dffed7c45cc76f7089ec134dfb980
 DIST rustc-1.29.1-src.tar.xz 61937676 BLAKE2B 
6a60249538e1ec62471f4d0e3fc31c0a648433aa6f85ca7341657ea07772e338eb92a629941685808f4b80e84cb025d78aee9d0d6fa71c6635a1647c61bca9bc
 SHA512 
1ded651b4c460e11e5e44c26de88a80fb13c2000097de2ee1e5af89638e12a7e8f43dd756689d4cc4fad45c52d4d43a3c70dd6a3ae550735b9dad5f8defea6a7

diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 8b63f5a12fc..8da6b2e99de 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -6,8 +6,6 @@
     <name>Rust Project</name>
   </maintainer>
   <use>
-    <flag name="extended">Build and install rls, rustfmt and cargo
-    alongside the compiler and stdlib</flag>
     <flag name="cargo">Install cargo component</flag>
     <flag name="clippy">Install clippy component</flag>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> as the

diff --git a/dev-lang/rust/rust-1.25.0.ebuild b/dev-lang/rust/rust-1.25.0.ebuild
deleted file mode 100644
index 37d8c394ea5..00000000000
--- a/dev-lang/rust/rust-1.25.0.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit multiprocessing python-any-r1 versionator toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
-       betaver=${PV//*beta}
-       BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
-       MY_P="rustc-beta"
-       SLOT="beta/${PV}"
-       SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz"
-else
-       ABI_VER="$(get_version_component_range 1-2)"
-       SLOT="stable/${ABI_VER}"
-       MY_P="rustc-${PV}"
-       SRC="${MY_P}-src.tar.gz"
-       KEYWORDS="amd64 ~arm64 x86"
-fi
-
-CHOST_amd64=x86_64-unknown-linux-gnu
-CHOST_x86=i686-unknown-linux-gnu
-CHOST_arm64=aarch64-unknown-linux-gnu
-
-RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
-RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
-RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
-RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/";
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
-       amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
-       x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
-       arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.gz )
-"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="debug doc extended +jemalloc"
-
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-               jemalloc? ( dev-libs/jemalloc )"
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       || (
-               >=sys-devel/gcc-4.7
-               >=sys-devel/clang-3.5
-       )
-       dev-util/cmake
-"
-PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-       usex "$1" true false
-}
-
-src_prepare() {
-       local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-       local rust_stage0_name="RUST_STAGE0_${ARCH}"
-       local rust_stage0="${!rust_stage0_name}"
-
-       "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig 
--destdir="${rust_stage0_root}" --prefix=/ || die
-
-       default
-}
-
-src_configure() {
-       local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-       local rust_target_name="CHOST_${ARCH}"
-       local rust_target="${!rust_target_name}"
-
-       cat <<- EOF > "${S}"/config.toml
-               [llvm]
-               optimize = $(toml_usex !debug)
-               release-debuginfo = $(toml_usex debug)
-               assertions = $(toml_usex debug)
-               [build]
-               build = "${rust_target}"
-               host = ["${rust_target}"]
-               target = ["${rust_target}"]
-               cargo = "${rust_stage0_root}/bin/cargo"
-               rustc = "${rust_stage0_root}/bin/rustc"
-               docs = $(toml_usex doc)
-               submodules = false
-               python = "${EPYTHON}"
-               locked-deps = true
-               vendor = true
-               verbose = 2
-               extended = $(toml_usex extended)
-               [install]
-               prefix = "${EPREFIX}/usr"
-               libdir = "$(get_libdir)"
-               docdir = "share/doc/${P}"
-               mandir = "share/${P}/man"
-               [rust]
-               optimize = $(toml_usex !debug)
-               debuginfo = $(toml_usex debug)
-               debug-assertions = $(toml_usex debug)
-               use-jemalloc = $(toml_usex jemalloc)
-               default-linker = "$(tc-getCC)"
-               rpath = false
-               [target.${rust_target}]
-               cc = "$(tc-getBUILD_CC)"
-               cxx = "$(tc-getBUILD_CXX)"
-               linker = "$(tc-getCC)"
-               ar = "$(tc-getAR)"
-       EOF
-}
-
-src_compile() {
-       ./x.py build --verbose --config="${S}"/config.toml -j$(makeopts_jobs) 
|| die
-}
-
-src_install() {
-       env DESTDIR="${D}" ./x.py install || 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
-
-       dodoc COPYRIGHT
-
-       cat <<-EOF > "${T}"/50${P}
-               LDPATH="/usr/$(get_libdir)/${P}"
-               MANPATH="/usr/share/${P}/man"
-       EOF
-       doenvd "${T}"/50${P}
-
-       cat <<-EOF > "${T}/provider-${P}"
-               /usr/bin/rustdoc
-               /usr/bin/rust-gdb
-               /usr/bin/rust-lldb
-       EOF
-       dodir /etc/env.d/rust
-       insinto /etc/env.d/rust
-       doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-       eselect rust update --if-unset
-
-       elog "Rust installs a helper script for calling GDB and LLDB,"
-       elog "for your convenience it is installed under 
/usr/bin/rust-{gdb,lldb}-${PV}."
-
-       if has_version app-editors/emacs || has_version app-editors/emacs-vcs; 
then
-               elog "install app-emacs/rust-mode to get emacs support for 
rust."
-       fi
-
-       if has_version app-editors/gvim || has_version app-editors/vim; then
-               elog "install app-vim/rust-vim to get vim support for rust."
-       fi
-
-       if has_version 'app-shells/zsh'; then
-               elog "install app-shells/rust-zshcomp to get zsh completion for 
rust."
-       fi
-}
-
-pkg_postrm() {
-       eselect rust unset --if-invalid
-}

diff --git a/dev-lang/rust/rust-1.28.0-r1.ebuild 
b/dev-lang/rust/rust-1.28.0-r1.ebuild
deleted file mode 100644
index 308474cfe15..00000000000
--- a/dev-lang/rust/rust-1.28.0-r1.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit multiprocessing multilib-build python-any-r1 toolchain-funcs 
versionator
-
-if [[ ${PV} = *beta* ]]; then
-       betaver=${PV//*beta}
-       BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
-       MY_P="rustc-beta"
-       SLOT="beta/${PV}"
-       SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
-else
-       ABI_VER="$(get_version_component_range 1-2)"
-       SLOT="stable/${ABI_VER}"
-       MY_P="rustc-${PV}"
-       SRC="${MY_P}-src.tar.xz"
-       KEYWORDS="amd64 ~arm64 ~x86"
-fi
-
-CHOST_amd64=x86_64-unknown-linux-gnu
-CHOST_x86=i686-unknown-linux-gnu
-CHOST_arm64=aarch64-unknown-linux-gnu
-
-RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).2"
-RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
-RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
-RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/";
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
-       amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.xz )
-       x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.xz )
-       arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.xz )
-"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-       NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="cargo debug doc +jemalloc libressl rls rustfmt wasm 
${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-               jemalloc? ( dev-libs/jemalloc )
-               cargo? (
-                       sys-libs/zlib
-                       !libressl? ( dev-libs/openssl:0= )
-                       libressl? ( dev-libs/libressl:0= )
-                       net-libs/libssh2
-                       net-libs/http-parser
-                       net-misc/curl[ssl]
-               )"
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       || (
-               >=sys-devel/gcc-4.7
-               >=sys-devel/clang-3.5
-       )
-       cargo? ( !dev-util/cargo )
-       rustfmt? ( !dev-util/rustfmt )
-       dev-util/cmake
-"
-PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-       usex "$1" true false
-}
-
-src_prepare() {
-       local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-       local rust_stage0_name="RUST_STAGE0_${ARCH}"
-       local rust_stage0="${!rust_stage0_name}"
-
-       "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig 
--destdir="${rust_stage0_root}" --prefix=/ || die
-
-       default
-}
-
-src_configure() {
-       local rust_target="" rust_targets="" rust_target_name arch_cflags
-
-       # Collect rust target names to compile standard libs for all ABIs.
-       for v in $(multilib_get_enabled_abi_pairs); do
-               rust_target_name="CHOST_${v##*.}"
-               rust_targets="${rust_targets},\"${!rust_target_name}\""
-       done
-       if use wasm; then
-               rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
-       fi
-       rust_targets="${rust_targets#,}"
-
-       local extended="false" tools=""
-       if use cargo; then
-               extended="true"
-               tools="\"cargo\","
-       fi
-       if use rls; then
-               extended="true"
-               tools="\"rls\",$tools"
-       fi
-       if use rustfmt; then
-               extended="true"
-               tools="\"rustfmt\",$tools"
-       fi
-
-       local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-       rust_target_name="CHOST_${ARCH}"
-       rust_target="${!rust_target_name}"
-
-       cat <<- EOF > "${S}"/config.toml
-               [llvm]
-               optimize = $(toml_usex !debug)
-               release-debuginfo = $(toml_usex debug)
-               assertions = $(toml_usex debug)
-               targets = "${LLVM_TARGETS// /;}"
-               [build]
-               build = "${rust_target}"
-               host = ["${rust_target}"]
-               target = [${rust_targets}]
-               cargo = "${rust_stage0_root}/bin/cargo"
-               rustc = "${rust_stage0_root}/bin/rustc"
-               docs = $(toml_usex doc)
-               submodules = false
-               python = "${EPYTHON}"
-               locked-deps = true
-               vendor = true
-               extended = ${extended}
-               tools = [${tools}]
-               [install]
-               prefix = "${EPREFIX}/usr"
-               libdir = "$(get_libdir)"
-               docdir = "share/doc/${P}"
-               mandir = "share/${P}/man"
-               [rust]
-               optimize = $(toml_usex !debug)
-               debuginfo = $(toml_usex debug)
-               debug-assertions = $(toml_usex debug)
-               use-jemalloc = $(toml_usex jemalloc)
-               default-linker = "$(tc-getCC)"
-               rpath = false
-               lld = $(toml_usex wasm)
-       EOF
-
-       for v in $(multilib_get_enabled_abi_pairs); do
-               rust_target=$(get_abi_CHOST ${v##*.})
-               arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
-               cat <<- EOF >> "${S}"/config.env
-                       CFLAGS_${rust_target}=${arch_cflags}
-               EOF
-
-               cat <<- EOF >> "${S}"/config.toml
-                       [target.${rust_target}]
-                       cc = "$(tc-getBUILD_CC)"
-                       cxx = "$(tc-getBUILD_CXX)"
-                       linker = "$(tc-getCC)"
-                       ar = "$(tc-getAR)"
-               EOF
-       done
-
-       if use wasm; then
-               cat <<- EOF >> "${S}"/config.toml
-                       [target.wasm32-unknown-unknown]
-                       linker = "lld"
-               EOF
-       fi
-}
-
-src_compile() {
-       env $(cat "${S}"/config.env)\
-               ./x.py build --config="${S}"/config.toml -j$(makeopts_jobs) \
-               --exclude src/tools/miri || die # 
https://github.com/rust-lang/rust/issues/52305
-}
-
-src_install() {
-       local rust_target abi_libdir
-
-       env DESTDIR="${D}" ./x.py install || 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
-       if use cargo; then
-               mv "${D}/usr/bin/cargo" "${D}/usr/bin/cargo-${PV}" || die
-       fi
-       if use rls; then
-               mv "${D}/usr/bin/rls" "${D}/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
-       fi
-
-       # Copy shared library versions of standard libraries for all targets
-       # into the system's abi-dependent lib directories because the rust
-       # installer only does so for the native ABI.
-       for v in $(multilib_get_enabled_abi_pairs); do
-               if [ ${v##*.} = ${DEFAULT_ABI} ]; then
-                       continue
-               fi
-               abi_libdir=$(get_abi_LIBDIR ${v##*.})
-               rust_target=$(get_abi_CHOST ${v##*.})
-               mkdir -p "${D}/usr/${abi_libdir}"
-               cp "${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib"/*.so \
-                  "${D}/usr/${abi_libdir}" || die
-       done
-
-       dodoc COPYRIGHT
-
-       # 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"
-       EOF
-       doenvd "${T}"/50${P}
-
-       cat <<-EOF > "${T}/provider-${P}"
-               /usr/bin/rustdoc
-               /usr/bin/rust-gdb
-               /usr/bin/rust-lldb
-       EOF
-       if use cargo; then
-           echo /usr/bin/cargo >> "${T}/provider-${P}"
-       fi
-       if use rls; then
-           echo /usr/bin/rls >> "${T}/provider-${P}"
-       fi
-       if use rustfmt; then
-           echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-           echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-       fi
-       dodir /etc/env.d/rust
-       insinto /etc/env.d/rust
-       doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-       eselect rust update --if-unset
-
-       elog "Rust installs a helper script for calling GDB and LLDB,"
-       elog "for your convenience it is installed under 
/usr/bin/rust-{gdb,lldb}-${PV}."
-
-       if has_version app-editors/emacs || has_version app-editors/emacs-vcs; 
then
-               elog "install app-emacs/rust-mode to get emacs support for 
rust."
-       fi
-
-       if has_version app-editors/gvim || has_version app-editors/vim; then
-               elog "install app-vim/rust-vim to get vim support for rust."
-       fi
-
-       if has_version 'app-shells/zsh'; then
-               elog "install app-shells/rust-zshcomp to get zsh completion for 
rust."
-       fi
-}
-
-pkg_postrm() {
-       eselect rust unset --if-invalid
-}

diff --git a/dev-lang/rust/rust-1.28.0.ebuild b/dev-lang/rust/rust-1.28.0.ebuild
deleted file mode 100644
index a3139658c1b..00000000000
--- a/dev-lang/rust/rust-1.28.0.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit multiprocessing multilib-build python-any-r1 toolchain-funcs 
versionator
-
-if [[ ${PV} = *beta* ]]; then
-       betaver=${PV//*beta}
-       BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
-       MY_P="rustc-beta"
-       SLOT="beta/${PV}"
-       SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
-else
-       ABI_VER="$(get_version_component_range 1-2)"
-       SLOT="stable/${ABI_VER}"
-       MY_P="rustc-${PV}"
-       SRC="${MY_P}-src.tar.xz"
-       KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-CHOST_amd64=x86_64-unknown-linux-gnu
-CHOST_x86=i686-unknown-linux-gnu
-CHOST_arm64=aarch64-unknown-linux-gnu
-
-RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).2"
-RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
-RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
-RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/";
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
-       amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.xz )
-       x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.xz )
-       arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.xz )
-"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-       NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="cargo debug doc +jemalloc rls rustfmt wasm ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-               jemalloc? ( dev-libs/jemalloc )"
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       || (
-               >=sys-devel/gcc-4.7
-               >=sys-devel/clang-3.5
-       )
-       cargo? ( !dev-util/cargo )
-       rustfmt? ( !dev-util/rustfmt )
-       dev-util/cmake
-"
-PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-       usex "$1" true false
-}
-
-src_prepare() {
-       local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-       local rust_stage0_name="RUST_STAGE0_${ARCH}"
-       local rust_stage0="${!rust_stage0_name}"
-
-       "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig 
--destdir="${rust_stage0_root}" --prefix=/ || die
-
-       default
-}
-
-src_configure() {
-       local rust_target="" rust_targets="" rust_target_name arch_cflags
-
-       # Collect rust target names to compile standard libs for all ABIs.
-       for v in $(multilib_get_enabled_abi_pairs); do
-               rust_target_name="CHOST_${v##*.}"
-               rust_targets="${rust_targets},\"${!rust_target_name}\""
-       done
-       if use wasm; then
-               rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
-       fi
-       rust_targets="${rust_targets#,}"
-
-       local extended="false" tools=""
-       if use cargo; then
-               extended="true"
-               tools="\"cargo\","
-       fi
-       if use rls; then
-               extended="true"
-               tools="\"rls\",$tools"
-       fi
-       if use rustfmt; then
-               extended="true"
-               tools="\"rustfmt\",$tools"
-       fi
-
-       local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-       rust_target_name="CHOST_${ARCH}"
-       rust_target="${!rust_target_name}"
-
-       cat <<- EOF > "${S}"/config.toml
-               [llvm]
-               optimize = $(toml_usex !debug)
-               release-debuginfo = $(toml_usex debug)
-               assertions = $(toml_usex debug)
-               targets = "${LLVM_TARGETS// /;}"
-               [build]
-               build = "${rust_target}"
-               host = ["${rust_target}"]
-               target = [${rust_targets}]
-               cargo = "${rust_stage0_root}/bin/cargo"
-               rustc = "${rust_stage0_root}/bin/rustc"
-               docs = $(toml_usex doc)
-               submodules = false
-               python = "${EPYTHON}"
-               locked-deps = true
-               vendor = true
-               extended = ${extended}
-               tools = [${tools}]
-               [install]
-               prefix = "${EPREFIX}/usr"
-               libdir = "$(get_libdir)"
-               docdir = "share/doc/${P}"
-               mandir = "share/${P}/man"
-               [rust]
-               optimize = $(toml_usex !debug)
-               debuginfo = $(toml_usex debug)
-               debug-assertions = $(toml_usex debug)
-               use-jemalloc = $(toml_usex jemalloc)
-               default-linker = "$(tc-getCC)"
-               rpath = false
-               lld = $(toml_usex wasm)
-       EOF
-
-       for v in $(multilib_get_enabled_abi_pairs); do
-               rust_target=$(get_abi_CHOST ${v##*.})
-               arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
-               cat <<- EOF >> "${S}"/config.env
-                       CFLAGS_${rust_target}=${arch_cflags}
-               EOF
-
-               cat <<- EOF >> "${S}"/config.toml
-                       [target.${rust_target}]
-                       cc = "$(tc-getBUILD_CC)"
-                       cxx = "$(tc-getBUILD_CXX)"
-                       linker = "$(tc-getCC)"
-                       ar = "$(tc-getAR)"
-               EOF
-       done
-
-       if use wasm; then
-               cat <<- EOF >> "${S}"/config.toml
-                       [target.wasm32-unknown-unknown]
-                       linker = "lld"
-               EOF
-       fi
-}
-
-src_compile() {
-       env $(cat "${S}"/config.env)\
-               ./x.py build --config="${S}"/config.toml -j$(makeopts_jobs) \
-               --exclude src/tools/miri || die # 
https://github.com/rust-lang/rust/issues/52305
-}
-
-src_install() {
-       local rust_target abi_libdir
-
-       env DESTDIR="${D}" ./x.py install || 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
-       if use cargo; then
-               mv "${D}/usr/bin/cargo" "${D}/usr/bin/cargo-${PV}" || die
-       fi
-       if use rls; then
-               mv "${D}/usr/bin/rls" "${D}/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
-       fi
-
-       # Copy shared library versions of standard libraries for all targets
-       # into the system's abi-dependent lib directories because the rust
-       # installer only does so for the native ABI.
-       for v in $(multilib_get_enabled_abi_pairs); do
-               if [ ${v##*.} = ${DEFAULT_ABI} ]; then
-                       continue
-               fi
-               abi_libdir=$(get_abi_LIBDIR ${v##*.})
-               rust_target=$(get_abi_CHOST ${v##*.})
-               mkdir -p "${D}/usr/${abi_libdir}"
-               cp "${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib"/*.so \
-                  "${D}/usr/${abi_libdir}" || die
-       done
-
-       dodoc COPYRIGHT
-
-       # 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"
-       EOF
-       doenvd "${T}"/50${P}
-
-       cat <<-EOF > "${T}/provider-${P}"
-               /usr/bin/rustdoc
-               /usr/bin/rust-gdb
-               /usr/bin/rust-lldb
-       EOF
-       if use cargo; then
-           echo /usr/bin/cargo >> "${T}/provider-${P}"
-       fi
-       if use rls; then
-           echo /usr/bin/rls >> "${T}/provider-${P}"
-       fi
-       if use rustfmt; then
-           echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-           echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-       fi
-       dodir /etc/env.d/rust
-       insinto /etc/env.d/rust
-       doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-       eselect rust update --if-unset
-
-       elog "Rust installs a helper script for calling GDB and LLDB,"
-       elog "for your convenience it is installed under 
/usr/bin/rust-{gdb,lldb}-${PV}."
-
-       if has_version app-editors/emacs || has_version app-editors/emacs-vcs; 
then
-               elog "install app-emacs/rust-mode to get emacs support for 
rust."
-       fi
-
-       if has_version app-editors/gvim || has_version app-editors/vim; then
-               elog "install app-vim/rust-vim to get vim support for rust."
-       fi
-
-       if has_version 'app-shells/zsh'; then
-               elog "install app-shells/rust-zshcomp to get zsh completion for 
rust."
-       fi
-}
-
-pkg_postrm() {
-       eselect rust unset --if-invalid
-}

Reply via email to