From d90cdb69612b94359a7b745e5338943395c2b593 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Sat, 30 Apr 2016 16:20:00 +0200
Subject: [PATCH] python-PyQt5: update to 5.6

Use alternatives for pyuic5 wrapper.
---
 .../patches/PyQt5_gpl-5.6-dbus_ftbfs.patch    | 11 ++++++++
 srcpkgs/python-PyQt5/template                 | 27 +++++++++++--------
 2 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/python-PyQt5/patches/PyQt5_gpl-5.6-dbus_ftbfs.patch

diff --git a/srcpkgs/python-PyQt5/patches/PyQt5_gpl-5.6-dbus_ftbfs.patch b/srcpkgs/python-PyQt5/patches/PyQt5_gpl-5.6-dbus_ftbfs.patch
new file mode 100644
index 00000000000..c13ca6cb882
--- /dev/null
+++ b/srcpkgs/python-PyQt5/patches/PyQt5_gpl-5.6-dbus_ftbfs.patch
@@ -0,0 +1,11 @@
+--- ./configure.py.dbus	2016-04-24 22:16:43.120281591 -0500
++++ ./configure.py	2016-04-25 10:16:52.465218805 -0500
+@@ -2141,7 +2141,7 @@ def check_dbus(target_config, verbose):
+     else:
+         dlist = target_config.dbus_inc_dirs
+ 
+-    target_config.dbus_inc_dirs = []
++    #target_config.dbus_inc_dirs = []
+ 
+     for d in dlist:
+         if os.access(os.path.join(d, 'dbus', 'dbus-python.h'), os.F_OK):
diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template
index db0786b5115..c1dd4374d7d 100644
--- a/srcpkgs/python-PyQt5/template
+++ b/srcpkgs/python-PyQt5/template
@@ -1,9 +1,9 @@
 # Template file for 'python-PyQt5'
 pkgname=python-PyQt5
-version=5.5.1
+version=5.6
 revision=1
 lib32disabled=yes
-wrksrc="PyQt-gpl-${version}"
+wrksrc="PyQt5_gpl-${version}"
 hostmakedepends="pkg-config"
 makedepends="
  python-devel python3.4-devel python-sip-devel python3.4-sip-devel
@@ -17,8 +17,9 @@ short_desc="Python2 bindings for the Qt5 toolkit"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="http://www.riverbankcomputing.co.uk/software/pyqt/intro"
 license="GPL-3"
-distfiles="${SOURCEFORGE_SITE}/pyqt/PyQt-gpl-${version}.tar.gz"
-checksum=0a70ef94fbffcf674b0dde024aae2a2a7a3f5a8c42806109ff7df2c941bd8386
+distfiles="${SOURCEFORGE_SITE}/pyqt/PyQt5_gpl-${version}.tar.gz"
+checksum=2e481a6c4c41b96ed3b33449e5f9599987c63a5c8db93313bd57a6acbf20f0e1
+alternatives="pyqt5:pyuic5:/usr/bin/pyuic5-2.7"
 
 _short_desc="${short_desc/Python2/Python3.4}"
 _pysitedir="usr/lib/python2.7/site-packages"
@@ -40,8 +41,8 @@ pre_build() {
 	mkdir -p pyqt5
 	mv * pyqt5 || true
 	cp -a pyqt5 pyqt5-3.4
-	rm -rf ${wrksrc}/pyqt5/pyuic/uic/port_v3
-	rm -rf ${wrksrc}/pyqt5-3.4/pyuic/uic/port_v2
+	rm -rf pyqt5/pyuic/uic/port_v3
+	rm -rf pyqt5-3.4/pyuic/uic/port_v2
 }
 do_build() {
 	# build python-pyqt5
@@ -57,13 +58,14 @@ do_install() {
 	make -C pyqt5 DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
 	make -C pyqt5-3.4 DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
 
-	cd ${wrksrc}/pyqt5
-	# install python3-pyuic5 wrapper
+	cd pyqt5
+	# create versioned pyuic5 wrapper
+	mv ${DESTDIR}/usr/bin/pyuic5{,-2.7}
 	sed -i 's,python2.7,python3.4,g' pyuic5
-	vbin pyuic5 python3-pyuic5
+	vbin pyuic5 pyuic5-3.4
 	# install doc
 	vmkdir usr/share/doc/${pkgname}
-	vcopy "doc/html examples" usr/share/doc/${pkgname}
+	vcopy doc/html usr/share/doc/${pkgname}
 }
 
 python-PyQt5-devel-tools_package() {
@@ -204,6 +206,7 @@ python-PyQt5-webengine_package() {
 	depends="${sourcepkg}-${version}_${revision}"
 	short_desc+=" - webengine module"
 	pkg_install() {
+		vmove ${_pysitedir}/PyQt5/QtWebEngineCore.so
 		vmove ${_pysitedir}/PyQt5/QtWebEngineWidgets.so
 	}
 }
@@ -246,8 +249,9 @@ python3.4-PyQt5_package() {
 	pycompile_version="3.4"
 	pycompile_module="PyQt5"
 	short_desc="${_short_desc}"
+	alternatives="pyqt5:pyuic5:/usr/bin/pyuic5-3.4"
 	pkg_install() {
-		vmove usr/bin/python3-pyuic5
+		vmove usr/bin/pyuic5-3.4
 		vmove usr/lib/python3.4
 	}
 }
@@ -369,6 +373,7 @@ python3.4-PyQt5-webengine_package() {
 	depends="python3.4-PyQt5-${version}_${revision}"
 	short_desc="${_short_desc} - webengine module"
 	pkg_install() {
+		vmove ${_py34sitedir}/PyQt5/QtWebEngineCore.so
 		vmove ${_py34sitedir}/PyQt5/QtWebEngineWidgets.so
 	}
 }