unite packages

2 files changed, 22 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3c81d19340c..a57001db616f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,20 @@
 pkgbase = vim-embark-git
 	pkgdesc = A deep inky purple theme leveraging bright colors
-	pkgver = r58.fda8867
-	pkgrel = 3
+	pkgver = r60.03029f4
+	pkgrel = 1
 	url = https://github.com/embark-theme/vim
 	arch = any
 	groups = vim-plugins
 	license = MIT
 	makedepends = git
 	depends = vim-plugin-runtime
-	source = vim-embark-git::git+https://github.com/embark-theme/vim
-	md5sums = SKIP
-
-pkgname = vim-embark-git
-	optdepends = vim-airline-embark: Matching Airline colorscheme
-	optdepends = vim-lightline-embark: Matching Lightline colorscheme
 	provides = vim-embark
-	conflicts = vim-embark
-
-pkgname = vim-airline-embark-git
-	depends = vim-airline
-	optdepends = vim-embark: Base vim colorscheme
 	provides = vim-airline-embark
-	conflicts = vim-airline-embark
-
-pkgname = vim-lightline-embark-git
-	depends = vim-lightline-git
-	optdepends = vim-embark: Base vim colorscheme
 	provides = vim-lightline-embark
+	conflicts = vim-embark
+	conflicts = vim-airline-embark
 	conflicts = vim-lightline-embark
+	source = vim-embark-git::git+https://github.com/embark-theme/vim
+	md5sums = SKIP
 
+pkgname = vim-embark-git
diff --git a/PKGBUILD b/PKGBUILD
index 146a8be0c384..88d32382ba02 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: lmartinez-mirror
-pkgbase=vim-embark-git
-pkgname=('vim-embark-git' 'vim-airline-embark-git' 'vim-lightline-embark-git')
-pkgver=r58.fda8867
-pkgrel=3
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+
+pkgname=vim-embark-git
+pkgver=r60.03029f4
+pkgrel=1
 pkgdesc="A deep inky purple theme leveraging bright colors"
 arch=('any')
 url="https://github.com/embark-theme/vim"
@@ -10,46 +10,19 @@ license=('MIT')
 groups=('vim-plugins')
 depends=('vim-plugin-runtime')
 makedepends=('git')
-source=("$pkgbase::git+$url")
+provides=('vim-embark' 'vim-airline-embark' 'vim-lightline-embark')
+conflicts=('vim-embark' 'vim-airline-embark' 'vim-lightline-embark')
+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-embark-git() {
-  optdepends=('vim-airline-embark: Matching Airline colorscheme'
-              'vim-lightline-embark: Matching Lightline colorscheme')
-  provides=("${pkgname%-git}")
-  conflicts=("${pkgname%-git}")
-
-  cd "$pkgbase"
-  install -Dm 644 colors/embark.vim "$pkgdir/usr/share/vim/vimfiles/colors/embark.vim"
-  install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-  install -Dm 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-embark-git() {
-  depends=('vim-airline')
-  optdepends=('vim-embark: Base vim colorscheme')
-  provides=("${pkgname%-git}")
-  conflicts=("${pkgname%-git}")
-
-  cd "$pkgbase"
-  install -Dm 644 autoload/airline/themes/embark.vim "$pkgdir/usr/share/vim/vimfiles/autoload/airline/themes/embark.vim"
-  install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-  install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
-}
-
-package_vim-lightline-embark-git() {
-  depends=('vim-lightline-git')
-  optdepends=('vim-embark: Base vim colorscheme')
-  provides=("${pkgname%-git}")
-  conflicts=("${pkgname%-git}")
-
-  cd "$pkgbase"
-  install -Dm 644 autoload/lightline/colorscheme/embark.vim "$pkgdir/usr/share/vim/vimfiles/autoload/lightline/colorscheme/embark.vim"
-  install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-  install -Dm 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/"
 }