Upstream repository changed and now uses git submodule for waflib; Python 2 is no longer necessary

Signed-off-by: Christopher Arndt <chris@chrisarndt.de>

3 files changed, 24 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab5868b64fe5..c6d54b82a681 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = suil-git
 	pkgdesc = A lightweight C library for loading and wrapping LV2 plugin UIs
-	pkgver = 0.10.0.r299.9a93d3c
+	pkgver = 0.10.3.r311.0229219
 	pkgrel = 1
 	url = http://drobilla.net/software/suil/
 	arch = i686
 	arch = x86_64
 	license = custom:ISC
 	makedepends = subversion
-	makedepends = python2
+	makedepends = python
 	makedepends = lv2
 	makedepends = qt4
 	makedepends = gtk2
@@ -15,10 +15,12 @@ pkgbase = suil-git
 	optdepends = qt5-base: Qt 5.x UI wrapping support
 	optdepends = gtk2: GTK+ 2.x UI wrapping support
 	provides = suil
-	provides = suil=0.10.0
+	provides = suil=0.10.3
 	conflicts = suil
 	conflicts = suil-svn
-	source = suil::git+http://git.drobilla.net/suil.git
+	source = suil::git+https://gitlab.com/lv2/suil.git
+	source = autowaf::git+https://gitlab.com/drobilla/autowaf.git
+	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = suil-git
diff --git a/.gitignore b/.gitignore
index 2ea1be600b74..d5f4646a51b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
+autowaf/
 pkg/
 src/
-.AURINFO
 suil/
+.AURINFO
 suil-git-*.tar.xz
 suil-git-*.src.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 4692c16db555..37276b287c3b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,21 @@
 
 _pkgname=suil
 pkgname="${_pkgname}-git"
-pkgver=0.10.0.r299.9a93d3c
+pkgver=0.10.3.r311.0229219
 pkgrel=1
 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs"
 arch=('i686' 'x86_64')
 url="http://drobilla.net/software/suil/"
 license=('custom:ISC')
-makedepends=('subversion' 'python2' 'lv2' 'qt4' 'gtk2')
+makedepends=('subversion' 'python' 'lv2' 'qt4' 'gtk2')
 optdepends=('qt4: Qt 4.x UI wrapping support'
             'qt5-base: Qt 5.x UI wrapping support'
             'gtk2: GTK+ 2.x UI wrapping support')
 provides=("${_pkgname}" "${_pkgname}=${pkgver//.r*/}")
 conflicts=("${_pkgname}" "${_pkgname}-svn")
-source=("${_pkgname}::git+http://git.drobilla.net/${_pkgname}.git")
-md5sums=('SKIP')
-
+source=("${_pkgname}::git+https://gitlab.com/lv2/${_pkgname}.git"
+        'autowaf::git+https://gitlab.com/drobilla/autowaf.git')
+md5sums=('SKIP' 'SKIP')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -25,16 +25,24 @@ pkgver() {
   echo "$ver.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+
+  git submodule init
+  git config submodule.waflib.url "${srcdir}/autowaf"
+  git submodule update
+}
+
 build() {
   cd "${srcdir}/${_pkgname}"
 
-  python2 waf configure --prefix=/usr --configdir=/etc
-  python2 waf
+  python waf configure --prefix=/usr --configdir=/etc
+  python waf build $MAKEFLAGS
 }
 
 package() {
   cd "${srcdir}/${_pkgname}"
 
-  python2 waf install --destdir="${pkgdir}"
+  python waf install --destdir="${pkgdir}"
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${_svnname}/LICENSE"
 }