diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template
index 11529aa172a..29018572a34 100644
--- a/srcpkgs/python-PyQt5/template
+++ b/srcpkgs/python-PyQt5/template
@@ -1,11 +1,11 @@
 # Template file for 'python-PyQt5'
 pkgname=python-PyQt5
 version=5.13.2
-revision=3
+revision=2
 _sipver=4.19.19
 wrksrc="PyQt5-${version}"
 hostmakedepends="pkg-config
- python-devel python-sip-devel python-dbus-devel qt5
+ python-devel python3-devel python-sip-devel python3-sip-devel python-dbus-devel qt5
  qt5-devel qt5-tools-devel qt5-connectivity-devel qt5-declarative-devel qt5-location-devel
  qt5-multimedia-devel qt5-qmake qt5-sensors-devel qt5-serialport-devel
  qt5-svg-devel qt5-webchannel-devel qt5-webkit-devel qt5-websockets-devel
@@ -13,29 +13,36 @@ hostmakedepends="pkg-config
  python-enum34"
 makedepends="${hostmakedepends/pkg-config/}"
 depends="python-sip-PyQt5>=${_sipver} python-enum34"
-short_desc="Python 2 bindings for the Qt5 toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Python2 bindings for the Qt5 toolkit"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://riverbankcomputing.com/software/pyqt/intro"
 distfiles="https://www.riverbankcomputing.com/static/Downloads/PyQt5/${version}/PyQt5-${version}.tar.gz"
 checksum=adc17c077bf233987b8e43ada87d1e0deca9bd71a13e5fd5fc377482ed69c827
 lib32disabled=yes
 
-post_extract() {
-	rm -rf pyuic/uic/port_v3
+pre_build() {
+	mkdir -p pyqt5-${py2_ver}
+	mv * pyqt5-${py2_ver} 2>/dev/null || 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
 }
+do_build() {
+	local _sysroot= _configuration= py_abiver= qt_version
+	for pyver in $py2_ver $py3_ver; do
+		if [ "$pyver" = "$py3_ver" ]; then
+			py_abiver="$py3_abiver"
+		fi
 
-do_configure() {
-	local _sysroot= _configuration= qt_version
-	if [ "$CROSS_BUILD" ]; then
-		qt_version=$(qmake -query QT_VERSION)
-		_sysroot="--sysroot $XBPS_CROSS_BASE"
-		_configuration="--configuration $wrksrc/pyqt5_${XBPS_CROSS_TRIPLET}.cfg"
-		cat >pyqt5_${XBPS_CROSS_TRIPLET}.cfg <<EOF
+		cd $wrksrc/pyqt5-$pyver
+		if [ "$CROSS_BUILD" ]; then
+			qt_version=$(qmake -query QT_VERSION)
+cat > pyqt5_${XBPS_CROSS_TRIPLET}.cfg <<EOF
 py_platform = linux
-py_inc_dir = %(sysroot)/usr/include/python%(py_major).%(py_minor)
-py_pyshlib = python%(py_major).%(py_minor).so
-pyqt_disabled_features = PyQt_Desktop_OpenGL
+py_inc_dir = %(sysroot)/usr/include/python%(py_major).%(py_minor)${py_abiver}
+py_pyshlib = python%(py_major).%(py_minor)${py_abiver}.so
+pyqt_disabled_features = PyQt_Desktop_OpenGL PyQt_qreal_double
 
 qt_shared = True
 
@@ -48,33 +55,37 @@ pyqt_modules = QtCore QtGui QtHelp QtMultimedia
  QtX11Extras QtBluetooth QtPositioning QtQuickWidgets QtWebSockets
  QtWebChannel QtLocation QtNfc QtNetworkAuth
 EOF
-	fi
 
-	python2 configure.py --confirm-license --assume-shared \
-		$_sysroot $_configuration \
-		QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" \
-		QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
-		QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \
-		QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
+			_sysroot="--sysroot $XBPS_CROSS_BASE"
+			_configuration="--configuration $wrksrc/pyqt5-$pyver/pyqt5_${XBPS_CROSS_TRIPLET}.cfg"
+		fi
 
-	if [ "$CROSS_BUILD" ]; then
-		# Fix location of libraries
-		find . -name Makefile |
-		xargs sed -i -E "s|(/usr/lib/libQt5[^ ]+so)|${XBPS_CROSS_BASE}\1|g"
-	fi
+		python${pyver} configure.py --confirm-license --assume-shared --no-dist-info $_sysroot $_configuration \
+			QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
+			QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
+
+		if [ "$CROSS_BUILD" ]; then
+			# Fix location of libraries
+			find . -name Makefile | xargs sed -i -E "s|(/usr/lib/libQt5[^ ]+so)|${XBPS_CROSS_BASE}\1|g"
+		fi
+
+		make ${makejobs}
+	done
 }
-
-do_build() {
-	make ${makejobs}
-}
-
 do_install() {
 	# install python-pyqt5
-	make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
+	make -C pyqt5-${py2_ver} DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
 	for f in pylupdate5 pyrcc5 pyuic5; do
 		sed -i 's,/usr/bin/python2.7,/usr/bin/python2,' ${DESTDIR}/usr/bin/${f}
 		mv ${DESTDIR}/usr/bin/{,python2-}${f}
 	done
+
+	# install python3-pyqt5
+	make -C pyqt5-${py3_ver} DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
+	for f in pylupdate5 pyrcc5 pyuic5; do
+		sed -i 's,/usr/bin/python3[.0-9]*,/usr/bin/python3,' ${DESTDIR}/usr/bin/${f}
+		mv ${DESTDIR}/usr/bin/{,python3-}${f}
+	done
 }
 
 python-PyQt5-devel-tools_package() {
@@ -93,10 +104,26 @@ python-PyQt5-devel-tools_package() {
 		vmove ${py2_sitelib}/PyQt5/pyrcc_main.py
 	}
 }
+python3-PyQt5-devel-tools_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - development tools"
+	alternatives="
+	 pyqt5:pylupdate5:/usr/bin/python3-pylupdate5
+	 pyqt5:pyrcc5:/usr/bin/python3-pyrcc5
+	 pyqt5:pyuic5:/usr/bin/python3-pyuic5"
+	pkg_install() {
+		vmove usr/bin/python3-*
+		vmove ${py3_sitelib}/PyQt5/pylupdate.so
+		vmove ${py3_sitelib}/PyQt5/pylupdate_main.py
+		vmove ${py3_sitelib}/PyQt5/pyrcc.so
+		vmove ${py3_sitelib}/PyQt5/pyrcc_main.py
+	}
+}
 python-PyQt5-devel_package() {
-	depends="python-sip-devel python-PyQt5-${version}_${revision}"
+	depends="python-sip-devel python3-sip-devel
+	 python-PyQt5-${version}_${revision} python3-PyQt5-${version}_${revision}"
 	short_desc+=" - development files"
-	conflicts="python3-PyQt5-devel>=0"
 	pkg_install() {
 		vmove usr/share/sip
 	}
@@ -248,3 +275,182 @@ python-PyQt5-xmlpatterns_package() {
 		vmove ${py2_sitelib}/PyQt5/QtXmlPatterns.so
 	}
 }
+python3-PyQt5_package() {
+	lib32disabled=yes
+	depends="python3-sip-PyQt5>=${_sipver}"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove ${py3_sitelib}
+	}
+}
+python3-PyQt5-dbus_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision} python3-dbus"
+	short_desc="${short_desc/Python2/Python3} - dbus support"
+	pkg_install() {
+		vmove ${py3_sitelib}/dbus/mainloop/pyqt5.so
+	}
+}
+python3-PyQt5-connectivity_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - connectivity module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtBluetooth.pyi
+		vmove ${py3_sitelib}/PyQt5/QtBluetooth.so
+		vmove ${py3_sitelib}/PyQt5/QtNfc.pyi
+		vmove ${py3_sitelib}/PyQt5/QtNfc.so
+	}
+}
+python3-PyQt5-multimedia_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - multimedia module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtMultimedia.pyi
+		vmove ${py3_sitelib}/PyQt5/QtMultimedia.so
+		vmove ${py3_sitelib}/PyQt5/QtMultimediaWidgets.pyi
+		vmove ${py3_sitelib}/PyQt5/QtMultimediaWidgets.so
+	}
+}
+python3-PyQt5-networkauth_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - networkauth module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtNetworkAuth.pyi
+		vmove ${py3_sitelib}/PyQt5/QtNetworkAuth.so
+	}
+}
+python3-PyQt5-opengl_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - opengl module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtOpenGL.pyi
+		vmove ${py3_sitelib}/PyQt5/QtOpenGL.so
+		if [ -z "$CROSS_BUILD" ]; then
+			vmove ${py3_sitelib}/PyQt5/_QOpenGLFunctions_*.so
+		fi
+	}
+}
+python3-PyQt5-location_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - location module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtLocation.pyi
+		vmove ${py3_sitelib}/PyQt5/QtLocation.so
+		vmove ${py3_sitelib}/PyQt5/QtPositioning.pyi
+		vmove ${py3_sitelib}/PyQt5/QtPositioning.so
+	}
+}
+python3-PyQt5-quick_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - quick module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtQml.pyi
+		vmove ${py3_sitelib}/PyQt5/QtQml.so
+		vmove ${py3_sitelib}/PyQt5/QtQuick.pyi
+		vmove ${py3_sitelib}/PyQt5/QtQuick.so
+		vmove ${py3_sitelib}/PyQt5/QtQuickWidgets.pyi
+		vmove ${py3_sitelib}/PyQt5/QtQuickWidgets.so
+		vmove usr/lib/qt5/plugins/PyQt5/libpyqt5qmlplugin.so
+	}
+}
+python3-PyQt5-sensors_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - sensors module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtSensors.pyi
+		vmove ${py3_sitelib}/PyQt5/QtSensors.so
+	}
+}
+python3-PyQt5-serialport_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - serialport module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtSerialPort.pyi
+		vmove ${py3_sitelib}/PyQt5/QtSerialPort.so
+	}
+}
+python3-PyQt5-sql_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - sql module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtSql.pyi
+		vmove ${py3_sitelib}/PyQt5/QtSql.so
+	}
+}
+python3-PyQt5-svg_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - svg module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtSvg.pyi
+		vmove ${py3_sitelib}/PyQt5/QtSvg.so
+	}
+}
+python3-PyQt5-tools_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - designer, help modules"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtHelp.pyi
+		vmove ${py3_sitelib}/PyQt5/QtHelp.so
+		vmove ${py3_sitelib}/PyQt5/QtDesigner.pyi
+		vmove ${py3_sitelib}/PyQt5/QtDesigner.so
+		vmove usr/lib/qt5/plugins/designer/libpyqt5.so
+	}
+}
+python3-PyQt5-webchannel_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - webchannel module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtWebChannel.pyi
+		vmove ${py3_sitelib}/PyQt5/QtWebChannel.so
+	}
+}
+python3-PyQt5-webkit_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - webkit module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtWebKit.pyi
+		vmove ${py3_sitelib}/PyQt5/QtWebKit.so
+		vmove ${py3_sitelib}/PyQt5/QtWebKitWidgets.pyi
+		vmove ${py3_sitelib}/PyQt5/QtWebKitWidgets.so
+	}
+}
+python3-PyQt5-websockets_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - websockets module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtWebSockets.pyi
+		vmove ${py3_sitelib}/PyQt5/QtWebSockets.so
+	}
+}
+python3-PyQt5-x11extras_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - x11extras module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtX11Extras.pyi
+		vmove ${py3_sitelib}/PyQt5/QtX11Extras.so
+	}
+}
+python3-PyQt5-xmlpatterns_package() {
+	lib32disabled=yes
+	depends="python3-PyQt5-${version}_${revision}"
+	short_desc="${short_desc/Python2/Python3} - xmlpatterns module"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/QtXmlPatterns.pyi
+		vmove ${py3_sitelib}/PyQt5/QtXmlPatterns.so
+	}
+}
diff --git a/srcpkgs/python3-PyQt5 b/srcpkgs/python3-PyQt5
new file mode 120000
index 00000000000..7e24798936c
--- /dev/null
+++ b/srcpkgs/python3-PyQt5
@@ -0,0 +1 @@
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-connectivity b/srcpkgs/python3-PyQt5-connectivity
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-connectivity
+++ b/srcpkgs/python3-PyQt5-connectivity
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-dbus b/srcpkgs/python3-PyQt5-dbus
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-dbus
+++ b/srcpkgs/python3-PyQt5-dbus
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-devel b/srcpkgs/python3-PyQt5-devel
deleted file mode 120000
index 75ad8e779a9..00000000000
--- a/srcpkgs/python3-PyQt5-devel
+++ /dev/null
@@ -1 +0,0 @@
-python3-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-devel-tools b/srcpkgs/python3-PyQt5-devel-tools
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-devel-tools
+++ b/srcpkgs/python3-PyQt5-devel-tools
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-location b/srcpkgs/python3-PyQt5-location
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-location
+++ b/srcpkgs/python3-PyQt5-location
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-multimedia b/srcpkgs/python3-PyQt5-multimedia
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-multimedia
+++ b/srcpkgs/python3-PyQt5-multimedia
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-networkauth b/srcpkgs/python3-PyQt5-networkauth
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-networkauth
+++ b/srcpkgs/python3-PyQt5-networkauth
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-opengl b/srcpkgs/python3-PyQt5-opengl
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-opengl
+++ b/srcpkgs/python3-PyQt5-opengl
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-quick b/srcpkgs/python3-PyQt5-quick
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-quick
+++ b/srcpkgs/python3-PyQt5-quick
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-sensors b/srcpkgs/python3-PyQt5-sensors
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-sensors
+++ b/srcpkgs/python3-PyQt5-sensors
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-serialport b/srcpkgs/python3-PyQt5-serialport
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-serialport
+++ b/srcpkgs/python3-PyQt5-serialport
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-sql b/srcpkgs/python3-PyQt5-sql
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-sql
+++ b/srcpkgs/python3-PyQt5-sql
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-svg b/srcpkgs/python3-PyQt5-svg
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-svg
+++ b/srcpkgs/python3-PyQt5-svg
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-tools b/srcpkgs/python3-PyQt5-tools
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-tools
+++ b/srcpkgs/python3-PyQt5-tools
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-webchannel b/srcpkgs/python3-PyQt5-webchannel
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-webchannel
+++ b/srcpkgs/python3-PyQt5-webchannel
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-webkit b/srcpkgs/python3-PyQt5-webkit
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-webkit
+++ b/srcpkgs/python3-PyQt5-webkit
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-websockets b/srcpkgs/python3-PyQt5-websockets
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-websockets
+++ b/srcpkgs/python3-PyQt5-websockets
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-x11extras b/srcpkgs/python3-PyQt5-x11extras
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-x11extras
+++ b/srcpkgs/python3-PyQt5-x11extras
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-xmlpatterns b/srcpkgs/python3-PyQt5-xmlpatterns
index 75ad8e779a9..7e24798936c 120000
--- a/srcpkgs/python3-PyQt5-xmlpatterns
+++ b/srcpkgs/python3-PyQt5-xmlpatterns
@@ -1 +1 @@
-python3-PyQt5
\ No newline at end of file
+python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
deleted file mode 100644
index 25809d48dab..00000000000
--- a/srcpkgs/python3-PyQt5/template
+++ /dev/null
@@ -1,273 +0,0 @@
-# Template file for 'python3-PyQt5'
-pkgname=python3-PyQt5
-version=5.15.0
-revision=1
-_sipver=4.19.23
-wrksrc="PyQt5-${version}"
-hostmakedepends="pkg-config
- python3-devel sip5 python-dbus-devel qt5 qt5-devel qt5-tools-devel
- qt5-connectivity-devel qt5-declarative-devel qt5-location-devel
- qt5-multimedia-devel qt5-qmake qt5-sensors-devel qt5-serialport-devel
- qt5-svg-devel qt5-webchannel-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel qt5-xmlpatterns-devel qt5-networkauth-devel pulseaudio-devel"
-makedepends="${hostmakedepends/pkg-config/}"
-depends="python3-sip-PyQt5>=${_sipver}"
-short_desc="Python 3 bindings for the Qt5 toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-only"
-homepage="https://riverbankcomputing.com/software/pyqt/intro"
-distfiles="${PYPI_SITE}/P/PyQt5/PyQt5-${version}.tar.gz"
-checksum=c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9
-lib32disabled=yes
-
-post_extract() {
-	rm -rf pyuic/uic/port_v2
-}
-
-do_configure() {
-	local _sysroot= _configuration= qt_version
-	if [ "$CROSS_BUILD" ]; then
-		qt_version=$(qmake -query QT_VERSION)
-		_sysroot="--sysroot $XBPS_CROSS_BASE"
-		_configuration="--configuration $wrksrc/pyqt5_${XBPS_CROSS_TRIPLET}.cfg"
-		cat >pyqt5_${XBPS_CROSS_TRIPLET}.cfg <<EOF
-py_platform = linux
-py_inc_dir = %(sysroot)/usr/include/python%(py_major).%(py_minor)${py3_abiver}
-py_pyshlib = python%(py_major).%(py_minor)${py3_abiver}.so
-pyqt_disabled_features = PyQt_Desktop_OpenGL
-
-qt_shared = True
-
-[Qt ${qt_version}]
-# _QOpenGLFunctions_ES2 doesn't work
-pyqt_modules = QtCore QtGui QtHelp QtMultimedia
- QtMultimediaWidgets QtNetwork QtOpenGL QtPrintSupport QtQml QtQuick
- QtSql QtSvg QtTest QtWebKit QtWebKitWidgets QtWidgets QtXml
- QtXmlPatterns QtDesigner QtDBus QtSensors QtSerialPort
- QtX11Extras QtBluetooth QtPositioning QtQuickWidgets QtWebSockets
- QtWebChannel QtLocation QtNfc QtNetworkAuth
-EOF
-
-	fi
-
-	python3 configure.py --confirm-license --assume-shared \
-		$_sysroot $_configuration \
-		QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" \
-		QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
-		QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \
-		QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
-
-	if [ "$CROSS_BUILD" ]; then
-		# Fix location of libraries
-		find . -name Makefile |
-		xargs sed -i -E "s|(/usr/lib/libQt5[^ ]+so)|${XBPS_CROSS_BASE}\1|g"
-	fi
-}
-
-do_build() {
-	make ${makejobs}
-}
-
-do_install() {
-	make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
-	for f in pylupdate5 pyrcc5 pyuic5; do
-		sed -i '1s,python3[.0-9]*,python3,' ${DESTDIR}/usr/bin/${f}
-		mv ${DESTDIR}/usr/bin/{,python3-}${f}
-	done
-}
-
-python3-PyQt5-devel-tools_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc+=" - development tools"
-	alternatives="
-	 pyqt5:pylupdate5:/usr/bin/python3-pylupdate5
-	 pyqt5:pyrcc5:/usr/bin/python3-pyrcc5
-	 pyqt5:pyuic5:/usr/bin/python3-pyuic5"
-	pkg_install() {
-		vmove usr/bin/python3-*
-		vmove ${py3_sitelib}/PyQt5/pylupdate.so
-		vmove ${py3_sitelib}/PyQt5/pylupdate_main.py
-		vmove ${py3_sitelib}/PyQt5/pyrcc.so
-		vmove ${py3_sitelib}/PyQt5/pyrcc_main.py
-	}
-}
-python3-PyQt5-devel_package() {
-	depends="sip5 python3-PyQt5-${version}_${revision}"
-	short_desc+=" - development files"
-	conflicts="python-PyQt5-devel>=0"
-	pkg_install() {
-		vmove usr/share/sip
-	}
-}
-python3-PyQt5-dbus_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision} python3-dbus"
-	short_desc="${short_desc} - dbus support"
-	pkg_install() {
-		vmove ${py3_sitelib}/dbus/mainloop/pyqt5.so
-	}
-}
-python3-PyQt5-connectivity_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - connectivity module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtBluetooth.pyi
-		vmove ${py3_sitelib}/PyQt5/QtBluetooth.so
-		vmove ${py3_sitelib}/PyQt5/QtNfc.pyi
-		vmove ${py3_sitelib}/PyQt5/QtNfc.so
-	}
-}
-python3-PyQt5-multimedia_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - multimedia module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtMultimedia.pyi
-		vmove ${py3_sitelib}/PyQt5/QtMultimedia.so
-		vmove ${py3_sitelib}/PyQt5/QtMultimediaWidgets.pyi
-		vmove ${py3_sitelib}/PyQt5/QtMultimediaWidgets.so
-	}
-}
-python3-PyQt5-networkauth_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - networkauth module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtNetworkAuth.pyi
-		vmove ${py3_sitelib}/PyQt5/QtNetworkAuth.so
-	}
-}
-python3-PyQt5-opengl_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - opengl module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtOpenGL.pyi
-		vmove ${py3_sitelib}/PyQt5/QtOpenGL.so
-		if [ -z "$CROSS_BUILD" ]; then
-			vmove ${py3_sitelib}/PyQt5/_QOpenGLFunctions_*.so
-		fi
-	}
-}
-python3-PyQt5-location_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - location module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtLocation.pyi
-		vmove ${py3_sitelib}/PyQt5/QtLocation.so
-		vmove ${py3_sitelib}/PyQt5/QtPositioning.pyi
-		vmove ${py3_sitelib}/PyQt5/QtPositioning.so
-	}
-}
-python3-PyQt5-quick_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - quick module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtQml.pyi
-		vmove ${py3_sitelib}/PyQt5/QtQml.so
-		vmove ${py3_sitelib}/PyQt5/QtQuick.pyi
-		vmove ${py3_sitelib}/PyQt5/QtQuick.so
-		vmove ${py3_sitelib}/PyQt5/QtQuickWidgets.pyi
-		vmove ${py3_sitelib}/PyQt5/QtQuickWidgets.so
-		vmove usr/lib/qt5/plugins/PyQt5/libpyqt5qmlplugin.so
-	}
-}
-python3-PyQt5-sensors_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - sensors module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtSensors.pyi
-		vmove ${py3_sitelib}/PyQt5/QtSensors.so
-	}
-}
-python3-PyQt5-serialport_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - serialport module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtSerialPort.pyi
-		vmove ${py3_sitelib}/PyQt5/QtSerialPort.so
-	}
-}
-python3-PyQt5-sql_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - sql module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtSql.pyi
-		vmove ${py3_sitelib}/PyQt5/QtSql.so
-	}
-}
-python3-PyQt5-svg_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - svg module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtSvg.pyi
-		vmove ${py3_sitelib}/PyQt5/QtSvg.so
-	}
-}
-python3-PyQt5-tools_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - designer, help modules"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtHelp.pyi
-		vmove ${py3_sitelib}/PyQt5/QtHelp.so
-		vmove ${py3_sitelib}/PyQt5/QtDesigner.pyi
-		vmove ${py3_sitelib}/PyQt5/QtDesigner.so
-		vmove usr/lib/qt5/plugins/designer/libpyqt5.so
-	}
-}
-python3-PyQt5-webchannel_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - webchannel module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtWebChannel.pyi
-		vmove ${py3_sitelib}/PyQt5/QtWebChannel.so
-	}
-}
-python3-PyQt5-webkit_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - webkit module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtWebKit.pyi
-		vmove ${py3_sitelib}/PyQt5/QtWebKit.so
-		vmove ${py3_sitelib}/PyQt5/QtWebKitWidgets.pyi
-		vmove ${py3_sitelib}/PyQt5/QtWebKitWidgets.so
-	}
-}
-python3-PyQt5-websockets_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - websockets module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtWebSockets.pyi
-		vmove ${py3_sitelib}/PyQt5/QtWebSockets.so
-	}
-}
-python3-PyQt5-x11extras_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - x11extras module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtX11Extras.pyi
-		vmove ${py3_sitelib}/PyQt5/QtX11Extras.so
-	}
-}
-python3-PyQt5-xmlpatterns_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - xmlpatterns module"
-	pkg_install() {
-		vmove ${py3_sitelib}/PyQt5/QtXmlPatterns.pyi
-		vmove ${py3_sitelib}/PyQt5/QtXmlPatterns.so
-	}
-}