From b921fd9aaa6e8e674d47e783f436a70b09c47dee Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 6 Aug 2020 10:24:55 +0200
Subject: [PATCH] python3-PyQt5-webengine: update to 5.15.0

While we're at it, ship dist-info for python 2 version, which is kept at
5.13.2, which is last version supports Python 2

[skip ci]
---
 srcpkgs/python-PyQt5-webengine/template  | 59 +++++++-----------------
 srcpkgs/python3-PyQt5-webengine          |  1 -
 srcpkgs/python3-PyQt5-webengine/template | 42 +++++++++++++++++
 srcpkgs/python3-PyQt5-webengine/update   |  1 +
 4 files changed, 59 insertions(+), 44 deletions(-)
 delete mode 120000 srcpkgs/python3-PyQt5-webengine
 create mode 100644 srcpkgs/python3-PyQt5-webengine/template
 create mode 100644 srcpkgs/python3-PyQt5-webengine/update

diff --git a/srcpkgs/python-PyQt5-webengine/template b/srcpkgs/python-PyQt5-webengine/template
index a60800b52d..a5c163b608 100644
--- a/srcpkgs/python-PyQt5-webengine/template
+++ b/srcpkgs/python-PyQt5-webengine/template
@@ -1,14 +1,14 @@
 # Template file for 'python-PyQt5-webengine'
 pkgname=python-PyQt5-webengine
 version=5.13.2
-revision=5
+revision=6
 wrksrc="PyQtWebEngine-${version}"
-hostmakedepends="pkg-config qt5-qmake python python-PyQt5 python3-PyQt5"
+hostmakedepends="pkg-config qt5-qmake python python-PyQt5"
 makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
- qt5-webengine-devel python-devel python3-devel python-PyQt5-devel"
+ qt5-webengine-devel python-devel python-PyQt5-devel"
 depends="python-PyQt5>=${version}_1 python-PyQt5-webchannel>=${version}_1"
 short_desc="Python2 bindings for the Qt5 toolkit - webengine module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
 distfiles="https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${version}/PyQtWebEngine-${version}.tar.gz"
@@ -22,50 +22,23 @@ case "$XBPS_TARGET_MACHINE" in
 	arm*) broken="depends on qt5-webengine";;
 esac
 
-pre_build() {
-	mkdir -p pyqt5-${py2_ver}
-	mv * pyqt5-${py2_ver} || true
-	cp -a pyqt5-${py2_ver} pyqt5-${py3_ver}
-	rm -rf pyqt5-${py2_ver}/pyuic/uic/port_v3
-	rm -rf pyqt5-${py3_ver}/pyuic/uic/port_v2
+post_extract() {
+	rm -rf pyuic/uic/port_v3
+}
+
+do_configure() {
+	python2 configure.py \
+		QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" \
+		QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
+		QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}"
+		QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
 }
 
 do_build() {
-	for pyver in $py2_ver $py3_ver; do
-		cd $wrksrc/pyqt5-$pyver
-
-		python${pyver} configure.py --no-dist-info \
-			QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" \
-			QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
-			QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}"
-			QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
-
-		make ${makejobs}
-	done
+	make ${makejobs}
 }
 
 do_install() {
-	# install python-pyqt5
-	make -C pyqt5-${py2_ver} DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
-
-	# install python3-pyqt5
-	make -C pyqt5-${py3_ver} DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
-
-	# remove unneeded shared files
+	make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
 	rm -rf ${DESTDIR}/usr/share
 }
-
-python3-PyQt5-webengine_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5>=${version}_1
-	 python3-PyQt5-webchannel>=${version}_1"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtWebEngine.pyi
-		vmove ${py3_sitelib}/PyQt5/QtWebEngine.so
-		vmove ${py3_sitelib}/PyQt5/QtWebEngineCore.pyi
-		vmove ${py3_sitelib}/PyQt5/QtWebEngineCore.so
-		vmove ${py3_sitelib}/PyQt5/QtWebEngineWidgets.pyi
-		vmove ${py3_sitelib}/PyQt5/QtWebEngineWidgets.so
-	}
-}
diff --git a/srcpkgs/python3-PyQt5-webengine b/srcpkgs/python3-PyQt5-webengine
deleted file mode 120000
index 0cd8ebf622..0000000000
--- a/srcpkgs/python3-PyQt5-webengine
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5-webengine
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
new file mode 100644
index 0000000000..cd9c0c9ac7
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -0,0 +1,42 @@
+# Template file for 'python3-PyQt5-webengine'
+pkgname=python3-PyQt5-webengine
+version=5.15.0
+revision=1
+wrksrc="PyQtWebEngine-${version}"
+hostmakedepends="pkg-config qt5-qmake python3-PyQt5 sip5"
+makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
+ qt5-webengine-devel python3-devel python3-PyQt5-devel"
+depends="python3-PyQt5>=${version}_1 python3-PyQt5-webchannel>=${version}_1"
+short_desc="Python 3 bindings for the Qt5 toolkit - webengine module"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
+distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz"
+checksum=670812688e40bf75f70ddf01eadd897d231300318d3856b275bf8e7e0085bf75
+lib32disabled=yes
+nocross="configure script is broken for cross builds"
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc64le*) ;;
+	ppc*) broken="no webengine for big endian ppc";;
+	arm*) broken="depends on qt5-webengine";;
+esac
+
+pre_build() {
+	rm -rf pyuic/uic/port_v2
+}
+
+do_build() {
+	python3 configure.py \
+		QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" \
+		QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
+		QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}"
+		QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
+
+	make ${makejobs}
+}
+
+do_install() {
+	make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
+	rm -rf ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/python3-PyQt5-webengine/update b/srcpkgs/python3-PyQt5-webengine/update
new file mode 100644
index 0000000000..07d64e6f49
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-webengine/update
@@ -0,0 +1 @@
+pkgname="PyQtWebEngine"