r2pipe moved to separate repo, fix Makefile script

1 files changed, 23 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b2460acdbef8..18d4b3230f7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,32 @@
-# updated by devnull [at] libcrack [dot] so
+# Maintainer: bartus @{aur \at bartus \dot  33mail \dot com}
 pkgname=('radare2-bindings-git' 'radare2-pipe-git')
 basename='radare2-bindings-git'
-pkgver=20151004.538.1f243fb
-pkgrel=1
+pkgver=2.4.1.r3.gfe8bd26
+pkgrel=2
 pkgdesc="Language bindings for radare2 (git version)"
 arch=('i686' 'x86_64')
 url="https://radare.org"
 license=('LGPL')
-depends=('radare2')
-makedepends=('git' 'valabind' 'radare2')
+depends=('radare2' 'python3' 'python2')
+makedepends=('git' 'valabind' 'swig')
+
+source=("${pkgname}::git://github.com/radare/radare2-bindings.git"
+        "radare2-pipe-git::git+https://github.com/radare/radare2-r2pipe.git"
+        "Makefile.patch")
+md5sums=('SKIP'
+         'SKIP'
+         'c79cfc6a5650e347e253f132762ef961')
 
-source=("$pkgname"::"git://github.com/radare/radare2-bindings.git")
-md5sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
-  _date=`date +"%Y%m%d"`
-  echo "$_date.$(git rev-list --count master).$(git rev-parse --short master)"
+  cd "$pkgname"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+  cd "${srcdir}/${basename}"
+  patch -Np1 -i ../Makefile.patch
+}
 
 build() {
   cd "${srcdir}/${basename}"
@@ -27,25 +35,24 @@ build() {
       --prefix="/usr" \
       --enable="python"
 
-  #PYTHON_CONFIG=python3-config make
+  export PYTHON_CONFIG=python3.2-config
   make
 
-  (cd r2pipe/python && python setup.py build)
+  #(cd r2pipe/python && python setup.py build)
 }
 
 package_radare2-pipe-git() {
   provides=('radare2-pipe')
 
-  cd "${srcdir}/${basename}"
-  (cd r2pipe/python && python setup.py install --root "${pkgdir}")
+  cd "${srcdir}/radare2-pipe-git/python"
+  python2 setup.py install --root "${pkgdir}"
 }
 
 package_radare2-bindings-git() {
   provides=('radare2-bindings')
-  conflicts=('radare2-bindings')
 
   cd "${srcdir}/${basename}"
-  #PYTHON_CONFIG=python3-config make DESTDIR="${pkgdir}" install
+  export PYTHON_CONFIG=python3.2-config
   make DESTDIR="${pkgdir}" install
 }
 # vim:set ts=2 sw=2 et: