jacklistenere-git: add uthash as makedep

2 files changed, 29 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c758b446aac0..3d826e1d767b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,22 @@
 pkgbase = jacklistener-git
 	pkgdesc = Jack Listener Daemon (jack-sensing)
-	pkgver = 51.2e73f72
+	pkgver = r51.2e73f72
 	pkgrel = 1
 	url = https://github.com/gentoo-root/jacklistener
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = git
+	makedepends = uthash
 	depends = dbus
 	depends = udev
 	optdepends = jackeventcmd-git: Run custom commands when headphones are (un)plugged
 	optdepends = jacknotifier-git: Headphones Jack Notification Daemon
 	optdepends = musicpaused-git: Pause music when headphones are unplugged
 	provides = jacklistener
-	source = jacklistener::git://github.com/gentoo-root/jacklistener.git
-	md5sums = SKIP
+	conflicts = jacklistener
+	source = jacklistener::git+https://github.com/gentoo-root/jacklistener
+	sha256sums = SKIP
 
 pkgname = jacklistener-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 90f550fdf909..1146ed8394cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,52 @@
 # Maintainer: robertfoster
 
 pkgname=jacklistener-git
-pkgver=51.2e73f72
+pkgver=r51.2e73f72
 pkgrel=1
 pkgdesc="Jack Listener Daemon (jack-sensing)"
 arch=('i686' 'x86_64')
 url="https://github.com/gentoo-root/jacklistener"
 license=('GPL3')
-provides=('jacklistener')
 depends=('dbus' 'udev')
 optdepends=("jackeventcmd-git: Run custom commands when headphones are (un)plugged"
-	    "jacknotifier-git: Headphones Jack Notification Daemon"
-	    "musicpaused-git: Pause music when headphones are unplugged"
+  "jacknotifier-git: Headphones Jack Notification Daemon"
+  "musicpaused-git: Pause music when headphones are unplugged"
 )
-makedepends=('git')
-source=('jacklistener::git://github.com/gentoo-root/jacklistener.git')
+makedepends=('git' 'uthash')
+conflicts=("${pkgname%-git}")
+provides=("${pkgname%-git}")
+source=("${pkgname%-git}::git+${url}")
+
+prepare() {
+  cd "${srcdir}/${pkgname%-git}"
+  sed 's#AM_CONFIG_HEADER#AC_CONFIG_HEADERS#g' -i configure.ac
+}
 
 build() {
-  cd jacklistener
-  sed 's#AM_CONFIG_HEADER#AC_CONFIG_HEADERS#g' -i configure.ac 
+  cd "${srcdir}/${pkgname%-git}"
+
   libtoolize
   aclocal -I m4
   autoheader
   automake --add-missing
   autoconf
   ./configure --prefix=/usr --sbindir=/usr/bin \
-	--sysconfdir=/etc --enable-systemd \
-	--enable-arch --enable-udev
+    --sysconfdir=/etc --enable-systemd \
+    --enable-arch --enable-udev
   make
 }
 
 package() {
-   cd jacklistener
-   make DESTDIR="$pkgdir" install
-   sed -i 's/sbin/bin/g' $pkgdir/usr/lib/systemd/system/jacklistener.service
-   install -D init.d/jacklistener-runscript $pkgdir/usr/bin/jacklistenerd-runscript
-   install -D jacklistenerd $pkgdir/usr/lib/jacklistener/jacklistenerd
+  cd "${srcdir}/${pkgname%-git}"
+  make DESTDIR="${pkgdir}" install
+  sed -i 's/sbin/bin/g' "${pkgdir}/usr/lib/systemd/system/jacklistener.service"
+  install -D init.d/jacklistener-runscript "${pkgdir}/usr/bin/jacklistenerd-runscript"
+  install -D jacklistenerd "${pkgdir}/usr/lib/jacklistener/jacklistenerd"
 }
 
 pkgver() {
-  cd jacklistener
-  echo $(git rev-list --count master).$(git rev-parse --short master)
+  cd "${srcdir}/${pkgname%-git}"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-md5sums=('SKIP')
+sha256sums=('SKIP')