package rewrite

* use tags in pkgver()
* use signed commits for verification
* separate extras into split package

2 files changed, 38 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 376a66b150d7..09a7d5a88cd3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = neovim-zenbones-git
 	pkgdesc = Contrast-focused Neovim colorscheme
-	pkgver = r57.8a4d3ba
+	pkgver = 0.11.r12.g2a1191d
 	pkgrel = 1
 	url = https://github.com/mcchrish/zenbones.nvim
 	arch = any
@@ -8,11 +8,21 @@ pkgbase = neovim-zenbones-git
 	groups = vim-plugins
 	license = MIT
 	makedepends = git
+	source = neovim-zenbones-git::git+https://github.com/mcchrish/zenbones.nvim?signed
+	validpgpkeys = A9C0645CE9FC1230271A768E9ABC0DCACC50317D
+	md5sums = SKIP
+
+pkgname = neovim-zenbones-git
 	depends = vim-plugin-runtime
 	optdepends = neovim-lush: for zenbones-lua colorscheme
 	provides = neovim-zenbones
+	provides = neovim-lightline-zenbones
+	provides = neovim-lualine-zenbones
 	conflicts = neovim-zenbones
-	source = neovim-zenbones-git::git+https://github.com/mcchrish/zenbones.nvim
-	md5sums = SKIP
+	conflicts = neovim-lightline-zenbones
+	conflicts = neovim-lualine-zenbones
 
-pkgname = neovim-zenbones-git
+pkgname = neovim-zenbones-extras-git
+	pkgdesc = Zenbones color templates for other programs
+	provides = neovim-zenbones-extras
+	conflicts = neovim-zenbones-extras
diff --git a/PKGBUILD b/PKGBUILD
index 38e356ae7b05..818523142dcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,41 @@
 # Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
 
-pkgname=neovim-zenbones-git
-pkgver=r57.8a4d3ba
+pkgbase=neovim-zenbones-git
+pkgname=('neovim-zenbones-git' 'neovim-zenbones-extras-git')
+pkgver=0.11.r12.g2a1191d
 pkgrel=1
 pkgdesc="Contrast-focused Neovim colorscheme"
 arch=('any')
 url="https://github.com/mcchrish/zenbones.nvim"
 license=('MIT')
 groups=('neovim-plugins' 'vim-plugins')
-depends=('vim-plugin-runtime')
-optdepends=('neovim-lush: for zenbones-lua colorscheme')
 makedepends=('git')
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
-source=("$pkgname::git+$url")
+source=("$pkgname::git+$url?signed")
 md5sums=('SKIP')
+validpgpkeys=('A9C0645CE9FC1230271A768E9ABC0DCACC50317D')
 
 pkgver() {
 	cd "$pkgname"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	git describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./'
 }
-package() {
-	cd "$pkgname"
-	find colors lua -type f -exec install -Dm 644 '{}' "$pkgdir/usr/share/vim/vimfiles/{}" \;
+package_neovim-zenbones-git() {
+	depends=('vim-plugin-runtime')
+	optdepends=('neovim-lush: for zenbones-lua colorscheme')
+	provides=("${pkgname%-git}" 'neovim-lightline-zenbones' 'neovim-lualine-zenbones')
+	conflicts=("${pkgname%-git}" 'neovim-lightline-zenbones' 'neovim-lualine-zenbones')
+
+	cd "$pkgbase"
+	find autoload doc colors lua -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-zenbones-extras-git() {
+	pkgdesc='Zenbones color templates for other programs'
+	provides=("${pkgname%-git}")
+	conflicts=("${pkgname%-git}")
+
+	cd "$pkgbase"
+	find extras -type f -exec install -Dm 644 '{}' "$pkgdir/usr/share/${pkgbase%-git}/{}" \;
+	install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+}