From 651115b5407eeaca37e3ee8700d075a5a9983228 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Sat, 27 Dec 2014 19:54:04 +0100
Subject: [PATCH] python-PyQt4: split dbus into -dbus subpkgs

---
 srcpkgs/python-PyQt4-dbus     |  1 +
 srcpkgs/python-PyQt4/template | 68 ++++++++++++++++++-----------------
 srcpkgs/python3.4-PyQt4-dbus  |  1 +
 3 files changed, 37 insertions(+), 33 deletions(-)
 create mode 120000 srcpkgs/python-PyQt4-dbus
 create mode 120000 srcpkgs/python3.4-PyQt4-dbus

diff --git a/srcpkgs/python-PyQt4-dbus b/srcpkgs/python-PyQt4-dbus
new file mode 120000
index 00000000000..fe02248deea
--- /dev/null
+++ b/srcpkgs/python-PyQt4-dbus
@@ -0,0 +1 @@
+python-PyQt4
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt4/template b/srcpkgs/python-PyQt4/template
index 6c95c99968e..43905dbdc58 100644
--- a/srcpkgs/python-PyQt4/template
+++ b/srcpkgs/python-PyQt4/template
@@ -1,12 +1,12 @@
 # Template file for 'python-PyQt4'
 pkgname=python-PyQt4
 version=4.11.3
-revision=1
+revision=2
 wrksrc="PyQt-x11-gpl-${version}"
-hostmakedepends="pkg-config python-devel python3.4-devel"
-makedepends="${hostmakedepends} python-sip-devel python3.4-sip-devel
- qt-qmake qt-devel dbus-devel python-dbus-devel MesaLib-devel phonon-devel"
-depends="python-sip python-dbus"
+hostmakedepends="pkg-config"
+makedepends="python-devel python3.4-devel python-sip-devel python3.4-sip-devel
+ qt-devel dbus-devel python-dbus-devel MesaLib-devel phonon-devel"
+depends="python-sip"
 replaces="python-PyQt4<4.11.1_2"
 short_desc="Python2 bindings for the Qt4 toolkit"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -17,70 +17,60 @@ distfiles="${SOURCEFORGE_SITE}/pyqt/PyQt-x11-gpl-${version}.tar.gz"
 checksum=853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686
 
 _do_pyqt4_build() {
-	local pyver=${1:-2.7} pysufx= tools=
+	local pyver=${1:-2.7} tools=
 
 	if [ "$pyver" != "2.7" ]; then
-		pysufx="m"
 		tools="--no-tools"
 	fi
 
 	python${pyver} configure-ng.py --confirm-license --assume-shared $tools \
 		CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
-		LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
-		INCDIR="${XBPS_CROSS_BASE}/usr/include/python${pyver}${pysufx}"
+		LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP=""
 	make ${makejobs}
 }
-
-post_extract() {
-	cp -a ${wrksrc} /tmp/python3.4-PyQt4-build
-	mv /tmp/python3.4-PyQt4-build ${wrksrc}
-}
-
 pre_build() {
-	rm -rf pyuic/uic/port_v3
-	cd ${wrksrc}/python3.4-PyQt4-build
-	rm -rf pyuic/uic/port_v2
+	mkdir -p pyqt4
+	mv * pyqt4 || true
+	cp -a pyqt4 pyqt4-3.4
+	rm -rf ${wrksrc}/pyqt4/pyuic/uic/port_v3
+	rm -rf ${wrksrc}/pyqt4-3.4/pyuic/uic/port_v2
 }
-
 do_build() {
 	# build python-pyqt4
-	cd ${wrksrc}
+	cd ${wrksrc}/pyqt4
 	_do_pyqt4_build
 
 	# build python3.4-pyqt4
-	cd ${wrksrc}/python3.4-PyQt4-build
+	cd ${wrksrc}/pyqt4-3.4
 	_do_pyqt4_build 3.4
 }
-
 do_install() {
 	# install python-pyqt4
-	make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
+	make -C pyqt4 DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
 
 	# install python3.4-pyqt4
-	cd ${wrksrc}/python3.4-PyQt4-build
-	make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
+	make -C pyqt4-3.4 DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
 
 	# install doc
+	cd ${wrksrc}/pyqt4
 	vmkdir usr/share/doc/${pkgname}
 	vcopy "doc/html examples" usr/share/doc/${pkgname}
 }
-
 post_install() {
 	# install python3-pyuic4 wrapper
+	cd ${wrksrc}/pyqt4
 	sed -i 's,python2.7,python3.4,g' pyuic4
 	vbin pyuic4 python3-pyuic4
 }
 
 python-PyQt4-devel-tools_package() {
 	replaces="python-PyQt4<4.11.1_2"
-	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development tools"
 	pkg_install() {
 		vmove usr/bin/pylupdate4
 		vmove usr/bin/pyrcc4
 	}
 }
-
 python-PyQt4-devel_package() {
 	replaces="python-PyQt4<4.11.1_2"
 	depends="python-sip-devel python3.4-sip-devel
@@ -90,7 +80,14 @@ python-PyQt4-devel_package() {
 		vmove usr/share/sip
 	}
 }
-
+python-PyQt4-dbus_package() {
+	replaces="python-PyQt4<4.11.3_1"
+	depends="${sourcepkg}>=${version}_${revision} python-dbus"
+	short_desc+=" - D-Bus support for PyQt4"
+	pkg_install() {
+		vmove usr/lib/python2.7/site-packages/dbus/mainloop/qt.so
+	}
+}
 python-PyQt4-phonon_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - Python2 bindings for Phonon"
@@ -98,7 +95,6 @@ python-PyQt4-phonon_package() {
 		vmove usr/lib/python2.7/site-packages/PyQt4/phonon.so
 	}
 }
-
 python-PyQt4-doc_package() {
 	noarch=yes
 	replaces="python-PyQt4<4.11.1_2"
@@ -107,17 +103,23 @@ python-PyQt4-doc_package() {
 		vmove usr/share/doc
 	}
 }
-
 python3.4-PyQt4_package() {
 	replaces="python3.4-PyQt4<4.11.1_2"
-	depends="python3.4-sip python3.4-dbus"
+	depends="python3.4-sip"
 	short_desc="${short_desc/Python2/Python3.4}"
 	pkg_install() {
 		vmove usr/bin/python3-pyuic4
 		vmove usr/lib/python3.4
 	}
 }
-
+python3.4-PyQt4-dbus_package() {
+	replaces="python3.4-PyQt4<4.11.3_1"
+	depends="python3.4-PyQt4>=${version}_${revision} python3.4-dbus"
+	short_desc+=" - D-Bus support for PyQt4 with Python3.4"
+	pkg_install() {
+		vmove usr/lib/python3.4/site-packages/dbus/mainloop/qt.so
+	}
+}
 python3.4-PyQt4-phonon_package() {
 	depends="python3.4-PyQt4>=${version}_${revision}"
 	short_desc+=" - Python3.4 bindings for Phonon"
diff --git a/srcpkgs/python3.4-PyQt4-dbus b/srcpkgs/python3.4-PyQt4-dbus
new file mode 120000
index 00000000000..fe02248deea
--- /dev/null
+++ b/srcpkgs/python3.4-PyQt4-dbus
@@ -0,0 +1 @@
+python-PyQt4
\ No newline at end of file