22 files changed, 41 insertions, 37 deletions

diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile
index 82b27a528023..032ef33f63d5 100644
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@@ -12,8 +12,9 @@ CONFIGURE_ARGS=	--enable QtSql
 PYQT_DIST=	yes
 
 USES=		python pyqt:4
-USE_PYQT=	sip_build gui_run
-USE_QT4=	moc_build gui sql qmake_build
+USE_PYQT=	sip_build core_run gui_run
+USE_QT4=	corelib gui sql \
+		moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile
index 22451a5bf90f..0df678401a1e 100644
--- a/devel/py-qt4-assistant/Makefile
+++ b/devel/py-qt4-assistant/Makefile
@@ -12,8 +12,9 @@ CONFIGURE_ARGS=	--enable QtAssistant
 PYQT_DIST=	yes
 
 USES=		python pyqt:4
-USE_PYQT=	sip_build gui_run network_run
-USE_QT4=	assistantclient moc_build qmake_build
+USE_PYQT=	sip_build core_run
+USE_QT4=	assistantclient corelib gui network \
+		moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile
index dc85de1c1ef3..4eb381a83536 100644
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@@ -13,7 +13,7 @@ PYQT_DIST=		yes
 
 USES=			python pyqt:4
 USE_PYTHON=		py3kplist
-USE_PYQT=		sip
+USE_PYQT=		sip_build
 USE_QT4=		corelib qmake_build moc_build
 
 OPTIONS_DEFINE=	API DEBUG
diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile
index 293ddcf7407b..976278a10700 100644
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@@ -13,7 +13,7 @@ PYQT_DIST=	yes
 
 USES=		python pyqt:4
 USE_PYQT=	sip_build core_run
-USE_QT4=	dbus moc_build qmake_build
+USE_QT4=	corelib dbus moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile
index 4570088ef23b..f3d663ed0f0b 100644
--- a/devel/py-qt4-declarative/Makefile
+++ b/devel/py-qt4-declarative/Makefile
@@ -10,8 +10,9 @@ CONFIGURE_ARGS=	--enable QtDeclarative
 PYQT_DIST=	yes
 
 USES=		python pyqt:4
-USE_PYQT=	sip_build gui_run network_run
-USE_QT4=	declarative qmake_build moc_build
+USE_PYQT=	sip_build core_run gui_run network_run
+USE_QT4=	corelib declarative gui network script sql svg xmlpatterns \
+		qmake_build moc_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile
index 3ddb7b1f9ddd..44b0d528eb1b 100644
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@@ -12,8 +12,8 @@ CONFIGURE_ARGS=	--enable QtDesigner --no-designer-plugin
 PYQT_DIST=	yes
 
 USES=		python pyqt:4
-USE_PYQT=	sip_build gui_run script_run xml_run
-USE_QT4=	gui xml designer moc_build qmake_build
+USE_PYQT=	sip_build core_run gui_run
+USE_QT4=	corelib designer gui moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile
index 7755ee85b6e1..b6d74e49aba1 100644
--- a/devel/py-qt4-designerplugin/Makefile
+++ b/devel/py-qt4-designerplugin/Makefile
@@ -16,8 +16,8 @@ CONFIGURE_ARGS=	--enable QtDesigner
 PYQT_DIST=	yes
 
 USES=		python pyqt:4
-USE_PYQT=	sip_build designer_run
-USE_QT4=	gui xml designer moc_build qmake_build
+USE_PYQT=	sip_build
+USE_QT4=	corelib designer gui script xml moc_build qmake_build
 
 OPTIONS_DEFINE=		DEBUG
 DEBUG_CONFIGURE_ON=	--debug --trace
diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile
index 306cfdc90ba8..03c6e732c21b 100644
--- a/devel/py-qt4-help/Makefile
+++ b/devel/py-qt4-help/Makefile
@@ -10,8 +10,8 @@ CONFIGURE_ARGS=	--enable QtHelp
 PYQT_DIST=	yes
 
 USES=		python pyqt:4
-USE_PYQT=	sip_build gui_run
-USE_QT4=	help moc_build qmake_build
+USE_PYQT=	sip_build core_run gui_run
+USE_QT4=	corelib gui help network sql moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile
index 91affa7b776f..63b527bd6cbc 100644
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@@ -22,7 +22,7 @@ QT_NONSTANDARD=	yes  # Do not add unknown arguments to CONFIGURE_ARGS.
 
 USES=		python pyqt:4
 USE_PYQT=	sip core gui
-USE_QT4=	gui moc_build qmake_build
+USE_QT4=	corelib gui moc_build qmake_build
 
 OPTIONS_DEFINE=		DEBUG
 DEBUG_CONFIGURE_ON=	--debug --trace
diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile
index 6b14fba9774c..420d33826d25 100644
--- a/devel/py-qt4-script/Makefile
+++ b/devel/py-qt4-script/Makefile
@@ -13,7 +13,7 @@ PYQT_DIST=	yes
 
 USES=		python pyqt:4
 USE_PYQT=	sip_build core_run
-USE_QT4=	moc_build script qmake_build
+USE_QT4=	corelib script moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile
index b9cd16dc014f..2d78cd589cd7 100644
--- a/devel/py-qt4-scripttools/Makefile
+++ b/devel/py-qt4-scripttools/Makefile
@@ -11,8 +11,8 @@ CONFIGURE_ARGS=	--enable QtScriptTools
 PYQT_DIST=	yes
 
 USES=		python pyqt:4
-USE_PYQT=	sip_build core_run
-USE_QT4=	moc_build scripttools qmake_build
+USE_PYQT=	sip_build core_run gui_run script_run
+USE_QT4=	corelib gui script scripttools moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile
index d84981c26f89..96470d6182b9 100644
--- a/devel/py-qt4-test/Makefile
+++ b/devel/py-qt4-test/Makefile
@@ -12,8 +12,8 @@ CONFIGURE_ARGS=	--enable QtTest
 PYQT_DIST=	yes
 
 USES=		python pyqt:4
-USE_PYQT=	sip_build gui_run
-USE_QT4=	moc_build gui qtestlib qmake_build
+USE_PYQT=	sip_build core_run gui_run
+USE_QT4=	corelib gui qtestlib moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile
index 027ddf5942e1..f19864a8ab81 100644
--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/Makefile
@@ -12,8 +12,8 @@ CONFIGURE_ARGS=	--enable QtSvg
 PYQT_DIST=	yes
 
 USES=		python pyqt:4
-USE_PYQT=	sip_build gui_run
-USE_QT4=	moc_build svg qmake_build
+USE_PYQT=	sip_build core_run gui_run
+USE_QT4=	corelib gui svg moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile
index df55497416f7..6bf583f6ce3b 100644
--- a/misc/py-qt4-demo/Makefile
+++ b/misc/py-qt4-demo/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	demo
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	misc devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
diff --git a/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile
index f1a240f0c2b1..ce2dc0ae7114 100644
--- a/multimedia/py-qt4-multimedia/Makefile
+++ b/multimedia/py-qt4-multimedia/Makefile
@@ -11,8 +11,8 @@ CONFIGURE_ARGS=	--enable QtMultimedia
 PYQT_DIST=	yes
 
 USES=		python pyqt:4
-USE_PYQT=	sip_build gui_run
-USE_QT4=	moc_build multimedia qmake_build
+USE_PYQT=	sip_build core_run gui_run
+USE_QT4=	corelib gui multimedia moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile
index 8034fca6f405..2b729f666f61 100644
--- a/multimedia/py-qt4-phonon/Makefile
+++ b/multimedia/py-qt4-phonon/Makefile
@@ -10,8 +10,8 @@ CONFIGURE_ARGS=	--enable phonon
 PYQT_DIST=	yes
 
 USES=		python pyqt:4
-USE_PYQT=	sip_build core_run
-USE_QT4=	moc_build phonon qmake_build
+USE_PYQT=	sip_build core_run gui_run
+USE_QT4=	corelib gui phonon moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile
index 73cf3020a1b3..e5668ee45fc3 100644
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@@ -13,7 +13,7 @@ PYQT_DIST=	yes
 
 USES=		python pyqt:4
 USE_PYQT=	sip_build core_run
-USE_QT4=	moc_build network qmake_build
+USE_QT4=	moc_build corelib network qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile
index 77e4215503a5..ed8fa0367fca 100644
--- a/textproc/py-qt4-xml/Makefile
+++ b/textproc/py-qt4-xml/Makefile
@@ -13,7 +13,7 @@ PYQT_DIST=	yes
 
 USES=		python pyqt:4
 USE_PYQT=	sip_build core_run
-USE_QT4=	xml qmake_build moc_build
+USE_QT4=	corelib xml moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/textproc/py-qt4-xmlpatterns/Makefile b/textproc/py-qt4-xmlpatterns/Makefile
index 27af639456b2..ef68ab5e43f5 100644
--- a/textproc/py-qt4-xmlpatterns/Makefile
+++ b/textproc/py-qt4-xmlpatterns/Makefile
@@ -11,8 +11,8 @@ CONFIGURE_ARGS=	--enable QtXmlPatterns
 PYQT_DIST=	yes
 
 USES=		python pyqt:4
-USE_PYQT=	sip_build xml_run
-USE_QT4=	moc_build xmlpatterns qmake_build
+USE_PYQT=	sip_build core_run network_run
+USE_QT4=	corelib network xmlpatterns moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/www/py-qt4-webkit/Makefile b/www/py-qt4-webkit/Makefile
index 276613cbddcb..600b179db076 100644
--- a/www/py-qt4-webkit/Makefile
+++ b/www/py-qt4-webkit/Makefile
@@ -11,8 +11,9 @@ CONFIGURE_ARGS=	--enable QtWebKit
 PYQT_DIST=	yes
 
 USES=		python pyqt:4
-USE_PYQT=	sip_build gui_run
-USE_QT4=	qmake_build gui moc_build network webkit
+USE_PYQT=	sip_build core_run gui_run network_run
+USE_QT4=	corelib gui network webkit \
+		moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile
index bfe8adfee4cd..8dea42d43525 100644
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@@ -13,8 +13,8 @@ PYQT_DIST=	yes
 
 USES=		python pyqt:4
 USE_PYQT=	sip_build core_run
-USE_QT4=	gui imageformats_run inputmethods_run iconengines_run \
-		qmake_build moc_build
+USE_QT4=	corelib gui imageformats_run inputmethods_run iconengines_run \
+		moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile
index ba6dc97aab65..43c474d40956 100644
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@@ -12,8 +12,9 @@ CONFIGURE_ARGS=	--enable QtOpenGL
 PYQT_DIST=	yes
 
 USES=		python pyqt:4
-USE_PYQT=	sip_build gui_run
-USE_QT4=	moc_build opengl qmake_build
+USE_GL=		gl
+USE_PYQT=	sip_build core_run gui_run
+USE_QT4=	corelib gui opengl moc_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API