unite packages

2 files changed, 22 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 95adec2b3db4..40ea17e95d34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vim-miramare-git
 	pkgdesc = Comfortable and pleasant colorscheme for Vim
-	pkgver = r26.a2abfb8
+	pkgver = r28.ec1b7cf
 	pkgrel = 1
 	url = https://github.com/franbach/miramare
 	arch = any
@@ -8,24 +8,13 @@ pkgbase = vim-miramare-git
 	license = MIT
 	makedepends = git
 	depends = vim-plugin-runtime
-	source = vim-miramare-git::git+https://github.com/franbach/miramare
-	sha256sums = SKIP
-
-pkgname = vim-miramare-git
-	optdepends = vim-airline-miramare: Airline theme
-	optdepends = vim-lightline-miramare: Lightline theme
 	provides = vim-miramare
-	conflicts = vim-miramare
-
-pkgname = vim-airline-miramare-git
-	depends = vim-airline
-	optdepends = vim-miramare: Base vim colorscheme
 	provides = vim-airline-miramare
-	conflicts = vim-airline-miramare
-
-pkgname = vim-lightline-miramare-git
-	depends = vim-lightline-git
-	optdepends = vim-miramare: Base vim colorscheme
 	provides = vim-lightline-miramare
-	conflicts = vim-lightline-miramare
+	conflicts = vim-miramare
+	replaces = vim-airline-miramare-git
+	replaces = vim-lightline-miramare-git
+	source = vim-miramare-git::git+https://github.com/franbach/miramare
+	sha256sums = SKIP
 
+pkgname = vim-miramare-git
diff --git a/PKGBUILD b/PKGBUILD
index 3a70710678fb..3a043fc1b033 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,7 @@
-# Maintainer: Luis Martinez <luis dot martinez at tuta dot io>
-pkgbase=vim-miramare-git
-pkgname=('vim-miramare-git'
-         'vim-airline-miramare-git'
-         'vim-lightline-miramare-git')
-pkgver=r26.a2abfb8
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+
+pkgname=vim-miramare-git
+pkgver=r28.ec1b7cf
 pkgrel=1
 pkgdesc="Comfortable and pleasant colorscheme for Vim"
 arch=('any')
@@ -12,44 +10,20 @@ license=('MIT')
 groups=('vim-plugins')
 depends=('vim-plugin-runtime')
 makedepends=('git')
-source=("$pkgbase::git+$url")
+provides=("${pkgname%-git}" 'vim-airline-miramare' 'vim-lightline-miramare')
+conflicts=("${pkgname%-git}")
+replaces=('vim-airline-miramare-git' 'vim-lightline-miramare-git')
+source=("$pkgname::git+$url")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "$pkgbase"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd "$pkgname"
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-package_vim-miramare-git()  {
-  optdepends=('vim-airline-miramare: Airline theme'
-              'vim-lightline-miramare: Lightline theme')
-  provides=("${pkgname%-git}")
-  conflicts=("${pkgname%-git}")
-
-  cd "$pkgbase"
-  install -Dvm 644 colors/miramare.vim "$pkgdir/usr/share/vim/vimfiles/colors/miramare.vim"
-  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 -Dvm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+	install -Dvm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
 }
-
-package_vim-airline-miramare-git()  {
-  depends=('vim-airline')
-  optdepends=('vim-miramare: Base vim colorscheme')
-  provides=("${pkgname%-git}")
-  conflicts=("${pkgname%-git}")
-
-  cd "$pkgbase"
-  install -Dvm 644 autoload/airline/themes/miramare.vim "$pkgdir/usr/share/vim/vimfiles/autoload/airline/themes/miramare.vim"
-  install -Dvm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-}
-
-package_vim-lightline-miramare-git()  {
-  depends=('vim-lightline-git')
-  optdepends=('vim-miramare: Base vim colorscheme')
-  provides=("${pkgname%-git}")
-  conflicts=("${pkgname%-git}")
-
-  cd "$pkgbase"
-  install -Dvm 644 autoload/lightline/colorscheme/miramare.vim "$pkgdir/usr/share/vim/vimfiles/autoload/lightline/colorscheme/miramare.vim"
-  install -Dvm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-}
\ No newline at end of file