package cleanup

2 files changed, 31 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65c19c68f5c8..f6e884a23348 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = libdill
 	pkgdesc = Structured concurrency in C
 	pkgver = 2.14
-	pkgrel = 1
-	url = http://libdill.org/
-	arch = i686
+	pkgrel = 2
+	url = https://github.com/sustrik/libdill
 	arch = x86_64
 	license = MIT
-	makedepends = gcc
-	depends = pkgconfig
-	options = !buildflags
-	source = https://github.com/sustrik/libdill/archive/2.14.tar.gz
+	makedepends = clang
+	makedepends = cmake
+	depends = openssl
+	provides = libdill.so
+	source = libdill-2.14.tar.gz::https://github.com/sustrik/libdill/archive/2.14.tar.gz
 	sha256sums = ebba0e5b433ec123b74a57d49b89dfa673aa258e03e6a452959e556b4c4529b9
 
 pkgname = libdill
-
diff --git a/PKGBUILD b/PKGBUILD
index 17dce2621afe..ade650ab4a8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,40 @@
-# Maintainer: Javier Tiá <javier dot tia at gmail dot com>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: Javier Tiá <javier dot tia at gmail dot com>
 
 pkgname=libdill
-_ver=2.14
-_pkgver=${_ver}
-pkgver=${_ver}
-pkgrel=1
+pkgver=2.14
+pkgrel=2
 pkgdesc='Structured concurrency in C'
-arch=('i686' 'x86_64')
-url='http://libdill.org/'
-depends=('pkgconfig')
-options=('!buildflags')
-makedepends=('gcc')
+arch=('x86_64')
 license=('MIT')
-source=("https://github.com/sustrik/${pkgname}/archive/${_pkgver}.tar.gz")
+url='https://github.com/sustrik/libdill'
+depends=('openssl')
+makedepends=('clang' 'cmake')
+provides=('libdill.so')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
 sha256sums=('ebba0e5b433ec123b74a57d49b89dfa673aa258e03e6a452959e556b4c4529b9')
 
-prepare() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  ./autogen.sh
-}
-
+## FIXME: does not compile on gcc
+## See: https://github.com/sustrik/libdill/issues/191
 build() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  ./configure --prefix=/usr
-  make
+  CC=clang cmake \
+    -B build \
+    -S "$pkgname-$pkgver" \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_SHARED_LIBS=ON \
+    -Wno-dev
+  make -C build
 }
 
+## FIXME: one test fails due to subprocess abort
 check() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  # make check
+  make -C build test || true
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${_pkgver}/"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  make -C build install DESTDIR="$pkgdir/"
+  install -Dm644 "$pkgname-$pkgver/COPYING" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et: