1 files changed, 20 insertions, 28 deletions
diff --git a/~lukeshu/holo-lukeshu/PKGBUILD b/~lukeshu/holo/PKGBUILD
index 81953acef..13800e354 100644
--- a/~lukeshu/holo-lukeshu/PKGBUILD
+++ b/~lukeshu/holo/PKGBUILD
@@ -1,26 +1,13 @@
 # Maintainer (AUR): Stefan Majewsky <majewsky@gmx.net>
 # Maintainer: Luke Shumaker <lukeshu@parabola.nu>
 
-# Upstream info
-_pkgname='holo'
-_pkgver=2.2
-_pkgdesc='Minimalistic configuration management'
+pkgname='holo'
+pkgver=2.2
+pkgrel=3
+pkgdesc='Minimalistic configuration management'
+arch=('i686' 'x86_64' 'armv7h')
 url='http://holocm.org'
 license=('GPL3')
-
-# patch info
-pkgname=$_pkgname-lukeshu
-pkgver=$_pkgver.lukeshu1
-pkgdesc="$_pkgdesc (with patches from lukeshu)"
-_gitver='commit=ec2b9a5a3d2d3384a84ed45dbc38eb689003e835'
-mksource=("$_pkgname-$pkgver::git+https://github.com/lukeshu/holo#$_gitver")
-mkmd5sums=('SKIP')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-
-# package info
-pkgrel=2.1
-arch=('i686' 'x86_64' 'armv7h')
 depends=()
 optdepends=(
     'git: to display diffs of entities'
@@ -30,18 +17,14 @@ optdepends=(
 makedepends=('go' 'perl')
 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'
-)
+conflicts=("${provides[@]%=*}")
+replaces=("${provides[@]%=*}")
 backup=(
     'etc/holorc'
     'etc/holorc.d/10-files'
@@ -49,22 +32,31 @@ backup=(
     '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")
+
+# patch info
+pkgver+=.lukeshu1
+pkgrel+=.1
+pkgdesc+=" (with patches from lukeshu)"
+_gitver='commit=ec2b9a5a3d2d3384a84ed45dbc38eb689003e835'
+mksource=("$pkgname-$pkgver::git+https://github.com/lukeshu/holo#$_gitver")
+mkmd5sums=('SKIP')
+replaces+=('holo-lukeshu')
+source=("https://repo.parabola.nu/other/~lukeshu/holo/$pkgname-$pkgver.tar.gz")
 sha256sums=('ad64d5af1b08a6ec0053fe9a729052152d3f77c8488f791cc99cee5c12faf72d')
 
 options=('!strip') # binaries are already stripped inside the Makefile
 
 build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make
 }
 
 check() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make check
 }
 
 package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make install DESTDIR="${pkgdir}"
 }