PyQt: Update sip to 6.5.0, reintroduce sip4 and simplify PyQt framework.

SIP:
As mentioned in the update from sip to sip5, this is a transitional version
to remove what is deprecated in sip4.
Sip6 completely removes the deprecated parts.
Unfortunately, some ports — mostly cura things — can not use sip6, so we
reintroduce sip4.

PyQt:
At the same time, we took the opportunity to simplify PyQT and propose only one
package as for devel/pyside2. */py-qt5-* have been merged — excepted chart,
networkauth and webengine — into devel/py-qt5-pyqt.

This allows us to be in adequacy with the packages that the author of these
libraries proposes, namely:

PyQt - devel/py-qt5-pyqt
PyQt-Charts - x11-toolkits/py-qt5-chart
PyQt-NetworkAuth – net/py-qt5-networkauth
PyQt-WebEngine – www/py-qt5-webengine
SIP – devel/py-sip
py-sip - devel/py-qt5-sip
PyQt-builder - devel/py-qtbuilder
Qscintilla - devel/py-qt5-qscintilla2

Reviewed by:	diizzy, kde
Tested by:	kai, rhurlin, arrowd, madpilot
Approved by:	makc, tcberner, kde
Differential Revision:	https://reviews.freebsd.org/D33237
Exp-run by:	antoine

CHANGES

@@ -10,6 +10,26 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
+20220127:
+AUTHOR: kde@FreeBSD.org
+
+  PyQt modules have been merged into devel/py-qt5-pyqt.
+
+  This allows us to simplify PyQt framework and to be in adequacy with the
+  packages that the author of these libraries proposes, namely:
+
+  * PyQt - devel/py-qt5-pyqt
+  * PyQt-Charts - x11-toolkits/py-qt5-chart
+  * PyQt-NetworkAuth – net/py-qt5-networkauth
+  * PyQt-WebEngine – www/py-qt5-webengine
+  * SIP – devel/py-sip
+  * py-sip - devel/py-qt5-sip
+  * PyQt-builder - devel/py-qtbuilder
+  * Qscintilla - devel/py-qt5-qscintilla2
+
+  Ports depending on PyQt, must be declared with USE_PYQT=pyqt5 instead of
+  USE_PYQT=core gui svg etc.
+
 20220117:
 AUTHOR: tobik@FreeBSD.org
 

MOVED

@@ -16845,3 +16845,35 @@ net/php73-ldap|net/php74-ldap|2022-01-26|Has expired: Security support ended on
 net/php73-soap|net/php74-soap|2022-01-26|Has expired: Security support ended on 2021-12-06
 mail/bogofilter|mail/bogofilter-bdb|2022-01-26|Port renamed to make LMDB the new default DB
 mail/bogofilter-lmdb|mail/bogofilter|2022-01-26|Port renamed to make LMDB the new default DB
+comms/py-qt5-sensors|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+comms/py-qt5-serialport|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+databases/py-qt5-sql|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+devel/py-qt5-core|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+devel/py-qt5-dbus|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+devel/py-qt5-dbussupport|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+devel/py-qt5-designer|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+devel/py-qt5-designerplugin|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+devel/py-qt5-help|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+devel/py-qt5-location|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+devel/py-qt5-positioning|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+devel/py-qt5-remoteobjects|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+devel/py-qt5-test|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+graphics/py-qt5-svg|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+lang/py-qt5-qml|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+misc/py-qt5-demo|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+multimedia/py-qt5-multimedia|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+multimedia/py-qt5-multimediawidgets|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+net/py-qt5-network|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+print/py-qt5-printsupport|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+textproc/py-qt5-xml|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+textproc/py-qt5-xmlpatterns|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+www/py-qt5-webchannel|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+www/py-qt5-webkit|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+www/py-qt5-webkitwidgets|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+www/py-qt5-websockets|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+x11-toolkits/py-qt5-gui|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+x11-toolkits/py-qt5-quick|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+x11-toolkits/py-qt5-quick3d|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+x11-toolkits/py-qt5-quickwidgets|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+x11-toolkits/py-qt5-widgets|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt
+x11/py-qt5-opengl|deve/py-qt5-pyqt|Merged into devel/py-qt5-pyqt

Mk/Uses/pyqt.mk

@@ -57,61 +57,35 @@ MASTER_SITES_PYQTSIP=	https://pypi.python.org/packages/source/P/PyQt5-sip/
 MASTER_SITES_PYQTCHART=	https://pypi.python.org/packages/source/P/PyQtChart/
 MASTER_SITES_PYQTNETWORKAUTH=	https://pypi.python.org/packages/source/P/PyQtNetworkAuth/
 MASTER_SITES_PYQTBUILDER=	https://pypi.io/packages/source/P/PyQt-builder/
+MASTER_SITES_PYQTWEBENGINE=	https://pypi.python.org/packages/source/P/PyQtWebEngine/
 #https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.12.0/QScintilla_src-2.12.0.tar.gz
 MASTER_SITES_QSCI2=	RIVERBANK/QScintilla/${PORTVERSION} \
 			SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
 			GENTOO
 
-SIP_VERSION=		5.5.0
+SIP_VERSION=		6.3.1
+SIP4_VERSION=		4.19.25
 QSCI2_VERSION=		2.13.0
 PYQT5_VERSION=		5.15.4
+PYQTCHART_VERSION=	${PYQT5_VERSION} # can be different
+PYQTNETWORKAUTH_VERSION=${PYQT5_VERSION}
+PYQTWEBENGINE_VERSION=	${PYQT5_VERSION}
 PYQTSIP_VERSION=	12.9.0
-PYQTBUILDER_VERSION=	1.9.1
+PYQTBUILDER_VERSION=	1.12.0
 
 SIP_DISTNAME=		sip-${SIP_VERSION}
+SIP4_DISTNAME=		sip-${SIP4_VERSION}
 PYQT5_DISTNAME=		PyQt5-${PYQT5_VERSION}
 PYQTSIP_DISTNAME=	PyQt5_sip-${PYQTSIP_VERSION}
-PYQTCHART_DISTNAME=	PyQtChart-${PYQT_VERSION}
-PYQTNETWORKAUTH_DISTNAME=	PyQtNetworkAuth-${PYQT_VERSION}
+PYQTCHART_DISTNAME=	PyQtChart-${PYQTCHART_VERSION}
+PYQTNETWORKAUTH_DISTNAME=	PyQtNetworkAuth-${PYQTNETWORKAUTH_VERSION}
 PYQTBUILDER_DISTNAME=	PyQt-builder-${PYQTBUILDER_VERSION}
+PYQTWEBENGINE_DISTNAME=	PyQtWebEngine-${PYQTWEBENGINE_VERSION}
 PYQT5_DISTINFO_FILE=	${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
 QSCI2_DISTNAME=		QScintilla_src-${QSCI2_VERSION}
 PYQT5_LICENSE=		GPLv3
 
-_USE_PYQT_COMMS=	sensors serialport
-_USE_PYQT_DATABASES=	sql
-_USE_PYQT_DEVEL=	core dbus dbussupport help location \
-			designer designerplugin remoteobjects test 
-_USE_PYQT_GRAPHICS=	svg
-_USE_PYQT_LANG=		qml
-_USE_PYQT_LOCATION=	location
-_USE_PYQT_MISC=		demo
-_USE_PYQT_MULTIMEDIA=	multimedia multimediawidgets
-_USE_PYQT_NET=		network networkauth
-_USE_PYQT_POSITIONING=	positioning
-_USE_PYQT_PRINT=	printsupport
-_USE_PYQT_TEXTPROC=	xml xmlpatterns
-_USE_PYQT_WWW=		webchannel webengine webkit webkitwidgets websockets
-_USE_PYQT_X11=		opengl
-_USE_PYQT_X11-TOOLKITS=	chart gui widgets quick quick3d quickwidgets
-
-# Keep these synchronized with OPTIONS_DEFINE in devel/py-qt5
-# PyQt components split up into pyqt5/...
-_USE_PYQT_ALL=		${_USE_PYQT_COMMS} \
-			${_USE_PYQT_DATABASES} \
-			${_USE_PYQT_DEVEL} \
-			${_USE_PYQT_GRAPHICS} \
-			${_USE_PYQT_LANG} \
-			${_USE_PYQT_LOCATION} \
-			${_USE_PYQT_MISC} \
-			${_USE_PYQT_MULTIMEDIA} \
-			${_USE_PYQT_NET} \
-			${_USE_PYQT_POSITIONING} \
-			${_USE_PYQT_PRINT} \
-			${_USE_PYQT_TEXTPROC} \
-			${_USE_PYQT_WWW} \
-			${_USE_PYQT_X11} \
-			${_USE_PYQT_X11-TOOLKITS}
+_USE_PYQT_ALL=		pyqt5 chart networkauth webengine
 _USE_SIP_ALL=		sip pysip
 _USE_QSCINTILLA=	qscintilla2
 _USE_PYQTBUILDER=	qtbuilder
@@ -130,10 +104,10 @@ py-sip_PATH=			${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}
 py-pysip_PATH=			${PYQT_PY_RELNAME}-sip>=${PYQTSIP_VERSION}
 py-qscintilla2_PATH=		${PYQT_PY_RELNAME}-qscintilla2>=${QSCI2_VERSION}
 py-qtbuilder_PATH=		${PYTHON_PKGNAMEPREFIX}qtbuilder>=${PYQTBUILDER_VERSION}
-
-.  for _component in ${_USE_PYQT_ALL}
-py-${_component}_PATH?=${PYQT_PY_RELNAME}-${_component}>=${PYQT_VERSION}
-.  endfor
+py-pyqt5_PATH=			${PYQT_PY_RELNAME}-pyqt>=${PYQT5_VERSION}
+py-chart_PATH=			${PYQT_PY_RELNAME}-chart>=${PYQT5_VERSION}
+py-networkauth_PATH=		${PYQT_PY_RELNAME}-networkauth>=${PYQT5_VERSION}
+py-webengine_PATH=		${PYQT_PY_RELNAME}-webengine>=${PYQT5_VERSION}
 
 # PORT
 py-sip_PORT=			devel/py-sip
@@ -141,53 +115,13 @@ py-qtbuilder_PORT=		devel/py-qtbuilder
 py-pysip_PORT=			devel/${PYQT_RELNAME}-sip
 py-qscintilla2_PORT=		devel/${PYQT_RELNAME}-qscintilla2
 py-positioning_PORT=		devel/${PYQT_RELNAME}-positioning
-
-.  for _categorie in comms databases devel graphics lang misc multimedia net print textproc www x11 x11-toolkits
-_PYQT_CATEGORIE=	_USE_PYQT_${_categorie:tu}
-.    for _component in ${${_PYQT_CATEGORIE}}
-py-${_component}_PORT?=${_categorie}/${PYQT_RELNAME}-${_component}
-.    endfor
-.  endfor
-
-py-core_DESC=			Python bindings for QtCore module
-py-chart_DESC=			Python bindings for QtChart module
-py-dbus_DESC=			Python bindings for QtDBus module
-py-dbussupport_DESC=		Qt event loop support for dbus-python
-py-demo_DESC=			PyQt demo and examples
-py-designer_DESC=		Python bindings for QtDesigner module
-py-designerplugin_DESC=		Python bindings for QtDesigner plugin
-py-gui_DESC=			Python bindings for QtGui module
-py-help_DESC=			Python bindings for QtHelp module
-py-location_DESC=		Python bindings for Location module
-py-multimedia_DESC=		Python bindings for Multimedia module
-py-multimediawidgets_DESC=	Python bindings for QtMultimediaWidgets module
-py-network_DESC=		Python bindings for QtNetwork module
-py-networkauth_DESC=		Python bindings for QtNetworkAuth module
-py-opengl_DESC=			Python bindings for QtOpenGL module
-py-positioning_DESC=		Python bindings for QtPositioning module
-py-printsupport_DESC=		Python bindings for Printsupport module
-py-qml_DESC=			Python bindings for Qml module
-py-qscintilla2_DESC=		Python bindings for QScintilla2
-py-quick_DESC=			Python bindings for QtQuick module
-py-quick3d_DESC=		Python bindings for QtQuick3D module
-py-quickwidgets_DESC=		Python bindings for QtQuickWidgets module
-py-remoteobjects_DESC=		Python bindings for QtRemoteObjects module
-py-sip_DESC=			Python bindings generator for C and C++ libraries
-py-sensors_DESC=		Python bindings for QtSensors
-py-serialport_DESC=		Python bindings for QtSerialPort
-py-sql_DESC=			Python bindings for QtSql module
-py-svg_DESC=			Python bindings for QtSvg module
-py-test_DESC=			Python bindings for QtTest module
-py-webchannel_DESC=		Python bindings for QtWebChannel module
-py-webengine_DESC=		Python bindings for QtWebEngine module
-py-webkit_DESC=			Python bindings for QtWebKit module
-py-webkitwidgets_DESC=		Python bindings for QtWebKitWidgets module
-py-widgets_DESC=		Python bindings for QTWidgets module
-py-xml_DESC=			Python bindings for QtXml module
-py-xmlpatterns_DESC=		Python bindings for QtXmlPatterns module
+py-pyqt5_PORT=			devel/${PYQT_RELNAME}-pyqt
+py-chart_PORT=			x11-toolkits/${PYQT_RELNAME}-chart
+py-networkauth_PORT=		net/${PYQT_RELNAME}-networkauth
+py-webengine_PORT=		www/${PYQT_RELNAME}-webengine
 
 # The versionned executable of sip
-SIP=		${LOCALBASE}/bin/sip5-${PYTHON_VER}
+SIP=		${LOCALBASE}/bin/sip-build-${PYTHON_VER}
 
 # Relative directories
 _VERSION_SUBDIR_REL=	PyQt${_PYQT_VERSION}/${PYTHON_VER}
@@ -217,49 +151,38 @@ PLIST_SUB+=	PYQT_APIDIR=${_APIDIR_REL} \
 		PYQT_PYQTVERSION=${PYQT_VERSION}
 
 .  if defined(PYQT_DIST)
-PORTVERSION=	${PYQT_VERSION}
-MASTER_SITES=	${PYQT_MASTERSITES}
-PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
-DISTNAME=	${PYQT_DISTNAME}
-DISTINFO_FILE=	${PYQT_DISTINFO_FILE}
-LICENSE?=	${PYQT_LICENSE}
-HAS_CONFIGURE=	yes
 
-.    if ${_PYQT_VERSION} > 4
-# PyQt5's configure.py generates .pro files and calls qmake to generate the
-# Makefiles. qmake's Makefiles use INSTALL_ROOT instead of DESTDIR.
-DESTDIRNAME=	INSTALL_ROOT
-# Limit PyQt5's version to the Qt5 version in ports
-PORTSCOUT?=	limit:^${_QT_VERSION:R}
-.    endif
+PLIST_SUB+=	PYTHON_MAJOR_VER="${PYTHON_MAJOR_VER}"
+
+SIP_ARGS=	--qmake ${QMAKE} \
+		--verbose \
+		--no-make \
+		--build-dir build \
+		--protected-is-public \
+		--api-dir ${PYQT_APIDIR}
+.	if ${PORTNAME} == "pyqt"
+SIP_ARGS+=	--confirm-license
+.	endif
+
+.  if ${PORTNAME} == "pyqt"
+.    if !target(post-patch)
+post-patch:
+	${REINPLACE_CMD} -e "s#%%PYQT_DESIGNERDIR%%#${PYQT_DESIGNERDIR}#" ${WRKSRC}/project.py
+	${REINPLACE_CMD} -e "s#%%PYQT_QMLDIR%%#${PYQT_QMLDIR}#" ${WRKSRC}/project.py
+.    endif  # !target(post-patch)
+.  endif
 
-PATCHDIR=	${.CURDIR}/../../devel/${PYQT_RELNAME}-core/files
-CONFIGURE_ARGS+=-b ${PREFIX}/bin \
-		-d ${PYTHONPREFIX_SITELIBDIR} \
-		-q ${QMAKE} \
-		--confirm-license \
-		--sip ${SIP} \
-		--sipdir ${PYQT_SIPDIR}
-.    if ${_PYQT_VERSION:M5}
-# Move the designer plugin and qml libraries to versioned folders.
-CONFIGURE_ARGS+=--qml-plugindir ${PYQT_QMLDIR} \
-		--designer-plugindir ${PYQT_DESIGNERDIR}
-# Further do not gernate the dinstinfo files.
-CONFIGURE_ARGS+=--no-dist-info
-.    endif
-# One of the things PyQt looks for to determine whether to build the Qt DBus
-# main loop module (${PYQT_RELNAME}-dbussupport) is whether the dbus/ directory is
-# present. Only extract it for that port then.
-.    if ${PORTNAME} != "dbussupport"
-EXTRACT_AFTER_ARGS+=	--exclude "${DISTNAME}/dbus"
-.    endif  # ${PORTNAME} != "dbussupport"
+.    if !target(do-build)
+do-build:
+	(cd ${WRKSRC}; ${SIP} ${SIP_ARGS}; ${MAKE} -C ./build)
+
+.    endif  # !target(do-build)
+
+.    if !target(do-install)
+do-install:
+	(cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
+.    endif  # !target(do-install)
 
-.    if !target(do-configure)
-do-configure:
-	${REINPLACE_CMD} -e "s/sip-module/sip-module-${PYTHON_VER}/" ${WRKSRC}/configure.py
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
-.    endif  # !target(do-configure)
 .  endif  # defined(PYQT_DIST)
 
 # Set build, run and test depends -- we need to prefix them internally with "py-"

UPDATING

@@ -5,6 +5,13 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20220127:
+  AFFECTS: users of PyQt
+  AUTHOR: kde@FreeBSD.org
+
+  Most of the PyQt ports have been merged into single port devel/py-qt5-pyqt. 
+  `pkg upgrade` will handle update automatically .
+
 20220126:
   AFFECTS: users of mail/bogofilter, mail/bogofilter-lmdb
   AUTHOR: mandree@FreeBSD.org

audio/cadence/Makefile

@@ -19,7 +19,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	falkTX
 GH_PROJECT=	Cadence
 USE_QT=		core gui widgets buildtools_build
-USE_PYQT=	core_run gui_run network_run opengl_run svg_run widgets_run xml_run sip xml dbussupport
+USE_PYQT=	pyqt5 sip
 
 CXXFLAGS+=	-DJACKBRIDGE_PROPER_CPP11_SUPPORT=yes
 # Give the Makefile the proper versioned binaries of PyQt

audio/carla/Makefile

@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo@${PY_FLAVOR}
 USES=		compiler:c++11-lib desktop-file-utils gl gmake gnome localbase \
 		pkgconfig pyqt:5 python:3.4+ qt:5 shared-mime-info shebangfix \
 		tar:bz2 xorg
-USE_PYQT=	core_run gui_run sip svg_run widgets_run xml_build  # "sip" should be "sip_build", but "import PyQt5.QtCore" wants "sip". See bug#225040
+USE_PYQT=	pyqt5 sip
 USE_GNOME=	gtk20 gtk30
 USE_QT=		core gui widgets buildtools_build
 USE_GL=		gl

audio/picard/Makefile

@@ -21,21 +21,18 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}discid>=0.5.2:audio/py-discid@${PY_FLAVOR} \
 
 USES=		gettext pyqt:5 python:3.6+ desktop-file-utils
 USE_LOCALE=	en_US.UTF-8
-USE_PYQT=	core_run dbus_run gui_run network_run widgets_run sip
+USE_PYQT=	pyqt5_run sip
 USE_PYTHON=	autoplist distutils noflavors
 
 CONFLICTS_INSTALL=	picard-tools py*-python-picard # bin/picard
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-release-${DISTVERSION}
 
-OPTIONS_DEFINE=		ACOUSTID PLAYER PLUGINS
-OPTIONS_DEFAULT=	PLAYER PLUGINS
+OPTIONS_DEFINE=		ACOUSTID PLUGINS
+OPTIONS_DEFAULT=	PLUGINS
 
 ACOUSTID_RUN_DEPENDS=	fpcalc:audio/chromaprint
 
-PLAYER_DESC=		Built-in audio player
-PLAYER_USE=		PYQT=multimedia_run
-
 PLUGINS_DESC=		Install various plugins to extend functionality
 PLUGINS_RUN_DEPENDS=	picard-plugins>=2.0:audio/picard-plugins
 

biology/py-ete3/Makefile

@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PY_DEPENDS}
 USES=		python:3.5+ pyqt:5 shebangfix
 SHEBANG_GLOB=	*.py
 USE_PYTHON=	distutils concurrent autoplist
-USE_PYQT=	core gui opengl printsupport svg widgets
+USE_PYQT=	pyqt5
 
 NO_ARCH=	yes
 

cad/cura/Makefile

@@ -19,7 +19,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
 		qt5-graphicaleffects>0:graphics/qt5-graphicaleffects \
 		qt5-quickcontrols>0:x11-toolkits/qt5-quickcontrols \
 		qt5-quickcontrols2>0:x11-toolkits/qt5-quickcontrols2 \
-		${PYTHON_PKGNAMEPREFIX}qt5-svg>0:graphics/py-qt5-svg \
 		Uranium>=${DISTVERSION}:cad/uranium \
 		libCharon>=${DISTVERSION}:net/libcharon \
 		CuraEngine>=${DISTVERSION}:cad/cura-engine \
@@ -32,7 +31,7 @@ LIB_DEPENDS=	libArcus.so:net/libarcus \
 
 USES=		cmake gettext shebangfix python:3.5+ pyqt:5 \
 		desktop-file-utils shared-mime-info
-USE_PYQT=	gui widgets qml
+USE_PYQT=	pyqt5
 CMAKE_ARGS+=	-DURANIUM_SCRIPTS_DIR:STRING="${LOCALBASE}/share/uranium/scripts" \
 	-DCURA_VERSION=${DISTVERSION}
 USE_GITHUB=	yes

cad/py-cq-editor/Makefile

@@ -14,7 +14,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cadquery>=0:cad/py-cadquery@${PY_FLAVOR} \
 
 USES=		pyqt:5 python:3.6+
 USE_PYTHON=	autoplist distutils
-USE_PYQT=	core gui widgets
+USE_PYQT=	pyqt5
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CadQuery

cad/py-pyfda/Makefile

@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}
 
 USES=		python:3.7+ pyqt:5
 USE_PYTHON=	distutils autoplist
-USE_PYQT=	core_run gui_run widgets_run
+USE_PYQT=	pyqt5_run
 NO_ARCH=	yes
 
 post-extract:

cad/uranium/Makefile

@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR}
 
 USES=		cmake gettext python:3.5+ pyqt:5
-USE_PYQT=	quick
+USE_PYQT=	pyqt5
 USE_GITHUB=	yes
 GH_ACCOUNT=	Ultimaker
 GH_TAGNAME=	3ed9c4de

comms/Makefile

@@ -137,8 +137,6 @@
     SUBDIR += py-hidapi
     SUBDIR += py-libimobiledevice
     SUBDIR += py-pyserial
-    SUBDIR += py-qt5-sensors
-    SUBDIR += py-qt5-serialport
     SUBDIR += py-xmodem
     SUBDIR += pyla
     SUBDIR += qico

comms/gnuradio/Makefile

@@ -68,7 +68,7 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \
 #CMAKE_ARGS+=	--debug-output --trace
 USE_CXXSTD=	c++11
 USE_GITHUB=	yes
-USE_PYQT=	core gui opengl
+USE_PYQT=	pyqt5
 USE_WX=		3.0
 USE_QT=		buildtools core gui xml qmake widgets
 WX_COMPS=	wx wx:build wx:run python:build python:run

comms/nanovna-saver/Makefile

@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.3+ pyqt:5
 USE_PYTHON=	distutils autoplist noflavors
-USE_PYQT=	core_run gui_run widgets_run
+USE_PYQT=	pyqt5_run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mihtjel

comms/py-qt5-sensors/Makefile

@@ -1,30 +0,0 @@
-PORTNAME=	sensors
-PORTREVISION=	3
-CATEGORIES=	comms devel python
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Python bindings for the Qt5 toolkit, QtSensors module
-
-CONFIGURE_ARGS=	--enable QtSensors
-PYQT_DIST=	yes
-
-USES=		gl python:3.5+ pyqt:5 qt:5
-USE_GL=		gl
-USE_PYQT=	sip_build core_run 
-USE_PYTHON=	concurrent flavors py3kplist
-USE_QT=		core gui sensors qmake_build
-
-OPTIONS_DEFINE=	API DEBUG
-OPTIONS_DEFAULT=API
-OPTIONS_SUB=	yes
-
-API_DESC=		Install QtSensors API for QScintilla2
-API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
-API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
-DEBUG_CONFIGURE_ON=	--debug --trace
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtSensors.so
-
-.include <bsd.port.mk>

comms/py-qt5-sensors/pkg-descr

@@ -1,4 +0,0 @@
-PyQt5 is a set of Python bindings for Qt5 application framework.
-This package provides the QtSensors module.
-
-WWW: https://riverbankcomputing.com/software/pyqt

comms/py-qt5-sensors/pkg-plist

@@ -1,24 +0,0 @@
-%%PYTHON_SITELIBDIR%%/PyQt5/QtSensors.pyi
-%%PYTHON_SITELIBDIR%%/PyQt5/QtSensors.so
-%%API%%%%PYQT_APIDIR%%/api/python/QtSensors.api
-%%PYQT_SIPDIR%%/QtSensors/QtSensorsmod.sip
-%%PYQT_SIPDIR%%/QtSensors/qaccelerometer.sip
-%%PYQT_SIPDIR%%/QtSensors/qaltimeter.sip
-%%PYQT_SIPDIR%%/QtSensors/qambientlightsensor.sip
-%%PYQT_SIPDIR%%/QtSensors/qambienttemperaturesensor.sip
-%%PYQT_SIPDIR%%/QtSensors/qcompass.sip
-%%PYQT_SIPDIR%%/QtSensors/qdistancesensor.sip
-%%PYQT_SIPDIR%%/QtSensors/qgyroscope.sip
-%%PYQT_SIPDIR%%/QtSensors/qholstersensor.sip
-%%PYQT_SIPDIR%%/QtSensors/qhumiditysensor.sip
-%%PYQT_SIPDIR%%/QtSensors/qirproximitysensor.sip
-%%PYQT_SIPDIR%%/QtSensors/qlidsensor.sip
-%%PYQT_SIPDIR%%/QtSensors/qlightsensor.sip
-%%PYQT_SIPDIR%%/QtSensors/qmagnetometer.sip
-%%PYQT_SIPDIR%%/QtSensors/qorientationsensor.sip
-%%PYQT_SIPDIR%%/QtSensors/qpressuresensor.sip
-%%PYQT_SIPDIR%%/QtSensors/qproximitysensor.sip
-%%PYQT_SIPDIR%%/QtSensors/qrotationsensor.sip
-%%PYQT_SIPDIR%%/QtSensors/qsensor.sip
-%%PYQT_SIPDIR%%/QtSensors/qtapsensor.sip
-%%PYQT_SIPDIR%%/QtSensors/qtiltsensor.sip

comms/py-qt5-serialport/Makefile

@@ -1,30 +0,0 @@
-PORTNAME=	serialport
-PORTREVISION=	3
-CATEGORIES=	comms devel python
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Python bindings for the Qt5 toolkit, QtSerialPort module
-
-CONFIGURE_ARGS=	--enable QtSerialPort
-PYQT_DIST=	yes
-
-USES=		gl python:3.5+ pyqt:5 qt:5
-USE_GL=		gl
-USE_PYQT=	sip_build core_run 
-USE_PYTHON=	concurrent flavors py3kplist
-USE_QT=		core gui serialport qmake_build
-
-OPTIONS_DEFINE=	API DEBUG
-OPTIONS_DEFAULT=API
-OPTIONS_SUB=	yes
-
-API_DESC=		Install QtSerialPort API for QScintilla2
-API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
-API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
-DEBUG_CONFIGURE_ON=	--debug --trace
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtSerialPort.so
-
-.include <bsd.port.mk>

comms/py-qt5-serialport/pkg-descr

@@ -1,4 +0,0 @@
-PyQt5 is a set of Python bindings for Qt5 application framework.
-This package provides the QtSerialPort module.
-
-WWW: https://riverbankcomputing.com/software/pyqt

comms/py-qt5-serialport/pkg-plist

@@ -1,6 +0,0 @@
-%%PYTHON_SITELIBDIR%%/PyQt5/QtSerialPort.so
-%%PYTHON_SITELIBDIR%%/PyQt5/QtSerialPort.pyi
-%%PYQT_SIPDIR%%/QtSerialPort/QtSerialPortmod.sip
-%%PYQT_SIPDIR%%/QtSerialPort/qserialport.sip
-%%PYQT_SIPDIR%%/QtSerialPort/qserialportinfo.sip
-%%API%%%%PYQT_APIDIR%%/api/python/QtSerialPort.api

databases/Makefile

@@ -820,7 +820,6 @@
     SUBDIR += py-python-memcached
     SUBDIR += py-python-sql
     SUBDIR += py-python-swiftclient
-    SUBDIR += py-qt5-sql
     SUBDIR += py-queries
     SUBDIR += py-rb
     SUBDIR += py-redis

databases/py-qt5-sql/Makefile

@@ -1,30 +0,0 @@
-PORTNAME=	sql
-PORTREVISION=	3
-CATEGORIES=	databases devel python
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Python bindings for the Qt5 toolkit, QtSql module
-
-CONFIGURE_ARGS=	--enable QtSql
-PYQT_DIST=	yes
-
-USES=		gl python:3.5+ pyqt:5 qt:5
-USE_GL=		gl
-USE_PYQT=	sip_build core_run widgets_run
-USE_PYTHON=	concurrent flavors py3kplist
-USE_QT=		core gui sql widgets buildtools_build qmake_build
-
-OPTIONS_DEFINE=	API DEBUG
-OPTIONS_DEFAULT=API
-OPTIONS_SUB=	yes
-
-API_DESC=		Install QtSql API for QScintilla2
-API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
-API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
-DEBUG_CONFIGURE_ON=	--debug --trace
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtSql.so
-
-.include <bsd.port.mk>

databases/py-qt5-sql/pkg-descr

@@ -1,4 +0,0 @@
-PyQt5 is a set of Python bindings for Qt5 application framework.
-This package provides the QtSql module.
-
-WWW: https://riverbankcomputing.com/software/pyqt

databases/py-qt5-sql/pkg-plist

@@ -1,18 +0,0 @@
-%%PYTHON_SITELIBDIR%%/PyQt5/QtSql.so
-%%PYTHON_SITELIBDIR%%/PyQt5/QtSql.pyi
-%%PYQT_SIPDIR%%/QtSql/QtSqlmod.sip
-%%PYQT_SIPDIR%%/QtSql/qsql.sip
-%%PYQT_SIPDIR%%/QtSql/qsqldatabase.sip
-%%PYQT_SIPDIR%%/QtSql/qsqldriver.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlerror.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlfield.sip
-%%PYQT_SIPDIR%%/QtSql/qtsqlglobal.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlindex.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlquery.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlquerymodel.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlrecord.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlrelationaldelegate.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlrelationaltablemodel.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlresult.sip
-%%PYQT_SIPDIR%%/QtSql/qsqltablemodel.sip
-%%API%%%%PYQT_APIDIR%%/api/python/QtSql.api

deskutils/calibre/Makefile

@@ -58,7 +58,7 @@ USES=		desktop-file-utils gettext-runtime gl gnome localbase:ldflags \
 		ssl tar:xz xorg
 USE_RC_SUBR=	calibre
 SUB_LIST+=	PYTHON_VERSION=${PYTHON_VERSION}
-USE_PYQT=	core gui network pysip qtbuilder sip svg webengine widgets xmlpatterns
+USE_PYQT=	pyqt5 pysip qtbuilder sip webengine
 USE_QT=		buildtools_build core dbus gui qmake_build widgets
 USE_GL=		egl gl
 USE_GNOME=	glib20

deskutils/py-autokey/Makefile

@@ -36,7 +36,7 @@ GTK3_USES=	gnome
 GTK3_USE=	GNOME=gtk30,gtksourceview3,pygobject3
 
 QT5_USES=	pyqt:5
-QT5_USE=	PYQT=dbus,qscintilla2,sip,svg,xml
+QT5_USE=	PYQT=pyqt5,sip
 
 post-patch:
 	@${REINPLACE_CMD} 's|share/man|man|g' ${WRKSRC}/setup.py

deskutils/treeline/Makefile

@@ -14,7 +14,7 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 USES=		python:3.5+ pyqt:5 shebangfix
-USE_PYQT=	core gui network printsupport widgets sip
+USE_PYQT=	pyqt5 sip
 
 SHEBANG_FILES=	source/treeline.py
 

devel/Makefile

@@ -5151,18 +5151,9 @@
     SUBDIR += py-qcs-api-client
     SUBDIR += py-qstylizer
     SUBDIR += py-qt5
-    SUBDIR += py-qt5-core
-    SUBDIR += py-qt5-dbus
-    SUBDIR += py-qt5-dbussupport
-    SUBDIR += py-qt5-designer
-    SUBDIR += py-qt5-designerplugin
-    SUBDIR += py-qt5-help
-    SUBDIR += py-qt5-location
-    SUBDIR += py-qt5-positioning
+    SUBDIR += py-qt5-pyqt
     SUBDIR += py-qt5-qscintilla2
-    SUBDIR += py-qt5-remoteobjects
     SUBDIR += py-qt5-sip
-    SUBDIR += py-qt5-test
     SUBDIR += py-qtbuilder
     SUBDIR += py-qtconsole
     SUBDIR += py-qutip
@@ -5247,6 +5238,7 @@
     SUBDIR += py-simpletal
     SUBDIR += py-simpy
     SUBDIR += py-sip
+    SUBDIR += py-sip4
     SUBDIR += py-six
     SUBDIR += py-smmap
     SUBDIR += py-smmap2

devel/eric6/Makefile

@@ -33,8 +33,8 @@ CONFLICTS_INSTALL=	${FLAVORS:N${FLAVOR}:C/^/${PORTNAME}-qt5-/}
 
 USES+=		desktop-file-utils python:3.5+ pyqt:5 shebangfix
 USE_PYTHON=	flavors
-USE_PYQT=	chart core gui qscintilla2 webengine \
-		help_run network_run svg_run sql_run
+USE_PYQT=	qscintilla2 webengine \
+		pyqt5
 INSTALL_PY=	install.py -c -f eric6config.freebsd -i ${STAGEDIR}
 SHEBANG_FILES=	*.py eric/eric6/*.py eric/scripts/*.py
 SUB_FILES=	eric6.desktop

devel/git-cola/Makefile

@@ -16,7 +16,7 @@ RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}QtPy>=1.7.1:devel/py-QtPy@${PY_FLAVOR}
 
 USES=			desktop-file-utils gmake gnome python pyqt:5 qt:5 shebangfix
 USE_GITHUB=		yes
-USE_PYQT=		core gui network widgets
+USE_PYQT=		pyqt5
 
 NO_ARCH=		yes
 

devel/git-cola/pkg-plist

@@ -1,10 +1,13 @@
 bin/cola
 bin/git-cola
+bin/git-cola-sequence-editor
 bin/git-dag
 share/applications/git-cola-folder-handler.desktop
 share/applications/git-cola.desktop
 share/applications/git-dag.desktop
 share/icons/hicolor/scalable/apps/git-cola.svg
+share/metainfo/git-cola.appdata.xml
+share/metainfo/git-dag.appdata.xml
 %%DATADIR%%/bin/ssh-askpass
 %%DATADIR%%/bin/ssh-askpass-darwin
 %%DATADIR%%/icons/a-z-order.svg
@@ -58,6 +61,7 @@ share/icons/hicolor/scalable/apps/git-cola.svg
 %%DATADIR%%/icons/dark/sync.svg
 %%DATADIR%%/icons/dark/tag.svg
 %%DATADIR%%/icons/dark/telescope.svg
+%%DATADIR%%/icons/dark/three-bars.svg
 %%DATADIR%%/icons/dark/trashcan.svg
 %%DATADIR%%/icons/dark/unfold.svg
 %%DATADIR%%/icons/dark/upstream.svg
@@ -108,6 +112,7 @@ share/icons/hicolor/scalable/apps/git-cola.svg
 %%DATADIR%%/icons/sync.svg
 %%DATADIR%%/icons/tag.svg
 %%DATADIR%%/icons/telescope.svg
+%%DATADIR%%/icons/three-bars.svg
 %%DATADIR%%/icons/trashcan.svg
 %%DATADIR%%/icons/unfold.svg
 %%DATADIR%%/icons/upstream.svg
@@ -116,6 +121,7 @@ share/icons/hicolor/scalable/apps/git-cola.svg
 %%DATADIR%%/icons/zoom-in.svg
 %%DATADIR%%/icons/zoom-out.svg
 %%DATADIR%%/lib/cola/__init__.py
+%%DATADIR%%/lib/cola/__main__.py
 %%DATADIR%%/lib/cola/_version.py
 %%DATADIR%%/lib/cola/actions.py
 %%DATADIR%%/lib/cola/app.py
@@ -152,6 +158,7 @@ share/icons/hicolor/scalable/apps/git-cola.svg
 %%DATADIR%%/lib/cola/qtcompat.py
 %%DATADIR%%/lib/cola/qtutils.py
 %%DATADIR%%/lib/cola/resources.py
+%%DATADIR%%/lib/cola/sequenceeditor.py
 %%DATADIR%%/lib/cola/settings.py
 %%DATADIR%%/lib/cola/spellcheck.py
 %%DATADIR%%/lib/cola/textwrap.py
@@ -227,4 +234,182 @@ share/icons/hicolor/scalable/apps/git-cola.svg
 %%PORTDOCS%%%%DOCSDIR%%/index.rst
 %%PORTDOCS%%%%DOCSDIR%%/relnotes.rst
 %%PORTDOCS%%%%DOCSDIR%%/thanks.rst
-
+%%PYTHON_SITELIBDIR%%/cola/__init__.py
+%%PYTHON_SITELIBDIR%%/cola/__main__.py
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/__main__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/_version%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/actions%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/app%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/cmd%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/cmds%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/compat%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/core%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/dag%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/decorators%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/diffparse%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/difftool%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/display%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/fsmonitor%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/git%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/gitcfg%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/gitcmds%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/gravatar%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/guicmds%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/hidpi%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/hotkeys%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/i18n%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/icons%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/inotify%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/interaction%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/main%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/observable%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/qtcompat%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/qtutils%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/resources%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/sequenceeditor%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/settings%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/spellcheck%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/textwrap%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/themes%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/__pycache__/version%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/_version.py
+%%PYTHON_SITELIBDIR%%/cola/actions.py
+%%PYTHON_SITELIBDIR%%/cola/app.py
+%%PYTHON_SITELIBDIR%%/cola/cmd.py
+%%PYTHON_SITELIBDIR%%/cola/cmds.py
+%%PYTHON_SITELIBDIR%%/cola/compat.py
+%%PYTHON_SITELIBDIR%%/cola/core.py
+%%PYTHON_SITELIBDIR%%/cola/dag.py
+%%PYTHON_SITELIBDIR%%/cola/decorators.py
+%%PYTHON_SITELIBDIR%%/cola/diffparse.py
+%%PYTHON_SITELIBDIR%%/cola/difftool.py
+%%PYTHON_SITELIBDIR%%/cola/display.py
+%%PYTHON_SITELIBDIR%%/cola/fsmonitor.py
+%%PYTHON_SITELIBDIR%%/cola/git.py
+%%PYTHON_SITELIBDIR%%/cola/gitcfg.py
+%%PYTHON_SITELIBDIR%%/cola/gitcmds.py
+%%PYTHON_SITELIBDIR%%/cola/gravatar.py
+%%PYTHON_SITELIBDIR%%/cola/guicmds.py
+%%PYTHON_SITELIBDIR%%/cola/hidpi.py
+%%PYTHON_SITELIBDIR%%/cola/hotkeys.py
+%%PYTHON_SITELIBDIR%%/cola/i18n.py
+%%PYTHON_SITELIBDIR%%/cola/icons.py
+%%PYTHON_SITELIBDIR%%/cola/inotify.py
+%%PYTHON_SITELIBDIR%%/cola/interaction.py
+%%PYTHON_SITELIBDIR%%/cola/main.py
+%%PYTHON_SITELIBDIR%%/cola/models/__init__.py
+%%PYTHON_SITELIBDIR%%/cola/models/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/models/__pycache__/browse%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/models/__pycache__/dag%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/models/__pycache__/main%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/models/__pycache__/prefs%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/models/__pycache__/selection%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/models/__pycache__/stash%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/models/browse.py
+%%PYTHON_SITELIBDIR%%/cola/models/dag.py
+%%PYTHON_SITELIBDIR%%/cola/models/main.py
+%%PYTHON_SITELIBDIR%%/cola/models/prefs.py
+%%PYTHON_SITELIBDIR%%/cola/models/selection.py
+%%PYTHON_SITELIBDIR%%/cola/models/stash.py
+%%PYTHON_SITELIBDIR%%/cola/observable.py
+%%PYTHON_SITELIBDIR%%/cola/qtcompat.py
+%%PYTHON_SITELIBDIR%%/cola/qtutils.py
+%%PYTHON_SITELIBDIR%%/cola/resources.py
+%%PYTHON_SITELIBDIR%%/cola/sequenceeditor.py
+%%PYTHON_SITELIBDIR%%/cola/settings.py
+%%PYTHON_SITELIBDIR%%/cola/spellcheck.py
+%%PYTHON_SITELIBDIR%%/cola/textwrap.py
+%%PYTHON_SITELIBDIR%%/cola/themes.py
+%%PYTHON_SITELIBDIR%%/cola/utils.py
+%%PYTHON_SITELIBDIR%%/cola/version.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/__init__.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/about%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/action%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/archive%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/bookmarks%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/branch%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/browse%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/cfgactions%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/clone%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/commitmsg%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/common%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/compare%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/completion%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/createbranch%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/createtag%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/dag%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/defs%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/diff%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/editremotes%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/filelist%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/filetree%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/finder%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/gitignore%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/grep%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/highlighter%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/imageview%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/log%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/main%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/merge%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/patch%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/prefs%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/recent%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/remote%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/search%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/selectcommits%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/spellcheck%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/standard%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/startup%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/stash%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/status%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/submodules%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/text%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/toolbar%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/__pycache__/toolbarcmds%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cola/widgets/about.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/action.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/archive.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/bookmarks.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/branch.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/browse.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/cfgactions.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/clone.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/commitmsg.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/common.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/compare.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/completion.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/createbranch.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/createtag.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/dag.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/defs.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/diff.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/editremotes.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/filelist.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/filetree.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/finder.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/gitignore.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/grep.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/highlighter.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/imageview.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/log.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/main.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/merge.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/patch.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/prefs.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/recent.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/remote.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/search.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/selectcommits.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/spellcheck.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/standard.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/startup.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/stash.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/status.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/submodules.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/text.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/toolbar.py
+%%PYTHON_SITELIBDIR%%/cola/widgets/toolbarcmds.py
+%%PYTHON_SITELIBDIR%%/git_cola-3.10.1-py%%PYTHON_VER%%.egg-info

devel/libsavitar/Makefile

@@ -1,25 +1,20 @@
 PORTNAME=	libSavitar
-DISTVERSION=	4.5.0
-PORTREVISION=	6
+DISTVERSION=	4.11.0
 CATEGORIES=	devel cad
 DIST_SUBDIR=	Ultimaker
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	195633cf0c5f.patch:-p1
-
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	C++ implementation of 3mf loading/python bindings
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	sip:devel/py-sip4
 LIB_DEPENDS=	libpugixml.so:textproc/pugixml
 
 USES=		cmake compiler:c++11-lang python:3.5+ pyqt:5
-USE_PYQT=	sip pysip
 USE_GITHUB=	yes
 GH_ACCOUNT=	Ultimaker
-GH_TAGNAME=	96eba0e
 USE_LDCONFIG=	yes
 CFLAGS+=	"-I${LOCALBASE}/include"
 LDFLAGS+=	"-L${LOCALBASE}/lib"

devel/libsavitar/distinfo

@@ -1,5 +1,3 @@
-TIMESTAMP = 1602393384
-SHA256 (Ultimaker/Ultimaker-libSavitar-4.5.0-96eba0e_GH0.tar.gz) = f64e9b20d6783247a88ddc751a80d20eec2073465c0b46fbba45c1ab9c01eb75
-SIZE (Ultimaker/Ultimaker-libSavitar-4.5.0-96eba0e_GH0.tar.gz) = 98038
-SHA256 (Ultimaker/195633cf0c5f.patch) = 5c4fce2fbf144ae92882234dc5b703a7e1f9594a80cfefbaaa083b4c7d81b0f4
-SIZE (Ultimaker/195633cf0c5f.patch) = 5331
+TIMESTAMP = 1638904548
+SHA256 (Ultimaker/Ultimaker-libSavitar-4.11.0_GH0.tar.gz) = fb0cb3d6b063e9f8ae88c0ef34dcbca5b0a4c6f8d841847c02cd4741decd16f9
+SIZE (Ultimaker/Ultimaker-libSavitar-4.11.0_GH0.tar.gz) = 100719

devel/libsavitar/pkg-plist

@@ -13,5 +13,5 @@ lib/cmake/Savitar/SavitarConfig.cmake
 lib/cmake/Savitar/SavitarConfigVersion.cmake
 lib/libSavitar.so
 lib/libSavitar.so.0
-lib/libSavitar.so.0.1.1
+lib/libSavitar.so.0.1.2
 %%PYTHON_SITELIBDIR%%/Savitar.so

devel/py-pyface/Makefile

@@ -38,7 +38,7 @@ OPTIONS_DEFAULT=	QT5
 
 QT5_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
 QT5_USES=		pyqt:5
-QT5_USE=		PYQT=core_run,gui_run,network_test,opengl_test,printsupport_run,svg_run,test_test,webkit_test,webkitwidgets_test,widgets_run
+QT5_USE=		PYQT=pyqt5_test,pyqt5_run
 
 # These tests were extracted from etstool.py and adapted to the ports test framework
 # Note: The occurences of "qt4" aren't typos

devel/py-pynest2d/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	pynest2d
-DISTVERSION=	4.8.0
-PORTREVISION=	4
+DISTVERSION=	4.12.1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -11,7 +10,8 @@ LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/include/libnest2d/libnest2d.hpp:devel/libnest2d-ultimaker
-BUILD_DEPENDS=	${LOCALBASE}/include/libnest2d/libnest2d.hpp:devel/libnest2d-ultimaker
+BUILD_DEPENDS=	${LOCALBASE}/include/libnest2d/libnest2d.hpp:devel/libnest2d-ultimaker \
+		sip:devel/py-sip4
 LIB_DEPENDS=	libpolyclipping.so:graphics/polyclipping \
 		libboost_system.so:devel/boost-libs \
 		libnlopt.so:math/nlopt
@@ -20,10 +20,8 @@ USES=		python:3.6+ cmake compiler:c++11-lang pyqt:5 pkgconfig
 USE_PYTHON=	flavors
 
 USE_GITHUB=	yes
-GH_TUPLE=	Ultimaker:pynest2d:d31a381
-USE_PYQT=	sip pysip
-CMAKE_ARGS=	-DSIP_EXECUTABLE=${SIP} \
-			-DLIBNEST2D_INCLUDE_DIRS=${PREFIX}/include/libnest2d
+GH_TUPLE=	Ultimaker:pynest2d:baec470
+CMAKE_ARGS=	-DLIBNEST2D_INCLUDE_DIRS=${PREFIX}/include/libnest2d
 
 CONFIGURE_ENV=	CLIPPER_PATH=${LOCALBASE} VERBOSE=y
 .include <bsd.port.mk>

devel/py-pynest2d/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1608805108
-SHA256 (Ultimaker-pynest2d-4.8.0-d31a381_GH0.tar.gz) = 4dd62924608a6193643cdbef250c71a3fc23e560e3f21dc714648843e035a599
-SIZE (Ultimaker-pynest2d-4.8.0-d31a381_GH0.tar.gz) = 18169
+TIMESTAMP = 1638125132
+SHA256 (Ultimaker-pynest2d-4.12.1-baec470_GH0.tar.gz) = 199116bd9baa13a8231806c1af4e6ac54261c69188a5ba3f58b1ac38b56238c4
+SIZE (Ultimaker-pynest2d-4.12.1-baec470_GH0.tar.gz) = 18449

devel/py-pynest2d/files/patch-CMakeLists.txt

@@ -1,10 +0,0 @@
---- CMakeLists.txt.orig	2020-12-24 21:32:13 UTC
-+++ CMakeLists.txt
-@@ -44,6 +44,6 @@ set(SIP_EXTRA_FILES_DEPEND
-     src/String.sip
- )
- 
--set(SIP_EXTRA_OPTIONS -g)  # Always release the GIL before calling C++ methods.
-+set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip)  # Always release the GIL before calling C++ methods.
- include_directories(src/ ${SIP_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS} ${CLIPPER_INCLUDE_DIRS} ${NLopt_INCLUDE_DIRS} ${LIBNEST2D_INCLUDE_DIRS})
- add_sip_python_module(pynest2d src/Pynest2D.sip ${CLIPPER_LIBRARIES} ${NLopt_LIBRARIES})

devel/py-pynest2d/files/patch-cmake_FindSIP.cmake

@@ -1,32 +0,0 @@
---- cmake/FindSIP.cmake.orig	2020-12-24 21:03:56 UTC
-+++ cmake/FindSIP.cmake
-@@ -57,16 +57,26 @@ endif()
- 
- get_filename_component(_python_binary_path ${Python3_EXECUTABLE} DIRECTORY)
- 
--find_program(SIP_EXECUTABLE sip
-+find_program(SIP_EXECUTABLE sip5
-     HINTS ${CMAKE_PREFIX_PATH}/bin ${CMAKE_INSTALL_PATH}/bin ${_python_binary_path} ${Python3_SITELIB}/PyQt5
- )
- 
-+execute_process(
-+    COMMAND sip-module --sip-h --target-dir ${CMAKE_BINARY_DIR} PyQt5.sip
-+    RESULT_VARIABLE _process_status
-+    OUTPUT_VARIABLE _process_output
-+    OUTPUT_STRIP_TRAILING_WHITESPACE
-+)
-+if(NOT ${_process_status} EQUAL 0)
-+    message(FATAL_ERROR "Failed to get sip.h. Error: ${_process_output}")
-+endif()
-+
- find_path(SIP_INCLUDE_DIRS sip.h
--    HINTS ${CMAKE_PREFIX_PATH}/include ${CMAKE_INSTALL_PATH}/include ${Python3_INCLUDE_DIRS} ${Python3_SITELIB}/PyQt5
-+    HINTS ${CMAKE_BINARY_DIR} ${CMAKE_PREFIX_PATH}/include ${CMAKE_INSTALL_PATH}/include ${Python3_INCLUDE_DIRS} ${Python3_SITELIB}/PyQt5
- )
- 
- execute_process(
--    COMMAND ${Python3_EXECUTABLE} -c "import sip; print(sip.SIP_VERSION_STR)"
-+    COMMAND ${Python3_EXECUTABLE} -c "import PyQt5.sip; print(PyQt5.sip.SIP_VERSION_STR)"
-     RESULT_VARIABLE _process_status
-     OUTPUT_VARIABLE _process_output
-     OUTPUT_STRIP_TRAILING_WHITESPACE

devel/py-qstylizer/Makefile

@@ -29,7 +29,7 @@ USES=		pyqt:5 python:3.7+
 USE_GITHUB=	yes
 GH_ACCOUNT=	blambright
 
-USE_PYQT=	core widgets
+USE_PYQT=	pyqt5
 USE_PYTHON=	autoplist distutils
 
 MAKE_ENV=	PBR_VERSION=${PORTVERSION}

devel/py-qt5-core/Makefile

@@ -1,49 +0,0 @@
-PORTNAME=	core
-PORTREVISION=	2
-CATEGORIES=	devel python
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Python bindings for the Qt5 toolkit, QtCore module
-
-PYQT_MODULE=	QtCore
-CONFIGURE_ARGS=	${PYQT5_MODULES_ALL:N${PYQT_MODULE}:C/.*/--disable=&/} \
-		--enable=${PYQT_MODULE}
-
-PYQT_DIST=	yes
-
-USES=		python:3.5+ pyqt:5 qt:5
-USE_PYTHON=	concurrent flavors py3kplist
-USE_PYQT=	sip pysip
-USE_QT=		core buildtools_build qmake_build
-
-OPTIONS_DEFINE=	API DEBUG
-OPTIONS_DEFAULT=API
-OPTIONS_SUB=	yes
-
-API_DESC=		Install QtCore API for QScintilla2
-API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
-API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
-
-DEBUG_CONFIGURE_ON=	--debug --trace
-
-.include <bsd.port.pre.mk>
-
-PLIST_SUB+=	PYTHON_MAJOR_VER="${PYTHON_MAJOR_VER}"
-post-patch:
-	${RM} -r ${WRKSRC}/pyuic/uic/port_v2
-
-post-install:
-	${INSTALL_DATA} ${FILESDIR}/Qt.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5
-	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-		-f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
-		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5
-	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-		-f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
-		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5
-	# This Qt.so masks the Qt.py which is supposed to import
-	# all of the Qt submodules.
-	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/Qt.so
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtCore.so
-
-.include <bsd.port.post.mk>

devel/py-qt5-core/files/Qt.py

@@ -1,73 +0,0 @@
-# Replacement for the composite module PyQt5.Qt for FreeBSD
-# Provides namespace for all installed PyQt5 modules by importing them
-
-from PyQt5.QtCore import *
-
-try:
-    from PyQt5.QtGui import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtDBus import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtMultimedia import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtMultimediaWidgets import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtNetwork import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtOpenGL import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtPrintSupport import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtQml import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtSerialPort import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtSql import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtSvg import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtTest import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtWebKit import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtWebKitWidgets import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtWidgets import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtXml import *
-except ImportError:
-    pass
-try:
-    from PyQt5.QtXmlPatterns import *
-except ImportError:
-    pass

devel/py-qt5-core/files/patch-configure.py

@@ -1,211 +0,0 @@
-This patch is necessary for us to split PyQt5 up into several different ports.
-
-It works by conditionally building and installing some tools (such as
-pylupdate5 and pyrcc5), replacing the all-encompassing PyQt5.api file that
-depends on different modules with module-specific .api files.
-
-Also fixes a bug where dbus support drops multiple -I flags produced
-by pkg-config --cflags dbus-1 .
-
-Also fixes the build of www/py-qt5-webengine@py36 by adding printsupport to
-QtWebEngineWidgets.
-
-Also causes .pyi files to be installed regardless of the Python version to
-simplify plist handling.
---- configure.py.orig	2019-07-04 16:44:01 UTC
-+++ configure.py
-@@ -528,7 +528,7 @@ class TargetConfiguration:
-         self.no_pydbus = False
-         self.no_qml_plugin = False
-         self.no_tools = False
--        self.prot_is_public = (self.py_platform.startswith('linux') or self.py_platform == 'darwin')
-+        self.prot_is_public = (self.py_platform.startswith('linux') or self.py_platform.startswith('freebsd') or self.py_platform == 'darwin')
-         self.qmake = self._find_exe('qmake')
-         self.qmake_spec = ''
-         self.qmake_spec_default = ''
-@@ -799,7 +799,7 @@ class TargetConfiguration:
-         """
- 
-         # The platform may have changed so update the default.
--        if self.py_platform.startswith('linux') or self.py_platform == 'darwin':
-+        if self.py_platform.startswith('linux') or self.py_platform.startswith('freebsd') or self.py_platform == 'darwin':
-             self.prot_is_public = True
- 
-         self.vend_inc_dir = self.py_venv_inc_dir
-@@ -1494,8 +1494,9 @@ def generate_makefiles(target_config, verbose, parts, 
- 
-     # Add the internal modules if they are required.
-     if not target_config.no_tools:
-