svn commit: r433310 - in head: comms/gnuradio devel/hgview devel/ninja-ide devel/qbzr devel/qct devel/tortoisehg editors/leo finance/bitcoin-armory finance/electrum games/anki games/py-mnemosyne gr...

Sat Feb 4 13:37:19 UTC 2017

Author: tcberner
Date: Sat Feb  4 13:37:15 2017
New Revision: 433310
URL: https://svnweb.freebsd.org/changeset/ports/433310

Log:
  Switch ports to use USE_PYQT=<foo> instead of using RUN_- and BUILD_DEPENDS
  
  pyqt.mk provides USE_PYQT=<list> to depend on its components. Convert the ports
  not yet using it to it.
  
  Reviewed by:	rakuco, mat
  Approved by:	rakuco (mentor)
  Differential Revision:	https://reviews.freebsd.org/D9261

Modified:
  head/comms/gnuradio/Makefile
  head/devel/hgview/Makefile
  head/devel/ninja-ide/Makefile
  head/devel/qbzr/Makefile
  head/devel/qct/Makefile
  head/devel/tortoisehg/Makefile
  head/editors/leo/Makefile
  head/finance/bitcoin-armory/Makefile
  head/finance/electrum/Makefile
  head/games/anki/Makefile
  head/games/py-mnemosyne/Makefile
  head/graphics/py-poppler-qt4/Makefile
  head/graphics/qgis/Makefile
  head/math/py-matplotlib/Makefile
  head/multimedia/py-openlp/Makefile
  head/net-p2p/bitmessage/Makefile
  head/print/hplip/Makefile
  head/science/ncs/Makefile
  head/science/veusz/Makefile
  head/security/py-yara-editor/Makefile
  head/www/linkchecker/Makefile

Modified: head/comms/gnuradio/Makefile
==============================================================================

--- head/comms/gnuradio/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/comms/gnuradio/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -15,7 +15,6 @@ BUILD_DEPENDS=	sdl-config:devel/sdl12 \
 		swig2.0:devel/swig20 \
 		cheetah:devel/py-cheetah \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}qt4>0:devel/py-qt4 \
 		xdg-open:devel/xdg-utils \
 		guile:lang/guile \
 		aconnect:audio/alsa-utils \
@@ -41,7 +40,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 # volk/lib/volk_cpu.c: In function 'i_can_has_3dnow':
 # volk/lib/volk_cpu.c:62: error: can't find a register in class 'BREG' while reloading 'asm'
 # volk/lib/volk_cpu.c:62: error: 'asm' operand has impossible constraints
-USES=		cmake:outsource compiler:c11 iconv perl5 pkgconfig python:2.7 shebangfix
+USES=		cmake:outsource compiler:c11 iconv perl5 pkgconfig pyqt:4 python:2.7 shebangfix
 SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in
 CMAKE_ARGS+=	-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"\
 		-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
@@ -54,6 +53,7 @@ CMAKE_ARGS+=	-DSWIG_EXECUTABLE:STRING="$
 MAJOR_SUB_VER=	${PORTVERSION}
 DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
 USE_GNOME=	pygtk2
+USE_PYQT=	core gui opengl
 USE_WX=		3.0+
 USE_QT4=	corelib gui xml qmake moc rcc uic
 WX_COMPS=	wx wx:build wx:run python:build python:run

Modified: head/devel/hgview/Makefile
==============================================================================
--- head/devel/hgview/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/devel/hgview/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -13,8 +13,6 @@ COMMENT=	Fast Mercurial log navigator wr
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	hg:devel/mercurial \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>0:x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>0:devel/py-qt4-qscintilla2 \
 		${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils
 BUILD_DEPENDS=	hg:devel/mercurial \
@@ -23,8 +21,9 @@ BUILD_DEPENDS=	hg:devel/mercurial \
 		asciidoc:textproc/asciidoc
 
 NO_ARCH=	yes
+USES=		gmake pyqt:4 python:2
+USE_PYQT=	gui_run qscintilla2_run
 USE_PYTHON=	distutils
-USES=		gmake python:2
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS

Modified: head/devel/ninja-ide/Makefile
==============================================================================
--- head/devel/ninja-ide/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/devel/ninja-ide/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -13,13 +13,8 @@ COMMENT=	Cross-platform integrated devel
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5,1:net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.8.5:www/py-qt4-webkit
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-declarative>=4.10.2:devel/py-qt4-declarative \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5,1:net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.8.5:www/py-qt4-webkit
-
-USES=		python:2
+USES=		pyqt:4 python:2
+USE_PYQT=	declarative_run network  webkit
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes

Modified: head/devel/qbzr/Makefile
==============================================================================
--- head/devel/qbzr/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/devel/qbzr/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -14,16 +14,16 @@ COMMENT=	Qt interface for bzr
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	bzr:devel/bzr \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4 \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \
 		${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant
 RUN_DEPENDS=	bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USES=		gettext pyqt:4 python
+USE_PYQT=	core
 USE_PYTHON=	distutils autoplist
 USE_QT4=	# empty
-USES=		gettext python
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>

Modified: head/devel/qct/Makefile
==============================================================================
--- head/devel/qct/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/devel/qct/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -13,10 +13,8 @@ COMMENT=	QCT GUI commit tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui
-
-USES=		python
+USES=		pyqt:4 python
+USE_PYQT=	gui
 USE_PYTHON=	distutils
 WRKSRC=		${WRKDIR}/qct
 

Modified: head/devel/tortoisehg/Makefile
==============================================================================
--- head/devel/tortoisehg/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/devel/tortoisehg/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -13,16 +13,7 @@ COMMENT=	THg script from TortoiseHG
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.11.4:devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.9.1:devel/py-qt4-qscintilla2 \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.11.4:net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.11.4:x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.11.4:textproc/py-qt4-xml
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.11.4:devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.9.1:devel/py-qt4-qscintilla2 \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.11.4:net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.11.4:x11-toolkits/py-qt4-gui \
-		hg:devel/mercurial \
+RUN_DEPENDS=	hg:devel/mercurial \
 		${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse \
 		pygmentize:textproc/py-pygments
 
@@ -30,7 +21,8 @@ OPTIONS_DEFINE=	NAUTILUS NLS
 NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
 OPTIONS_SUB=	yes
 
-USES=		python:2.7
+USES=		pyqt:4 python:2.7
+USE_PYQT=	core gui network qscintilla2 xml
 NLS_USES=	gettext
 
 INSTALLS_ICONS=	yes

Modified: head/editors/leo/Makefile
==============================================================================
--- head/editors/leo/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/editors/leo/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -15,15 +15,14 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}qt4-svg>0:graphics/py-qt4-svg \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \
-		silvercity>0:textproc/silvercity \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>0:x11-toolkits/py-qt4-gui
+		silvercity>0:textproc/silvercity
 
 NO_ARCH=	yes
 
-USES=		python:2 shebangfix zip
+USES=		pyqt:4 python:2 shebangfix zip
 SHEBANG_FILES=	leo/doc/html/fixup.pl leo/external/saveleo
+USE_PYQT=	gui_run svg_run
 USE_PYTHON=	autoplist distutils
 
 DESKTOP_ENTRIES="Leo" "Literate Editor with Outlines" \

Modified: head/finance/bitcoin-armory/Makefile
==============================================================================
--- head/finance/bitcoin-armory/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/finance/bitcoin-armory/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -15,16 +15,15 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${LOCALBASE}/bin/swig3.0:devel/swig30 \
 		${LOCALBASE}/bin/pyrcc4:textproc/py-qt4-xml \
 		${LOCALBASE}/bin/rsync:net/rsync
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}twistedCore>=14.0.0:devel/py-twistedCore \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedCore>=14.0.0:devel/py-twistedCore \
 		${PYTHON_PKGNAMEPREFIX}psutil>1.2.1:sysutils/py-psutil \
 		${LOCALBASE}/bin/bitcoind:net-p2p/bitcoin-daemon
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	etotheipi
 
-USES=		compiler:c++11-lang compiler:c++11-lib gmake python:2 shebangfix
+USES=		compiler:c++11-lang compiler:c++11-lib gmake pyqt:4 python:2 shebangfix
+USE_PYQT=	core_run gui_run
 SHEBANG_FILES=	extras/extractKeysFromWallet.py
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Modified: head/finance/electrum/Makefile
==============================================================================
--- head/finance/electrum/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/finance/electrum/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -16,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/LICENCE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}slowaes>0:security/py-slowaes \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.10.3:x11-toolkits/py-qt4-gui \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \
 		${PYTHON_PKGNAMEPREFIX}qrcode>=5.1:textproc/py-qrcode \
 		${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.6:security/py-tlslite \
@@ -25,7 +24,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}slow
 		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython \
 		${PYTHON_PKGNAMEPREFIX}jsonrpclib>0:devel/py-jsonrpclib
 
-USES=		desktop-file-utils python:-2.7
+USES=		desktop-file-utils pyqt:4 python:-2.7
+USE_PYQT=	gui_run
 USE_PYTHON=	autoplist distutils
 PYDISTUTILS_PKGNAME=	Electrum
 NO_ARCH=	yes

Modified: head/games/anki/Makefile
==============================================================================
--- head/games/anki/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/games/anki/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -19,14 +19,13 @@ RUN_DEPENDS=	lame:audio/lame \
 		${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.4:net/py-qt4-network \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32 \
 		${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2 \
-		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.4:www/py-qt4-webkit \
 		${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash
 
-USES=		desktop-file-utils python:2 shared-mime-info shebangfix tar:tgz
+USES=		desktop-file-utils pyqt:4 python:2 shared-mime-info shebangfix tar:tgz
 SHEBANG_FILES=	tools/build_ui.sh tools/tests.sh
+USE_PYQT=	network_run webkit_run
 USE_QT4=	network_run webkit_run
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes

Modified: head/games/py-mnemosyne/Makefile
==============================================================================
--- head/games/py-mnemosyne/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/games/py-mnemosyne/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -15,16 +15,13 @@ COMMENT=	Flash-card tool which optimises
 
 LICENSE=	LGPL3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-sql>=4.5:databases/py-qt4-sql \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.5:net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.5:www/py-qt4-webkit \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.5:x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.2.0:math/py-matplotlib \
 		${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2:www/py-cherrypy \
 		${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob
 
-USES=		fortran python
+USES=		fortran pyqt:4 python
+USE_PYQT=	gui_run network_run sql_run webkit_run
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 

Modified: head/graphics/py-poppler-qt4/Makefile
==============================================================================
--- head/graphics/py-poppler-qt4/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/graphics/py-poppler-qt4/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -14,14 +14,10 @@ COMMENT=	Python bindings for the Poppler
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	sip:devel/py-sip \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:textproc/py-qt4-xml
 LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:textproc/py-qt4-xml
 
-USES=		pkgconfig python
+USES=		pkgconfig pyqt:4 python
+USE_PYQT=	gui xml sip_build
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>

Modified: head/graphics/qgis/Makefile
==============================================================================
--- head/graphics/qgis/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/graphics/qgis/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -29,7 +29,9 @@ USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME:tu}
 
 USES=		bison cmake cpe desktop-file-utils execinfo fortran \
-		gmake python:2.7 sqlite
+		gmake pyqt:4 python:2.7 sqlite
+USE_PYQT=	core gui network qscintilla2 sip sql svg xml webkit_run
+
 USE_QT4=	corelib designer doc gui linguist_build moc_build \
 		network qmake_build rcc_build script sql sql-pgsql \
 		sql-sqlite3 svg testlib uic_build webkit xml
@@ -99,15 +101,7 @@ PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPR
 			${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments \
 			${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \
 			${PYTHON_PKGNAMEPREFIX}pytz>=2016.6.1,1:devel/py-pytz \
-			${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:devel/py-qt4-core \
-			${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:x11-toolkits/py-qt4-gui \
-			${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:net/py-qt4-network \
-			${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.8.3:devel/py-qt4-qscintilla2 \
-			${PYTHON_PKGNAMEPREFIX}qt4-sql>=4.11.3:databases/py-qt4-sql \
-			${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:graphics/py-qt4-svg \
-			${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:textproc/py-qt4-xml \
 			${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
-			${PYTHON_PKGNAMEPREFIX}sip>=4.14.6:devel/py-sip \
 			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
 			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:databases/py-sqlite3 \
 			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
@@ -124,16 +118,7 @@ PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREF
 			${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments \
 			${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \
 			${PYTHON_PKGNAMEPREFIX}pytz>=2016.6.1,1:devel/py-pytz \
-			${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:devel/py-qt4-core \
-			${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:x11-toolkits/py-qt4-gui \
-			${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:net/py-qt4-network \
-			${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.8.3:devel/py-qt4-qscintilla2 \
-			${PYTHON_PKGNAMEPREFIX}qt4-sql>=4.11.3:databases/py-qt4-sql \
-			${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:graphics/py-qt4-svg \
-			${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.11.1:www/py-qt4-webkit \
-			${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:textproc/py-qt4-xml \
 			${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
-			${PYTHON_PKGNAMEPREFIX}sip>=4.14.6:devel/py-sip \
 			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
 			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:databases/py-sqlite3 \
 			${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \

Modified: head/math/py-matplotlib/Makefile
==============================================================================
--- head/math/py-matplotlib/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/math/py-matplotlib/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -44,13 +44,13 @@ GTKAGGBACKEND_USE=	GNOME=gtk20,pygtk2,ca
 GTKAGGBACKEND_VARS=	GTKAGG_BACKEND=True
 GTKAGGBACKEND_VARS_OFF=	GTKAGG_BACKEND=False
 QT4AGGBACKEND_DESC=	Qt4Agg backend support
-QT4AGGBACKEND_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:x11-toolkits/py-qt4-gui
-QT4AGGBACKEND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:x11-toolkits/py-qt4-gui
+QT4AGGBACKEND_USES=	pyqt:4
+QT4AGGBACKEND_USE=	PYQT=gui
 QT4AGGBACKEND_VARS=	QT4AGG_BACKEND=True
 QT4AGGBACKEND_VARS_OFF=	QT4AGG_BACKEND=False
 QT5AGGBACKEND_DESC=	Qt5Agg backend support
-QT5AGGBACKEND_BUILD_DEPENDS= 	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:devel/py-sip ${PYTHON_PKGNAMEPREFIX}qt5-widgets>=5.5.1:x11-toolkits/py-qt5-widgets
-QT5AGGBACKEND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:devel/py-sip ${PYTHON_PKGNAMEPREFIX}qt5-widgets>=5.5.1:x11-toolkits/py-qt5-widgets
+QT5AGGBACKEND_USES=	pyqt:5
+QT5AGGBACKEND_USE=	PYQT=sip,widgets
 QT5AGGBACKEND_VARS=	QT5AGG_BACKEND=True
 QT5AGGBACKEND_VARS_OFF=	QT5AGG_BACKEND=False
 TKAGGBACKEND_DESC=	TKAgg backend support

Modified: head/multimedia/py-openlp/Makefile
==============================================================================
--- head/multimedia/py-openlp/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/multimedia/py-openlp/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -13,21 +13,11 @@ COMMENT=	Open Source Lyrics Projection
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32 \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-phonon>=0:multimedia/py-qt4-phonon \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10 \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:www/py-qt4-webkit \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-opengl>=0:x11/py-qt4-opengl \
-		${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:graphics/py-qt4-svg \
-		${PYTHON_PKGNAMEPREFIX}qt4-test>=0:devel/py-qt4-test \
 		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet \
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \
 		${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant \
@@ -35,7 +25,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beau
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
 		unoconv:textproc/unoconv
 
-USES=		desktop-file-utils python
+USES=		desktop-file-utils pyqt:4 python
+USE_PYQT=	core gui \
+		network_run opengl_run phonon_run svg_run test_run webkit_run
 USE_PYTHON=	distutils autoplist
 USE_GSTREAMER=	good bad ugly
 USE_QT4=	linguist phonon-gst

Modified: head/net-p2p/bitmessage/Makefile
==============================================================================
--- head/net-p2p/bitmessage/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/net-p2p/bitmessage/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -13,16 +13,14 @@ COMMENT=	Secure P2P communications clien
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=${PYQT4_VERSION}:net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:x11-toolkits/py-qt4-gui
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Bitmessage
 GH_PROJECT=	PyBitmessage
 
 USES=		python pyqt:4 ssl
+USE_PYQT=	core_run gui_run network_run
 NATIVE_POW_USES=gmake
 INSTALLS_ICONS=	yes
 

Modified: head/print/hplip/Makefile
==============================================================================
--- head/print/hplip/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/print/hplip/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -82,8 +82,8 @@ SCAN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX
 SCAN_CONFIGURE_ENABLE=	scan-build
 
 X11_DESC=		Graphical User Interface (Qt 4)
-X11_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
-			${PYTHON_PKGNAMEPREFIX}qt4-dbussupport>=0:devel/py-qt4-dbussupport
+X11_USES=		pyqt:4
+X11_USE=		PYQT=dbussupport_run,gui_run
 X11_CONFIGURE_ENABLE=	qt4 gui-build
 
 XSANE_DESC=		Install XSane for scanning (implies SCAN)

Modified: head/science/ncs/Makefile
==============================================================================
--- head/science/ncs/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/science/ncs/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -12,8 +12,7 @@ COMMENT=	Code_Saturne Kernel
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4	\
-		cs_preprocess:science/ecs	\
+BUILD_DEPENDS=	cs_preprocess:science/ecs	\
 		pyrcc4:textproc/py-qt4-xml
 LIB_DEPENDS=	libfvm.so:science/fvm	\
 		libmei.so:science/mei
@@ -22,8 +21,9 @@ RUN_DEPENDS=	xmgrace:math/grace	\
 		xterm:x11/xterm	\
 		cs_preprocess:science/ecs
 
-USES=		fortran gettext gmake iconv libtool python shebangfix
+USES=		fortran gettext gmake iconv libtool pyqt:4 python shebangfix
 USE_GNOME=	libxml2
+USE_PYQT=	core
 SHEBANG_FILES=	bin/runcase.in
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
 GNU_CONFIGURE=	yes

Modified: head/science/veusz/Makefile
==============================================================================
--- head/science/veusz/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/science/veusz/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -12,12 +12,11 @@ COMMENT=	Scientific plotting package
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-svg>0:graphics/py-qt4-svg
+RUN_DEPENDS=	${PYNUMPY}
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-USES=		python
+USES=		pyqt:4 python
+USE_PYQT=	gui svg
 USE_PYTHON=	distutils autoplist
 
 post-patch:

Modified: head/security/py-yara-editor/Makefile
==============================================================================
--- head/security/py-yara-editor/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/security/py-yara-editor/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -15,11 +15,10 @@ LICENSE=	GPLv3
 
 BROKEN=		Unfetchable (google code has gone away)
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara
 
-USES=		python:2
+USES=		pyqt:4 python:2
+USE_PYQT=	core_run gui_run
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	DOCS

Modified: head/www/linkchecker/Makefile
==============================================================================
--- head/www/linkchecker/Makefile	Sat Feb  4 13:09:36 2017	(r433309)
+++ head/www/linkchecker/Makefile	Sat Feb  4 13:37:15 2017	(r433310)
@@ -37,12 +37,8 @@ LOGIN_DESC=		Login form submission
 LOGIN_RUN_DEPENDS=	twill>=0:www/twill
 NLS_USES=		gettext
 QT4_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-noqt-setup.py
-QT4_RUN_DEPENDS=\
-		${PYTHON_PKGNAMEPREFIX}qt4-sql>=${PYQT_VERSION}:databases/py-qt4-sql \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT_VERSION}:devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT_VERSION}:x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-help>=${PYQT4_VERSION}:devel/py-qt4-help \
-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=${QSCI2_VERSION}:devel/py-qt4-qscintilla2
+QT4_USES=		pyqt:4
+QT4_USE=		PYQT=core_run,gui_run,help_run,qscintilla2_run,sql_run
 SQLITE3_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 SYNTAX_DESC=		HTML/CSS syntax check
 SYNTAX_RUN_DEPENDS=\
