[arch-commits] Commit in aubio/trunk (PKGBUILD)

[David Runge]

    Date: Monday, August 26, 2019 @ 18:58:20
  Author: dvzrv
Revision: 502156

upgpkg: aubio 0.4.9-4

Switching to waf in makedepends and removing vendored waflib in prepare().

Modified:
  aubio/trunk/PKGBUILD

----------+
 PKGBUILD |   34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-26 18:48:31 UTC (rev 502155)
+++ PKGBUILD	2019-08-26 18:58:20 UTC (rev 502156)
@@ -5,7 +5,7 @@
 pkgbase=aubio
 pkgname=('aubio' 'python-aubio' 'python2-aubio')
 pkgver=0.4.9
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool for extracting annotations from audio signals"
 arch=('x86_64')
 url="https://aubio.org/"
@@ -12,7 +12,7 @@
 license=('GPL3')
 makedepends=('doxygen' 'ffmpeg' 'fftw' 'jack' 'python-numpy'
 'python-setuptools' 'python-sphinx' 'python2-numpy' 'python2-setuptools'
-'txt2man')
+'txt2man' 'waf')
 checkdepends=('python-pytest' 'python2-pytest')
 source=("https://${pkgbase}.org/pub/${pkgbase}-${pkgver}.tar.bz2")
 sha512sums=('0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130')
@@ -19,24 +19,30 @@
 
 prepare() {
   cp -av "${pkgbase}-${pkgver}" "${pkgname[2]}-${pkgver}"
-  cd "${pkgname[2]}-${pkgver}"
-  # python2 shebang
-  sed -e '1s/python/&2/' \
-    -i "python/lib/${pkgbase}/"{__init__,cmd,cut}.py \
-    -i "python/tests/"*.py
-  # console_scripts names
-  sed -e 's/aubio =/aubio2 =/g' \
-      -e 's/aubiocut/&2/' \
-      -i setup.py
+  (
+    cd "${pkgname}-${pkgver}"
+    rm -rv waflib
+  )
+  (
+    cd "${pkgname[2]}-${pkgver}"
+    # python2 shebang
+    sed -e '1s/python/&2/' \
+      -i "python/lib/${pkgbase}/"{__init__,cmd,cut}.py \
+      -i "python/tests/"*.py
+    # console_scripts names
+    sed -e 's/aubio =/aubio2 =/g' \
+        -e 's/aubiocut/&2/' \
+        -i setup.py
+  )
 }
 
 build() {
   cd "${pkgbase}-${pkgver}"
-  python waf configure --prefix=/usr \
+  waf configure --prefix=/usr \
     --alltests \
     --enable-fftw3 \
     --libdir=/usr/lib
-  python waf build
+  waf build
   python setup.py build
   cd ../"${pkgname[2]}-${pkgver}"
   python2 setup.py build
@@ -65,7 +71,7 @@
               'python-aubio: Python 3.x interface')
   groups=('pro-audio')
   cd "${pkgname}-${pkgver}"
-  python waf --destdir="${pkgdir}" install
+  waf --destdir="${pkgdir}" install
   # move doc, as waf configure doesn't honor the htmldir and docdir settings
   mv -v "${pkgdir}/usr/share/doc/lib${pkgname}-doc" \
     "${pkgdir}/usr/share/doc/${pkgname}"