Update to version 0.16.4

1 files changed, 23 insertions, 11 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c78445301014..c824a9412a9b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,16 @@
 
 _basename=sord
 pkgname=lib32-sord
-pkgver=0.16.2
+pkgver=0.16.4
 pkgrel=1
 pkgdesc="A lightweight C library for storing RDF data in memory (32-bit)"
 arch=('x86_64')
 url="https://drobilla.net/software/sord/"
 license=('custom:ISC')
-depends=('lib32-serd' 'pcre' 'sord')
-makedepends=('python2')
+depends=('lib32-pcre' 'lib32-serd' 'sord')
+makedepends=('waf')
 source=("https://download.drobilla.net/$_basename-$pkgver.tar.bz2"{,.sig})
-sha512sums=('fe143c07ed18c15ffaf2461ca587df76e365a075f5d93f5eaa4c26196e0b1dd59d24d16e176de3664a2658377a2934083af5742c80884e8e7dd201dcaccb9698'
+sha512sums=('98bb102cff5ab38d999c2f966597508076ccce54583a739810b0c28b4f3d570b2ef414605fc08361ecb11ac3184d3176f2f50c7c59c06cc50c3d522e26ed5576'
             'SKIP')
 validpgpkeys=('907D226E7E13FA337F014A083672782A9BF368F3') # David Robillard
 
@@ -20,6 +20,18 @@ prepare() {
 
     # remove local call to ldconfig
     sed -i "/ldconfig/d" wscript
+
+    # let wscript(s) find the custom waf scripts
+    mkdir -pv tools
+    touch __init__.py
+    cp -v waflib/extras/{autoship,autowaf,lv2}.py tools/
+    mkdir -pv plugins/tools/
+    cp -v waflib/extras/{autoship,autowaf,lv2}.py plugins/tools/
+    rm -rv waflib
+    sed -e 's/waflib.extras/tools/g' \
+        -e "s/load('autowaf'/load('autowaf', tooldir='tools'/g" \
+        -e "s/load('lv2'/load('lv2', tooldir='tools'/g" \
+        -i wscript
 }
 
 build() {
@@ -29,25 +41,25 @@ build() {
     export CXX='g++ -m32'
     export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-    python2 waf configure --prefix=/usr \
-                         --libdir=/usr/lib32 \
-                         --test
+    waf configure --prefix=/usr \
+                          --libdir=/usr/lib32 \
+                          --test
 
-    python2 waf build
+    waf build
 }
 
 check() {
     cd "$_basename-$pkgver"
 
-    python2 waf test --verbose-tests
+    waf test
 }
 
 package() {
     cd "$_basename-$pkgver"
 
-    python2 waf install --destdir="$pkgdir"
+    waf install --destdir="$pkgdir"
 
-    install -vDm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -vDm 644 COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
 
     cd "$pkgdir/usr"