From 4b91e95a6cbb3ac68097b38cb6804913ecbe29ed Mon Sep 17 00:00:00 2001
From: Steve Prybylski <sa.prybylx@gmail.com>
Date: Mon, 5 Oct 2015 14:32:18 -0400
Subject: [PATCH] python-dbus: fix arm python2.7 bindings

---
 srcpkgs/python-dbus/template | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template
index e761411e177..d55caafcb6d 100644
--- a/srcpkgs/python-dbus/template
+++ b/srcpkgs/python-dbus/template
@@ -1,7 +1,7 @@
 # Template file for 'python-dbus'
 pkgname=python-dbus
 version=1.2.0
-revision=6
+revision=7
 lib32disabled=yes
 wrksrc="dbus-python-${version}"
 build_style=gnu-configure
@@ -24,41 +24,45 @@ _do_pre_configure() {
 			pysufx="m"
 		fi
 
-		sed -i "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/python${pyver}${pysufx},g" ../configure
+		sed -i "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/python${pyver}${pysufx},g" configure
 	fi
 }
 
+pre_configure() {
+	mkdir -p python2
+	mv * python2 || true
+	cp -a python2 python3.4
+}
+
 do_configure() {
 	# python2
-	mkdir ${wrksrc}/build-python2
-	cd ${wrksrc}/build-python2
+	cd ${wrksrc}/python2
 	_do_pre_configure
-	env PYTHON=python ../configure ${configure_args}
+	env PYTHON=python ./configure ${configure_args}
 
 	# python3.4
-	mkdir ${wrksrc}/build-python3.4
-	cd ${wrksrc}/build-python3.4
+	cd ${wrksrc}/python3.4
 	_do_pre_configure 3.4
-	env PYTHON=python3.4 ../configure ${configure_args}
+	env PYTHON=python3.4 ./configure ${configure_args}
 }
 
 do_build() {
 	# python2
-	cd ${wrksrc}/build-python2
+	cd ${wrksrc}/python2
 	make ${makejobs}
 
 	# python3.4
-	cd ${wrksrc}/build-python3.4
+	cd ${wrksrc}/python3.4
 	make ${makejobs}
 }
 
 do_install() {
 	# python2
-	cd ${wrksrc}/build-python2
+	cd ${wrksrc}/python2
 	make DESTDIR=${DESTDIR} install
 
 	# python3.4
-	cd ${wrksrc}/build-python3.4
+	cd ${wrksrc}/python3.4
 	make DESTDIR=${DESTDIR} install
 }