update in accordance to updated Rust packaging guidelines

2 files changed, 50 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9014d7b34dc7..007ce2cda98a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = sniprun
 	pkgdesc = A neovim plugin to independently run snippets of code
 	pkgver = 0.5.9
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/michaelb/sniprun
 	arch = x86_64
 	license = MIT
 	makedepends = cargo
 	makedepends = gcc-libs
 	source = sniprun-0.5.9.tar.gz::https://github.com/michaelb/sniprun/archive/v0.5.9.tar.gz
-	validpgpkeys = B2A33E69182E98DA
 	sha256sums = bd4b9c00de5b05fcdf9ed0e73e33680f6bef22ca9a120bee7edea612f7231386
 
 pkgname = sniprun
diff --git a/PKGBUILD b/PKGBUILD
index f36cafd9195e..4aca2510c11c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbase=sniprun
 pkgname=('sniprun' 'neovim-sniprun')
 pkgver=0.5.9
-pkgrel=4
+pkgrel=5
 pkgdesc='A neovim plugin to independently run snippets of code'
 arch=('x86_64')
 url="https://github.com/michaelb/sniprun"
@@ -11,57 +11,64 @@ license=('MIT')
 makedepends=('cargo' 'gcc-libs')
 source=("$pkgbase-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
 sha256sums=('bd4b9c00de5b05fcdf9ed0e73e33680f6bef22ca9a120bee7edea612f7231386')
-validpgpkeys=('B2A33E69182E98DA') # Michael Bleuez
+
+prepare() {
+	cd "$pkgbase-$pkgver"
+	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+}
 
 build() {
-  cd "$pkgbase-$pkgver"
-  cargo build --release --locked --all-features --target-dir=target
+	export RUSTUP_TOOLCHAIN=stable
+	export CARGO_TARGET_DIR=target
+	cd "$pkgbase-$pkgver"
+	cargo build --release --frozen --all-features
 }
 
 # check() {
-#   cd "$pkgname-$pkgver"
-#   cargo test --release --locked --target-dir=target
+#		cd "$pkgname-$pkgver"
+#		cargo test --release --locked --target-dir=target
 # }
 
 package_sniprun() {
-  pkgdesc='Compiled binary core for neovim-sniprun'
-  depends=('gcc-libs')
-  replaces=('sniprun-legacy')
+	pkgdesc='Compiled binary core for neovim-sniprun'
+	depends=('gcc-libs')
+	replaces=('sniprun-legacy')
 
-  cd "$pkgbase-$pkgver"
-  install -Dm 755 target/release/sniprun -t "$pkgdir/usr/bin/"
-  install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-  install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+	cd "$pkgbase-$pkgver"
+	install -Dm 755 target/release/sniprun -t "$pkgdir/usr/bin/"
+	install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+	install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
 }
 
-package_neovim-sniprun()  {
-  arch=('any')
-  depends=('neovim>=0.5.0' "sniprun=$pkgver")
-  replaces=('neovim-sniprun-legacy')
-  optdepends=('bash: Bash snippets support'
-              'coffeescript: CoffeeScript snippets support'
-              'gcc: C/C++ snippets support'
-              'gcc-ada: Limited Ada snippets support'
-              'go: Go snippets support'
-              'ghc: Haskell snippets support'
-              'python3: Python3 snippets support'
-              'java-environment-openjdk: Java snippets support'
-              'julia: Julia snippets support'
-              'jupyter: Jupyter support'
-              'lua: Lua snippets support'
-              'r: R snippets support'
-              'ruby: Ruby snippets support'
-              'rust: Rust snippets support'
-              'scala: Scala snippets support')
-  install="$pkgname.install"
+package_neovim-sniprun()	{
+	arch=('any')
+	depends=('neovim>=0.5.0' "sniprun=$pkgver")
+	replaces=('neovim-sniprun-legacy')
+	optdepends=(
+		'bash: Bash snippets support'
+		'coffeescript: CoffeeScript snippets support'
+		'gcc: C/C++ snippets support'
+		'gcc-ada: Limited Ada snippets support'
+		'go: Go snippets support'
+		'ghc: Haskell snippets support'
+		'python3: Python3 snippets support'
+		'java-environment-openjdk: Java snippets support'
+		'julia: Julia snippets support'
+		'jupyter: Jupyter support'
+		'lua: Lua snippets support'
+		'r: R snippets support'
+		'ruby: Ruby snippets support'
+		'rust: Rust snippets support'
+		'scala: Scala snippets support')
+	install="$pkgname.install"
 
-  cd "$pkgbase-$pkgver"
-  find autoload doc plugin lua \
-    -type f -exec install -Dm 644 '{}' "$pkgdir/usr/share/nvim/runtime/{}" \;
-  install -d "$pkgdir/usr/share/nvim/runtime/target/release"
-  ln -s "/usr/bin/sniprun" "$pkgdir/usr/share/nvim/runtime/target/release/sniprun"
-  install -d "$pkgdir/usr/share/licenses/"
-  install -d "$pkgdir/usr/share/doc/"
-  ln -s "/usr/share/licenses/sniprun/" "$pkgdir/usr/share/licenses/$pkgname"
-  ln -s "/usr/share/doc/sniprun/" "$pkgdir/usr/share/doc/$pkgname"
+	cd "$pkgbase-$pkgver"
+	find autoload doc plugin lua \
+		-type f -exec install -Dm 644 '{}' "$pkgdir/usr/share/nvim/runtime/{}" \;
+	install -d "$pkgdir/usr/share/nvim/runtime/target/release"
+	ln -s "/usr/bin/sniprun" "$pkgdir/usr/share/nvim/runtime/target/release/sniprun"
+	install -d "$pkgdir/usr/share/licenses/"
+	install -d "$pkgdir/usr/share/doc/"
+	ln -s "/usr/share/licenses/sniprun/" "$pkgdir/usr/share/licenses/$pkgname"
+	ln -s "/usr/share/doc/sniprun/" "$pkgdir/usr/share/doc/$pkgname"
 }