v2017-10-08

3 files changed, 63 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 67319a2c563a..17b24f2d0601 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cargo-nightly-bin
 	pkgdesc = Rust package manager
-	pkgver = 20161126
+	pkgver = 20171008
 	pkgrel = 1
 	url = https://crates.io/
 	arch = x86_64
@@ -11,10 +11,10 @@ pkgbase = cargo-nightly-bin
 	depends = rust
 	provides = cargo
 	conflicts = cargo
-	source_x86_64 = https://static.rust-lang.org/cargo-dist/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz
-	md5sums_x86_64 = SKIP
-	source_i686 = https://static.rust-lang.org/cargo-dist/cargo-nightly-i686-unknown-linux-gnu.tar.gz
-	md5sums_i686 = SKIP
+	source_x86_64 = cargo-nightly-bin-2017-10-08.xz::https://static.rust-lang.org/dist/2017-10-08/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz
+	sha256sums_x86_64 = SKIP
+	source_i686 = cargo-nightly-bin-2017-10-08.xz::https://static.rust-lang.org/dist/2017-10-08/cargo-nightly-i686-unknown-linux-gnu.tar.xz
+	sha256sums_i686 = SKIP
 
 pkgname = cargo-nightly-bin
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..9865d22ba8ed
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+# Blacklist:
+*
+
+# Whitelist:
+!.gitignore
+!PKGBUILD
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index c07073473bf8..eb16ead5cdb5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,14 @@
 # Contributor: Michael Herold <arch@michaeljherold.com>
 # Contributor: Ryan Marcus <ryan@rmarcus.info>
 
-pkgname=cargo-nightly-bin
-pkgver=20161126
+_date() {
+  date +'%Y-%m-%d'
+}
+
+_xzname='cargo-nightly-x86_64-unknown-linux-gnu'
+
+pkgname='cargo-nightly-bin'
+pkgver=20171008
 pkgrel=1
 pkgdesc="Rust package manager"
 url="https://crates.io/"
@@ -14,24 +20,54 @@ provides=('cargo')
 arch=('x86_64' 'i686')
 license=('APACHE' 'MIT')
 depends=('curl' 'rust')
-source_i686=("https://static.rust-lang.org/cargo-dist/cargo-nightly-i686-unknown-linux-gnu.tar.gz")
-source_x86_64=("https://static.rust-lang.org/cargo-dist/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz")
-md5sums_i686=('SKIP')
-md5sums_x86_64=('SKIP')
+source_i686=(
+"${pkgname}-$(_date).xz::https://static.rust-lang.org/dist/$(_date)/cargo-nightly-i686-unknown-linux-gnu.tar.xz")
+source_x86_64=(
+"${pkgname}-$(_date).xz::https://static.rust-lang.org/dist/$(_date)/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz")
+sha256sums_i686=('SKIP')
+sha256sums_x86_64=('SKIP')
+
 
 pkgver() {
-  cd "cargo-nightly-$CARCH-unknown-linux-gnu"
-  cat version | sed 's/.* //;s/.$//;s/-//g'
+  _date | sed 's/-//g'
 }
 
 package() {
-  cd "cargo-nightly-$CARCH-unknown-linux-gnu"
+  cd "${_xzname}"
 
-  install -Dm644 cargo/etc/bash_completion.d/cargo "$pkgdir/etc/bash_completion.d/cargo"
-  install -Dm644 cargo/share/zsh/site-functions/_cargo "$pkgdir/usr/share/zsh/site-functions/_cargo"
-  install -Dm644 cargo/share/man/man1/cargo.1 "$pkgdir/usr/share/man/man1/cargo.1"
-  install -Dm644 LICENSE-APACHE "$pkgdir/usr/share/licenses/$pkgname/LICENSE-APACHE"
-  install -Dm644 LICENSE-MIT "$pkgdir/usr/share/licenses/$pkgname/LICENSE-MIT"
+  # cargo binary:
+  install -d "${pkgdir}/usr/bin"
+  install -m 755 cargo/bin/cargo "${pkgdir}/usr/bin/"
 
-  install -Dm755 cargo/bin/cargo "$pkgdir/usr/bin/cargo"
+  # bash completions:
+  install -d "${pkgdir}/etc/bash_completion.d"
+  install -m 644 cargo/etc/bash_completion.d/cargo     \
+    "${pkgdir}/etc/bash_completion.d/"
+
+  # zsh completions: 
+  install -d "${pkgdir}/usr/share/zsh/site-functions"
+  install -m 644 cargo/share/zsh/site-functions/_cargo \
+    "${pkgdir}/usr/share/zsh/site-functions/"
+  
+  # Miscellaneous documentation:
+  install -d "${pkgdir}/usr/share/doc/cargo"
+  install -m 644 cargo/share/doc/cargo/README.md       \
+    "${pkgdir}/usr/share/doc/cargo/"
+
+  # man-pages:
+  install -d "${pkgdir}/usr/share/man/man1"
+  for manpage in cargo/share/man/man1/*.1; do
+    install -m 644 "${manpage}" "${pkgdir}/usr/share/man/man1/"
+  done
+
+  # Licenses:
+  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m 644 LICENSE-APACHE \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-APACHE"
+  install -m 644 LICENSE-MIT    \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-MIT"
+  install -m 644 LICENSE-MIT    \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-THIRD-PARTY"
 }
+
+# vim: ts=2 sw=2 et: