From e9a7b115824a97a1f50eba9152b35f7d0b930ec4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Mon, 29 Jan 2018 14:37:06 -0500
Subject: mv ~lukeshu/holo{-lukeshu,}

---
 ~lukeshu/holo-lukeshu/PKGBUILD | 70 ------------------------------------------
 ~lukeshu/holo/PKGBUILD         | 62 +++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 70 deletions(-)
 delete mode 100644 ~lukeshu/holo-lukeshu/PKGBUILD
 create mode 100644 ~lukeshu/holo/PKGBUILD

diff --git a/~lukeshu/holo-lukeshu/PKGBUILD b/~lukeshu/holo-lukeshu/PKGBUILD
deleted file mode 100644
index 81953acef..000000000
--- a/~lukeshu/holo-lukeshu/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# Maintainer (AUR): Stefan Majewsky <majewsky@gmx.net>
-# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
-
-# Upstream info
-_pkgname='holo'
-_pkgver=2.2
-_pkgdesc='Minimalistic configuration management'
-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'
-    'openssh: for the holo-ssh-keys plugin'
-    'shadow: for the holo-users-groups plugin'
-)
-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'
-)
-backup=(
-    '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=('ad64d5af1b08a6ec0053fe9a729052152d3f77c8488f791cc99cee5c12faf72d')
-
-options=('!strip') # binaries are already stripped inside the Makefile
-
-build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    make
-}
-
-check() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    make check
-}
-
-package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    make install DESTDIR="${pkgdir}"
-}
diff --git a/~lukeshu/holo/PKGBUILD b/~lukeshu/holo/PKGBUILD
new file mode 100644
index 000000000..13800e354
--- /dev/null
+++ b/~lukeshu/holo/PKGBUILD
@@ -0,0 +1,62 @@
+# Maintainer (AUR): Stefan Majewsky <majewsky@gmx.net>
+# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
+
+pkgname='holo'
+pkgver=2.2
+pkgrel=3
+pkgdesc='Minimalistic configuration management'
+arch=('i686' 'x86_64' 'armv7h')
+url='http://holocm.org'
+license=('GPL3')
+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')
+checkdepends=('git' 'openssh')
+provides=(
+    # 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=("${provides[@]%=*}")
+replaces=("${provides[@]%=*}")
+backup=(
+    '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'
+)
+
+# 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}"
+    make
+}
+
+check() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make check
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make install DESTDIR="${pkgdir}"
+}
-- 
cgit v1.2.3