update to 2.2.0

2 files changed, 21 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a8a4a3ba793..c0c6ce0aa835 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,15 @@
 pkgbase = vim-denops
-	pkgver = 2.1.2
+	pkgdesc = Vim ecosystem for writing plugins in Deno
+	pkgver = 2.2.0
 	pkgrel = 1
 	url = https://github.com/vim-denops/denops.vim
 	arch = any
+	groups = vim-plugins
 	license = MIT
-	depends = deno>=1.14.0
-	source = vim-denops-2.1.2.tar.gz::https://github.com/vim-denops/denops.vim/archive/v2.1.2.tar.gz
-	sha256sums = 86c0e9911e857963dd2a7953eda0c8fabbd219f0639bc28fa5d4776a5b955032
+	depends = deno
+	depends = vim-plugin-runtime
+	replaces = neovim-denops
+	source = vim-denops-2.2.0.tar.gz::https://github.com/vim-denops/denops.vim/archive/v2.2.0.tar.gz
+	sha256sums = 8a9e9e5a11c3418f1a93f0bbdf23c2f1642e7d32eaae77c0dd7dbb58861a3040
 
 pkgname = vim-denops
-	pkgdesc = Vim ecosystem for writing plugins in Deno
-	groups = vim-plugins
-	depends = deno>=1.14.0
-	depends = vim>=8.2.3081
-
-pkgname = neovim-denops
-	pkgdesc = Neovim ecosystem for writing plugins in Deno
-	groups = neovim-plugins
-	depends = deno>=1.14.0
-	depends = neovim>=0.5.0
-	conflicts = vim-denops
diff --git a/PKGBUILD b/PKGBUILD
index 658d561bae62..a4f030c8232b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,22 @@
 # Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
 
-pkgbase=vim-denops
-pkgname=('vim-denops' 'neovim-denops')
-pkgver=2.1.2
+pkgname=vim-denops
+pkgver=2.2.0
 pkgrel=1
+pkgdesc='Vim ecosystem for writing plugins in Deno'
 arch=('any')
+groups=('vim-plugins')
 url="https://github.com/vim-denops/denops.vim"
 license=('MIT')
-depends=('deno>=1.14.0')
-source=("$pkgbase-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
-sha256sums=('86c0e9911e857963dd2a7953eda0c8fabbd219f0639bc28fa5d4776a5b955032')
-
-package_vim-denops() {
-	pkgdesc="Vim ecosystem for writing plugins in Deno"
-	groups=('vim-plugins')
-	depends+=('vim>=8.2.3081')
-
-	cd "denops.vim-$pkgver"
-	find autoload denops doc plugin -type f -exec install -Dm 644 '{}' "$pkgdir/usr/share/vim/vimfiles/{}" \;
-	install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-	install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
-}
-
-package_neovim-denops() {
-	pkgdesc="Neovim ecosystem for writing plugins in Deno"
-	groups=('neovim-plugins')
-	depends+=('neovim>=0.5.0')
-	conflicts=('vim-denops')
+depends=('deno' 'vim-plugin-runtime')
+replaces=('neovim-denops')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
+sha256sums=('8a9e9e5a11c3418f1a93f0bbdf23c2f1642e7d32eaae77c0dd7dbb58861a3040')
 
+package() {
 	cd "denops.vim-$pkgver"
-	find autoload denops doc plugin -type f -exec install -Dm 644 '{}' "$pkgdir/usr/share/nvim/runtime/{}" \;
-	install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-	install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+	find autoload denops doc plugin \
+		-type f -exec install -Dm644 '{}' "$pkgdir/usr/share/vim/vimfiles/{}" \;
+	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+	install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
 }