Introduce USE="designer".

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

4 files changed, 34 insertions, 27 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/Manifest b/dev-python/PyQt4/Manifest
index 4b8ef253a44e..9e3ff097ac56 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -5,24 +5,24 @@ AUX PyQt4-4.7.3-qreal_float_support.patch 6460 SHA256 8183d7a12c094d02eb4f1ac2b9
 DIST PyQt-x11-gpl-4.10.2.tar.gz 11280941 SHA256 747cf2fe285ef050d891bbbbfa213a380583d464a085906ef525058c154be6fe SHA512 6600b87e55f5a8fa0e41549f08d7639baec3ac9ffe14d6b141d808b14f672676abf872a48a300491a9b24eb5a14299f636a71bda246bb63cdb38d5afcd64b6d1 WHIRLPOOL e6822894d68e22be16600bd1c9f1d1d7a04a2170d31651cacd04f184754f2f050aeed8eb8c0c797282334751f488786b17c361871d0580ca222796064c16c5ca
 DIST PyQt-x11-gpl-4.10.3.tar.gz 11187362 SHA256 a713bebef394213b2c9e1fe0cad5699b869dc356bba50766e069013eba8bf630 SHA512 4edd3539e1855bc3358dcba866433e53d4b9444b867c14cc27115cf5a6c123b0af3bb0bae3085f6d71a31f0b6716da40809ac4ffcaaff415673ed7462f1a0420 WHIRLPOOL 675e324993e8f9a3b2a0a8975c9f1e2af9cd315073a68e6649a8de04e8e8a905d756be2c138a8c19b4ec16a75c7b118b32a3ffc27f8399953599a1b88ac76fad
 EBUILD PyQt4-4.10.2.ebuild 5491 SHA256 719b225c0f96ae55b6187c3f72d4faaed6a889022e50741cb994f097673f557f SHA512 520615503d6f707fa4f8d3c4d4c33a7ed0c34ed789fa79798910f4002d7946f19a774a61595d0a14459beb2160ebeced97c7ce3eacbd3157def77b8c5dbc87f2 WHIRLPOOL d890bfa007451b790b2397593ef82bb7717e32c08cf977b59c1dfde506c794050d72e67c13dd708c6d50a5ac578d9d854fb8a7ad916e84d37aa26cc0e79ec0e3
-EBUILD PyQt4-4.10.3-r1.ebuild 5607 SHA256 b13b1e9dd56d1c9b131498109e0f5ca90798844d4bc1616fea8936dff3098fd9 SHA512 7baea8d330b7a51623c4c1fefa17247778c26969967b6433527121fb9595694095111b8cb0b8bdfb59662864a03598befa8caede909d3fd7ef77a82629f9da1d WHIRLPOOL c82c73efe83656abdfade25fa1205a0331155536d408049c48ff1ddde7ef62b33b28388a60c4020e19905494ad6a226235bf6144a178a8c4de1da20e4b1e19c5
+EBUILD PyQt4-4.10.3-r2.ebuild 5668 SHA256 ecc344461ca72f09b6118aa456a9fbb6c0c2cb8fd16de961cfbb54f968cc1819 SHA512 6108645394e36e6f3cbee833ee5ad608bac318ef58cddc56871c70f7cf59d7d84b9eabde90fc34ab87ce25d44282ef6f53d05057037511a7d158a9b546edff3a WHIRLPOOL ffab403883e5ca16934b7f595a1b173b6809919a975b003c0c0f2b123240ab64ea67b47bc85523697dd24650abd58ca20dc401e2c24d885c046da6aea41d8975
 EBUILD PyQt4-4.10.3.ebuild 5501 SHA256 80b997238e82e9a0a5717e88e2b1dc9c19d47f1b81d3de87a15c88fd6b046d5a SHA512 11c525c6e961ad6774810c64f5d7c23c2ba6dd59856da8e4ca617a2d2a87770f8291be2e28568cf19dd4c322c1dbed6a8c1d379838b0952fde0d03a235a50cb9 WHIRLPOOL 9fe8e9881c45aa437d6944850e8d291122c4a8f951f5f7bf94c6885671a9fee31b0dc47fb2a0e31dea85227f8bdf8ee4b9a7f5b14df789d6065af270be51a5db
-MISC ChangeLog 33892 SHA256 1bc9ac3aa93e264003f98a4ffa520fed233f4449a0e27e3571eb5acce0a8473d SHA512 06d40a8124923908d45b13aa64076707860e114d19f22c03eb9348e813b4a5be35ebcd16f3a09b7f00397e1a0b09eacdb8d9ac128ea80895a3676fac149bc7b4 WHIRLPOOL d91d86bf6057c46508e20f63fee1120b79a7a9f977be1bfa15ddc1a7e9bfd4798e651160e52cb0adf32f05c9bd55a04c444bc32c9f31ef4761ac766c97a15120
-MISC metadata.xml 1190 SHA256 0b7ebf415df373643682290fbf79b9ed1ef4817f4be6b3a53aac9b7441dd898c SHA512 fcb38aa8872b50b6e087bc3cb375667f5ed3524b18920090c6b5d3d1ce1807f6cd0cc5bb5e8a7e9c23659bc40ceb3988392ea37ebc92f9d6bdca0b2c3cd4ea45 WHIRLPOOL af88cfc998264e3c7d5857a1e5c7ebeb2889b73a92c86c16ae9185c25fdbe7176114b6fb4b0eae1ffeb4893fb948b745c69010d30bbc25691bf3ec1bef3e0e81
+MISC ChangeLog 34069 SHA256 9a926356c04bfe416fc651c8aeb8f1681629928041571993c6b1e333b3e4417b SHA512 2a6f9c407543ef606057f2492b543d5c94f1f9ea1a0a35b8e7f334a0f87686cdfe7c316e469e604818488fe5347f49f52ba44741a2ae99d0f4e7913758ba5e4f WHIRLPOOL 8c4393ad6cee7708efef9fd5aa1f4ace50f7b0ebaaa3d2d588b5b16221f2ba9deb5c6ff7bd951ac8b1a1a8a89ef3ff96b29b294b64814601e5a8c1123f90a5e4
+MISC metadata.xml 1226 SHA256 546a210961a96d0a0872aa993643899a2becaf81a6c90f6eeb7cdab789f8e2f7 SHA512 f7cbfc11447e1ec407fce921e9dcc44a6a49f013fdce380d43845e15ea45ea88963f8c0a672fa77eeb1b3f2271477c0c740d81ec4c0061cf5f5b2e9d053ca035 WHIRLPOOL fd601eb093c494fcf0730d858a44f30e36403d1f9e046f5671c6ede591d617015ff05c4d8d014be767334daa81497e1bafc0960db50c1380d683324a884f62dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuzfTAAoJENXLsxwXqFxy0FcP/2DPMKxRaU3VJnqbdy2lEmp5
-QKv2Z2i4BZxYuL/yc82rujSaUEynQHr3PGo2BHulIejby4t0dPU6PMuCdbvAdb5T
-+bOjSMZ2dyBnxh3BDUxikIPmidC5u6F1GW1JC9xsGlNX4UG5VSJyv8AxaI3Ajt4Y
-9BredYTBxb3AVroTaGFbGhI0e68X795RC5tpBmkRxN6dmu/ri9CACwr209EJhN7D
-5XdVa6KFJqRC4o4FQAfsXxSZrZZhunmigivC5cp5IqU5om9bSfz/lJmGuW+dbkbd
-j/Dk5hi/wSPaZ2Xhxst5kIB9lSXDJF/I6TbL+/JTP3ETbjgmkIEETmoTIuUUvc6s
-Cpv/psc872HbgGa19Jsx2h5iMNfkH+WrOCGbX9OG1/Jd7isMQtxc+/87ylunVJ4r
-6IAHtmZ5wa4nVWw7qNJpuGcgmzNBwrrjSEXNPY2QR+UOOXtCBXp1GIHl5WJRjGjC
-IvMKzr0WBTv0ciUUJ14uS+W2CAZoHiVVl7enxEtdhHe3lov4I0W45yOas2afqhCW
-8IjxOWI3Str3+C7wP6aiBYYY68xRyisXTcKpnk2k29MC8fvoCEqK0UMukd/XQnrv
-67ZFBapao+PGufD3swJuWztrzHBDaijcEWaovsKSJ9hgzBrdTa+yrGGSffaN1e48
-/3YuInSg1c1pyG6Yl38E
-=r0Y4
+iQIcBAEBCAAGBQJSu0d1AAoJENXLsxwXqFxyqOIP/2Vxqvj4nFHS6mNk6TcQhdha
+E6LznGJVgm7jDFccZmPSx8gCwCAciHMxGWeUoZX5KV1IrzWKWIeRJiLl8hLAC/Uk
+pPnn40QA0hKrktvfvd/heusCbfFt0y+9UikWykR84KvPzQ8DxlueXX+GDDJISvUz
+k7vI6zzT4jFNDtuDaqPgvOOEAaFDhikq0+10c9a9BHaWeLXyWIv3onw7J9mQ7WsG
+aBI5CQ0QjtF/q6kkpQ/tI9/riaRtDqoDpB6g8C0FuN/2dWLt3JSFEF5GvQEd1nas
+XBAim3vXe0pN1EYtdyOIET9pHuBSqRWnL6Nrg8yIwp9X2SiW2zWUy8B9oQAN4xJH
+nEaF6u3wHeKuhW+94rNXgzjHj4xvSdGLO0tfaNFCcBtWnxe6HayZm76YdAH3TvRw
+VxMJd7uJG4YLSMJZ/7CmMsU8IirTyatintEg6LW6XjmQt6OIPGdp/7gsoiq/53AY
+NtD1LFWFNFG+JvxJR9oUnFohuyLFRQ88A7V+rty1V/kQ01QrChCkuEEMG1soqPew
+UuS4uY0y1CunhhTqT5TzM7dZyCRfv2b5By9X5YNFrG2fLasrWNlyRC6UxDuU8qaz
+5uvZIopCM+MZy9raa3vCmW4ESLECqEYahsb8rAHe+EpJtoFgBzK5BZ7pLFYw8vXM
+Fpa1/7DWLGjgQgg6SIoD
+=wW2h
 -----END PGP SIGNATURE-----
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>