upgpkg: rustup-git 1.24.3.r133.gd0804112-1

2 files changed, 24 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 555a6c01ea75..8dac8770d769 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rustup-git
 	pkgdesc = The Rust toolchain installer
-	pkgver = 1.19.0.r70.gfbcc6720
-	pkgrel = 2
+	pkgver = 1.24.3.r133.gd0804112
+	pkgrel = 1
 	url = https://github.com/rust-lang/rustup.rs
 	install = post.install
 	arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = rustup-git
 	license = Apache
 	makedepends = git
 	makedepends = cargo
+	depends = curl
 	optdepends = lldb: rust-lldb script
 	optdepends = gdb: rust-gdb script
 	provides = rust
@@ -16,6 +17,10 @@ pkgbase = rustup-git
 	provides = rust-nightly
 	provides = cargo-nightly
 	provides = rustfmt
+	provides = rust-src
+	provides = lib32-rust-libs
+	provides = rust-musl
+	provides = rust-wasm
 	provides = rustup
 	conflicts = rust
 	conflicts = cargo
@@ -23,8 +28,8 @@ pkgbase = rustup-git
 	conflicts = rust-nightly
 	conflicts = rust-nightly-bin
 	conflicts = rustup
-	source = rustup-git::git+https://github.com/rust-lang-nursery/rustup.rs.git
+	replaces = cargo-tree
+	source = rustup-git::git+https://github.com/rust-lang/rustup.rs.git
 	sha512sums = SKIP
 
 pkgname = rustup-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 396e17a9d8c5..d2a3f6ceeb16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,26 @@
-# Maintainer: Jon Gjengset <jon@tsp.io>
+# Maintainer: Ilaï Deutel <PlMWPh1WSmypRv0JQljz> (echo ... | tr 'A-Za-z' 'l-za-kL-ZA-K' | base64 -d)
+# Contributor: Jon Gjengset <jon@tsp.io>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jonathon Fernyhough <jonathon_at_manjaro_dot_org>
 pkgname=rustup-git
-pkgver=1.19.0.r70.gfbcc6720
-pkgrel=2
+pkgver=1.24.3.r133.gd0804112
+pkgrel=1
 pkgdesc="The Rust toolchain installer"
 arch=('x86_64')
 url="https://github.com/rust-lang/rustup.rs"
 license=('MIT' 'Apache')
+depends=('curl')
 makedepends=('git' 'cargo')
 optdepends=('lldb: rust-lldb script'
             'gdb: rust-gdb script')
-provides=('rust' 'cargo' 'rust-nightly' 'cargo-nightly' 'rustfmt' 'rustup')
+provides=('rust' 'cargo' 'rust-nightly' 'cargo-nightly' 'rustfmt' 'rust-src'
+          'lib32-rust-libs' 'rust-musl' 'rust-wasm' 'rustup')
 conflicts=('rust' 'cargo' 'rustfmt' 'rust-nightly' 'rust-nightly-bin' 'rustup')
+replaces=('cargo-tree')
 install='post.install'
-source=("${pkgname}::git+https://github.com/rust-lang-nursery/rustup.rs.git")
+source=("${pkgname}::git+https://github.com/rust-lang/rustup.rs.git")
 sha512sums=('SKIP')
-_binlinks=('cargo' 'rustc' 'rustdoc' 'rust-gdb' 'rust-lldb' 'rls' 'rustfmt' 'cargo-fmt' 'cargo-clippy' 'clippy-driver')
+_binlinks=('cargo' 'rustc' 'rustdoc' 'rust-gdb' 'rust-lldb' 'rls' 'rustfmt' 'cargo-fmt' 'cargo-clippy' 'clippy-driver' 'cargo-miri')
 
 pkgver() {
     cd "$srcdir/${pkgname}"
@@ -37,11 +41,13 @@ package() {
 
     # Generate completion files.
     mkdir -p "$pkgdir/usr/share/bash-completion/completions"
-    $pkgdir/usr/bin/rustup completions bash > "$pkgdir/usr/share/bash-completion/completions/rustup"
+    "$pkgdir"/usr/bin/rustup completions bash > "$pkgdir/usr/share/bash-completion/completions/rustup"
+    "$pkgdir"/usr/bin/rustup completions bash cargo > "$pkgdir/usr/share/bash-completion/completions/cargo"
     mkdir -p "$pkgdir/usr/share/fish/completions"
-    $pkgdir/usr/bin/rustup completions fish > "$pkgdir/usr/share/fish/completions/rustup.fish"
+    "$pkgdir"/usr/bin/rustup completions fish > "$pkgdir/usr/share/fish/completions/rustup.fish"
     mkdir -p "$pkgdir/usr/share/zsh/site-functions"
-    $pkgdir/usr/bin/rustup completions zsh > "$pkgdir/usr/share/zsh/site-functions/_rustup"
+    "$pkgdir"/usr/bin/rustup completions zsh > "$pkgdir/usr/share/zsh/site-functions/_rustup"
+    "$pkgdir"/usr/bin/rustup completions zsh cargo > "$pkgdir/usr/share/zsh/site-functions/_cargo"
 
     install -Dm644 LICENSE-MIT "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE-MIT
     install -Dm644 LICENSE-APACHE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE-APACHE