1 files changed, 34 insertions, 16 deletions
diff --git a/~lukeshu/holo-lukeshu/PKGBUILD b/~lukeshu/holo-lukeshu/PKGBUILD
index 88bc9ef8c..81953acef 100644
--- a/~lukeshu/holo-lukeshu/PKGBUILD
+++ b/~lukeshu/holo-lukeshu/PKGBUILD
@@ -3,7 +3,7 @@
 
 # Upstream info
 _pkgname='holo'
-_pkgver=1.2.1
+_pkgver=2.2
 _pkgdesc='Minimalistic configuration management'
 url='http://holocm.org'
 license=('GPL3')
@@ -12,41 +12,59 @@ license=('GPL3')
 pkgname=$_pkgname-lukeshu
 pkgver=$_pkgver.lukeshu1
 pkgdesc="$_pkgdesc (with patches from lukeshu)"
-_gitver='commit=6e22b1f69650910f71f9f93d705e973384f3fab8'
+_gitver='commit=ec2b9a5a3d2d3384a84ed45dbc38eb689003e835'
 mksource=("$_pkgname-$pkgver::git+https://github.com/lukeshu/holo#$_gitver")
 mkmd5sums=('SKIP')
 provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname")
 
 # package info
-pkgrel=2
+pkgrel=2.1
 arch=('i686' 'x86_64' 'armv7h')
-depends=('git')
+depends=()
+optdepends=(
+    'git: to display diffs of entities'
+    'openssh: for the holo-ssh-keys plugin'
+    'shadow: for the holo-users-groups plugin'
+)
 makedepends=('go' 'perl')
-provides+=(
-  "holo-files=$pkgver"
-  'HOLO_API_VERSION=3'
+checkdepends=('git' 'openssh')
+provides=(
+    "holo=${pkgver}"
+    # required for holo-build packages that have a holo-$PLUGIN dependency when there are files below /usr/share/holo/$PLUGIN/
+    "holo-files=${pkgver}"
+    "holo-run-scripts=${pkgver}"
+    "holo-ssh-keys=${pkgver}"
+    "holo-users-groups=${pkgver}"
+)
+conflicts=(
+    'holo-run-scripts'
+    'holo-ssh-keys'
+    'holo-users-groups'
 )
 backup=(
-  'etc/holorc'
-  'etc/holorc.d/10-files'
+    'etc/holorc'
+    'etc/holorc.d/10-files'
+    'etc/holorc.d/20-users-groups'
+    'etc/holorc.d/25-ssh-keys'
+    'etc/holorc.d/95-holo-run-scripts'
 )
 source=("https://repo.parabola.nu/other/~lukeshu/holo/$_pkgname-$pkgver.tar.gz")
-sha256sums=('0572fcff14fd2a740fce50070475f8d79c96464040f54d12cc7b212f1a5e64fb')
+sha256sums=('ad64d5af1b08a6ec0053fe9a729052152d3f77c8488f791cc99cee5c12faf72d')
 
 options=('!strip') # binaries are already stripped inside the Makefile
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  make
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    make
 }
 
 check() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  make check
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    make check
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    make install DESTDIR="${pkgdir}"
 }