unite packages

2 files changed, 24 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6a5aa54aecc4..ba07b8559c72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,19 @@
 pkgbase = vim-tender-git
-	pkgdesc = A 24-bit colorscheme for vim, airline, and lightline
-	pkgver = r131.25924cb
+	pkgdesc = A 24-bit colorscheme
+	pkgver = r132.7746453
 	pkgrel = 1
 	url = https://github.com/jacoborus/tender.vim
 	arch = any
 	groups = vim-plugins
 	license = MIT
 	makedepends = git
-	source = vim-tender-git::git+https://github.com/jacoborus/tender.vim
-	md5sums = SKIP
-
-pkgname = vim-tender-git
-	depends = vim-plugin-runtime
-	optdepends = vim-airline-tender
-	optdepends = vim-lightline-tender
 	provides = vim-tender
-	conflicts = vim-tender
-
-pkgname = vim-airline-tender-git
-	depends = vim-plugin-runtime
-	depends = vim-airline
-	optdepends = vim-tender
 	provides = vim-airline-tender
-	conflicts = vim-airline-tender
-
-pkgname = vim-lightline-tender-git
-	depends = vim-plugin-runtime
-	depends = vim-lightline-git
-	optdepends = vim-tender
 	provides = vim-lightline-tender
-	conflicts = vim-lightline-tender
+	conflicts = vim-tender
+	replaces = vim-airline-tender-git
+	replaces = vim-lightline-tender-git
+	source = vim-tender-git::git+https://github.com/jacoborus/tender.vim
+	md5sums = SKIP
 
+pkgname = vim-tender-git
diff --git a/PKGBUILD b/PKGBUILD
index 9c5a7663d316..762358be211d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,28 @@
-# Maintainer: Luis Martinez <luis dot martinez at tuta dot io>
-pkgbase=vim-tender-git
-pkgname=('vim-tender-git'
-         'vim-airline-tender-git'
-         'vim-lightline-tender-git')
-pkgver=r131.25924cb
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+
+pkgname=vim-tender-git
+pkgver=r132.7746453
 pkgrel=1
-pkgdesc="A 24-bit colorscheme for vim, airline, and lightline"
+pkgdesc='A 24-bit colorscheme'
 arch=('any')
 url="https://github.com/jacoborus/tender.vim"
 license=('MIT')
 groups=('vim-plugins')
 makedepends=('git')
-source=("$pkgbase::git+$url")
+provides=("${pkgname%-git}" 'vim-airline-tender' 'vim-lightline-tender')
+conflicts=("${pkgname%-git}")
+replaces=('vim-airline-tender-git' 'vim-lightline-tender-git')
+source=("$pkgname::git+$url")
 md5sums=('SKIP')
 
 pkgver() {
-  cd "$pkgbase"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-package_vim-tender-git()  {
-  depends=('vim-plugin-runtime')
-  optdepends=('vim-airline-tender'
-              'vim-lightline-tender')
-  provides=("${pkgname%-git}")
-  conflicts=("${pkgname%-git}")
-
-  cd "$pkgbase"
-  install -Dvm 644 colors/tender.vim -t "$pkgdir/usr/share/vim/vimfiles/colors/"
-  install -Dvm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-  install -Dvm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+	cd "$pkgname"
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-package_vim-airline-tender-git()  {
-  depends=('vim-plugin-runtime' 'vim-airline')
-  optdepends=('vim-tender')
-  provides=("${pkgname%-git}")
-  conflicts=("${pkgname%-git}")
-
-  cd "$pkgbase"
-  install -Dvm 644 autoload/airline/themes/tender.vim -t "$pkgdir/usr/share/vim/vimfiles/airline/themes/"
-  install -Dvm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-  install -Dvm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
-}
-
-package_vim-lightline-tender-git()  {
-  depends=('vim-plugin-runtime' 'vim-lightline-git')
-  optdepends=('vim-tender')
-  provides=("${pkgname%-git}")
-  conflicts=("${pkgname%-git}")
-
-  cd "$pkgbase"
-  install -Dvm 644 autoload/lightline/colorscheme/tender.vim -t "$pkgdir/usr/share/vim/vimfiles/autoload/lightline/colorscheme/"
-  install -Dvm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-  install -Dvm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+package() {
+	cd "$pkgname"
+	find autoload colors -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/"
 }