From f5b2fdbdf14ad00619e44a9fe1e5a7b39ce8d257 Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Fri, 19 Oct 2018 14:56:59 +0200
Subject: [PATCH] rustup: conflict with rust, cargo

---
 srcpkgs/rustup/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index f92043fee7f..d1c7eb4f8ae 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.14.0
-revision=1
+revision=2
 wrksrc="${pkgname}.rs-${version}"
 build_style=cargo
 configure_args="--features no-self-update --bin rustup-init"
@@ -14,6 +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