update

4 files changed, 26 insertions, 96 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 68c5c30f7255..7851c1c404e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = vim-rust-git
-	pkgdesc = Syntax and supporting functionality for the Rust filetype
-	pkgver = r337.fc11d02
+	pkgdesc = Rust language support for Vim
+	pkgver = 20200918
 	pkgrel = 1
 	url = https://github.com/rust-lang/rust.vim
-	install = vimdoc.install
 	arch = any
-	license = Apache
 	license = MIT
+	license = Apache
 	makedepends = git
+	depends = vim
 	optdepends = rust: for RustRun and similar commands
 	optdepends = vim-syntastic: syntax checking
-	source = git://github.com/rust-lang/rust.vim.git
-	source = git-manifest.txt
+	provides = vim-rust
+	conflicts = vim-rust
+	source = vim-rust::git+https://github.com/rust-lang/rust.vim
 	sha256sums = SKIP
-	sha256sums = 393ac5362b776461f8d80f380f9fcf75e101eefeab710554732a6a10785b9f54
 
 pkgname = vim-rust-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 30a523da3a16..44dd010c963a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,32 @@
-# Maintainer: Jeremy Ruten <jeremy.ruten@gmail.com>
+# Maintainer: lilydjwg <lilydjwg@gmail.com>
+
 pkgname=vim-rust-git
-pkgver=r337.fc11d02
+pkgver=20200918
 pkgrel=1
-pkgdesc="Syntax and supporting functionality for the Rust filetype"
+pkgdesc="Rust language support for Vim"
 arch=('any')
-url="https://github.com/rust-lang/rust.vim"
-license=('Apache' 'MIT')
+depends=('vim')
 makedepends=('git')
+url="https://github.com/rust-lang/rust.vim"
+license=('MIT' 'Apache')
+source=(${pkgname%-git}::git+https://github.com/rust-lang/rust.vim)
+sha256sums=('SKIP')
+provides=('vim-rust')
+conflicts=('vim-rust')
 optdepends=('rust: for RustRun and similar commands'
             'vim-syntastic: syntax checking')
-install=vimdoc.install
-source=('git://github.com/rust-lang/rust.vim.git'
-        'git-manifest.txt')
-sha256sums=('SKIP'
-            '393ac5362b776461f8d80f380f9fcf75e101eefeab710554732a6a10785b9f54')
 
 pkgver() {
-  cd $srcdir/rust.vim
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd ${pkgname%-git}
+  TZ=UTC git log -1 --format="%cd" --date=short-local | sed "s|-||g"
 }
 
 package() {
-  cd $srcdir/rust.vim
+  cd ${pkgname%-git}
 
-  # Install licenses.
-  install -D -m644 LICENSE-APACHE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-APACHE"
-  install -D -m644 LICENSE-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-MIT"
-
-  # Install vim files.
-  local vimfiles="${pkgdir}/usr/share/vim/vimfiles"
-  install -D -m644 after/syntax/rust.vim "${vimfiles}/after/syntax/rust.vim"
-  install -D -m644 autoload/rustfmt.vim "${vimfiles}/autoload/rustfmt.vim"
-  install -D -m644 autoload/rust.vim "${vimfiles}/autoload/rust.vim"
-  install -D -m644 compiler/rustc.vim "${vimfiles}/compiler/rustc.vim"
-  install -D -m644 compiler/cargo.vim "${vimfiles}/compiler/cargo.vim"
-  install -D -m644 doc/rust.txt "${vimfiles}/doc/rust.txt"
-  install -D -m644 ftdetect/rust.vim "${vimfiles}/ftdetect/rust.vim"
-  install -D -m644 ftplugin/rust.vim "${vimfiles}/ftplugin/rust.vim"
-  install -D -m644 indent/rust.vim "${vimfiles}/indent/rust.vim"
-  install -D -m644 plugin/rust.vim "${vimfiles}/plugin/rust.vim"
-  install -D -m644 syntax/rust.vim "${vimfiles}/syntax/rust.vim"
-  install -D -m644 syntax_checkers/rust/rustc.vim "${vimfiles}/syntax_checkers/rust/rustc.vim"
-
-  # Produce a warning if new files get added to the repo in the future.
-  if ! find . | grep -v "./.git" | sort | diff - "${srcdir}/git-manifest.txt"
-  then
-    msg "WARNING: there are different files in the git repo, package may need updating."
-  fi
+  msg 'Installing dirs...'
+  install -dm 755 "$pkgdir/usr/share/vim/vimfiles"
+  for _dir in after autoload compiler doc ftdetect ftplugin indent plugin syntax syntax_checkers ctags; do
+    cp -dpr --no-preserve=ownership $_dir "$pkgdir/usr/share/vim/vimfiles/$_dir"
+  done
 }
-
diff --git a/git-manifest.txt b/git-manifest.txt
deleted file mode 100644
index 19f3f991b81a..000000000000
--- a/git-manifest.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-.
-./after
-./after/syntax
-./after/syntax/rust.vim
-./autoload
-./autoload/rustfmt.vim
-./autoload/rust.vim
-./compiler
-./compiler/cargo.vim
-./compiler/rustc.vim
-./doc
-./doc/rust.txt
-./ftdetect
-./ftdetect/rust.vim
-./ftplugin
-./ftplugin/rust.vim
-./indent
-./indent/rust.vim
-./LICENSE-APACHE
-./LICENSE-MIT
-./plugin
-./plugin/rust.vim
-./README.md
-./syntax
-./syntax_checkers
-./syntax_checkers/rust
-./syntax_checkers/rust/rustc.vim
-./syntax/rust.vim
diff --git a/vimdoc.install b/vimdoc.install
deleted file mode 100644
index 58068492b070..000000000000
--- a/vimdoc.install
+++ /dev/null
@@ -1,23 +0,0 @@
-post_install() {
-  echo -n "Updating vim help tags..."
-  /usr/bin/vim --noplugins -u NONE -U NONE \
-    --cmd ":helptags /usr/share/vim/doc" --cmd ":q" > /dev/null 2>&1
-  echo "done."
-
-  echo "To use the RustRun commands, you may need to insert this line in your ~/.vimrc:"
-  echo "    filetype plugin on"
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install
-}
-
-op=$1
-shift
-
-$op $*
-