From c5d3df354d107b73cc84084ab17c8014f506e8e6 Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
Date: Thu, 25 Oct 2018 20:42:28 +0200
Subject: [PATCH] rustup: don't conflict with rust

We don't need the symlinks in /usr/bin because rustup
sets PATH to include the downloaded binaries.
---
 srcpkgs/rustup/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index d1c7eb4f8ae..b9ff386802c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.14.0
-revision=2
+revision=3
 wrksrc="${pkgname}.rs-${version}"
 build_style=cargo
 configure_args="--features no-self-update --bin rustup-init"
@@ -14,13 +14,8 @@ homepage="https://www.rustup.rs"
 distfiles="https://github.com/rust-lang-nursery/${pkgname}.rs/archive/${version}.tar.gz"
 checksum=ab125d9b12bf0f3f7e7ad98e826035fa1ae3dbe6ba8b78be4c82f9cde00bc59f
 
-conflicts="rust cargo"
-
 do_install() {
 	vbin target/${RUST_TARGET}/release/rustup-init rustup
-	for cmd in cargo rust-gdb rust-lldb rustc rustdoc; do
-		ln -s rustup ${DESTDIR}/usr/bin/${cmd}
-	done
 
 	if ! [ "$CROSS_BUILD" ]; then
 		# generate shell completions