Introduce USE="designer".

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

3 files changed, 18 insertions, 11 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index fa2c2ceb7ba8..2bbe48b50b73 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.246 2013/12/25 19:53:54 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.247 2013/12/25 21:00:36 pesa Exp $
+
+*PyQt4-4.10.3-r2 (25 Dec 2013)
+
+  25 Dec 2013; Davide Pesavento <pesa@gentoo.org> +PyQt4-4.10.3-r2.ebuild,
+  -PyQt4-4.10.3-r1.ebuild, metadata.xml:
+  Introduce USE="designer".
 
   25 Dec 2013; Davide Pesavento <pesa@gentoo.org> -PyQt4-4.9.6-r2.ebuild:
   old
diff --git a/dev-python/PyQt4/PyQt4-4.10.3-r1.ebuild b/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild
index 6a4b59da622a..aac0b2f2ef1a 100644
--- a/dev-python/PyQt4/PyQt4-4.10.3-r1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.3-r1.ebuild,v 1.2 2013/10/31 13:47:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild,v 1.1 2013/12/25 21:00:36 pesa Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
-inherit eutils qt4-r2 python-r1 toolchain-funcs
+inherit eutils python-r1 qmake-utils toolchain-funcs
 
 DESCRIPTION="Python bindings for the Qt toolkit"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
@@ -22,10 +22,11 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="X dbus debug declarative doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns"
+IUSE="X dbus debug declarative designer doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	declarative? ( X )
+	designer? ( X )
 	help? ( X )
 	multimedia? ( X )
 	opengl? ( X )
@@ -46,7 +47,6 @@ RDEPEND="
 	>=dev-qt/qtcore-${QT_PV}
 	X? (
 		>=dev-qt/qtgui-${QT_PV}
-		|| ( dev-qt/designer:4 <dev-qt/qtgui-4.8.5:4 )
 		>=dev-qt/qttest-${QT_PV}
 	)
 	dbus? (
@@ -54,6 +54,7 @@ RDEPEND="
 		>=dev-qt/qtdbus-${QT_PV}
 	)
 	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
+	designer? ( || ( dev-qt/designer:4 <dev-qt/qtgui-4.8.5:4 ) )
 	help? ( >=dev-qt/qthelp-${QT_PV} )
 	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
 	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
@@ -74,8 +75,6 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	qt4-r2_src_prepare
-
 	# Support qreal on arm architecture (bug 322349).
 	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
 
@@ -120,11 +119,11 @@ src_configure() {
 			--enable=QtCore
 			--enable=QtNetwork
 			--enable=QtXml
-			$(pyqt4_use_enable X QtDesigner) $(use X || echo --no-designer-plugin)
 			$(pyqt4_use_enable X QtGui)
 			$(pyqt4_use_enable X QtTest)
 			$(pyqt4_use_enable dbus QtDBus)
 			$(pyqt4_use_enable declarative)
+			$(pyqt4_use_enable designer) $(use designer || echo --no-designer-plugin)
 			$(pyqt4_use_enable help)
 			$(pyqt4_use_enable multimedia)
 			$(pyqt4_use_enable opengl QtOpenGL)
@@ -154,9 +153,10 @@ src_configure() {
 
 		local mod
 		for mod in QtCore \
-				$(use X && echo QtDesigner QtGui) \
+				$(use X && echo QtGui) \
 				$(use dbus && echo QtDBus) \
 				$(use declarative && echo QtDeclarative) \
+				$(use designer && echo QtDesigner) \
 				$(use opengl && echo QtOpenGL); do
 			# Run eqmake4 inside the qpy subdirectories to respect
 			# CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping.
@@ -170,7 +170,7 @@ src_configure() {
 		done
 
 		# Avoid stripping of libpythonplugin.so.
-		if use X; then
+		if use designer; then
 			pushd designer > /dev/null || return
 			eqmake4 python.pro
 			popd > /dev/null || return
diff --git a/dev-python/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml
index 8d6135d9394d..8dfc9b4c9fdd 100644
--- a/dev-python/PyQt4/metadata.xml
+++ b/dev-python/PyQt4/metadata.xml
@@ -4,8 +4,9 @@
 	<herd>qt</herd>
 	<herd>python</herd>
 	<use>
-		<flag name="X">Build QtGui, QtDesigner and QtScriptTools modules</flag>
+		<flag name="X">Build QtGui and QtTest modules</flag>
 		<flag name="declarative">Build QtDeclarative module</flag>
+		<flag name="designer">Build QtDesigner module</flag>
 		<flag name="help">Build QtHelp module</flag>
 		<flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon variant (needed for KDE)</flag>
 		<flag name="multimedia">Build QtMultimedia module</flag>