[arch-commits] Commit in rustup/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Monday, October 10, 2016 @ 10:09:22
  Author: svenstaro
Revision: 191821

upgpkg: rustup 0.6.3-2

Pushing rustup

Modified:
  rustup/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-10 10:02:53 UTC (rev 191820)
+++ PKGBUILD	2016-10-10 10:09:22 UTC (rev 191821)
@@ -3,31 +3,20 @@
 pkgname=rustup
 pkgver=0.6.3
 pkgrel=2
-
 pkgdesc="The Rust toolchain installer"
 arch=('i686' 'x86_64')
 url="https://github.com/rust-lang-nursery/rustup.rs"
 license=('MIT' 'Apache')
 makedepends=('cargo')
-provides=('rust' 'cargo' 'rust-nightly' 'cargo-nightly')
-conflicts=('rust' 'cargo' 'rust-nightly' 'rust-nightly-bin' 'multirust' 'multirust-git')
-replaces=('multirust' 'multirust-git')
+provides=('rust' 'cargo')
+conflicts=('rust' 'cargo')
 install='post.install'
-
 source=("rustup-${pkgver}.tar.gz::https://github.com/rust-lang-nursery/rustup.rs/archive/${pkgver}.tar.gz")
 md5sums=('4c4d5982af51515ddccd16e6a10c405c')
 
-prepare() {
-    # instead of building directly in -$pkgver, we copy files over into a
-    # shared directory -- this may allow for incremental builds
-    test -e "$srcdir/$pkgname.rs" || mkdir "$srcdir/$pkgname.rs"
-    cp -r "$srcdir/$pkgname.rs-${pkgver}"/* "$srcdir/$pkgname.rs/"
-    rm -rf "$srcdir/$pkgname.rs-${pkgver}"
-}
-
 build() {
     msg2 "Building rustup"
-    cd "$srcdir/$pkgname.rs"
+    cd "$srcdir/$pkgname.rs-${pkgver}"
     cargo update
     cargo build --release --features no-self-update --bin rustup-init
 
@@ -37,7 +26,7 @@
 }
 
 package() {
-    cd "$pkgname.rs"
+    cd "$pkgname.rs-${pkgver}"
     install -dm755 "$pkgdir/usr/bin"
     cp "$srcdir/tmp/.cargo/bin"/* "$pkgdir/usr/bin/"
 }