Don't enable QtAssistant module because it was removed in qt-4.7 and we already depend on 4.7.2 or later.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

3 files changed, 21 insertions, 19 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index a7005c9c5c57..3e82b23a4282 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.169 2012/02/21 01:06:46 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.170 2012/03/02 18:23:33 pesa Exp $
+
+  02 Mar 2012; Davide Pesavento <pesa@gentoo.org> PyQt4-4.9.1.ebuild:
+  Don't enable QtAssistant module because it was removed in qt-4.7 and we
+  already depend on 4.7.2 or later.
 
   21 Feb 2012; Davide Pesavento <pesa@gentoo.org> -PyQt4-4.7.3.ebuild,
   PyQt4-4.8.1.ebuild, PyQt4-4.8.4.ebuild:
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 1b52f989b40d..1f0729e97916 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -9,23 +9,23 @@ DIST PyQt-x11-gpl-4.8.4.tar.gz 9799081 RMD160 100d16e9005e3b83f0030e498a16d99636
 DIST PyQt-x11-gpl-4.9.1.tar.gz 9742132 RMD160 056d6570ffc5ad873ef36d8181122cbb79d7b5ef SHA1 6aa0e64cdcca0f23946c5e6c244b19189c234306 SHA256 f283557f2190ffc00d72fe8451ac15536cab777c36a9b573031328f401629bb1
 EBUILD PyQt4-4.8.1.ebuild 4803 RMD160 646e9ccd0a8580fb908fccc6e9cdaa7fdb74fd53 SHA1 8c6cd017ec2aa80d2afe663aeea2569cd9829a32 SHA256 f2a669e5c291fd35a46a3ca4f163d51c273654b47e9bb019c86dd033fa4d55f6
 EBUILD PyQt4-4.8.4.ebuild 4983 RMD160 11eeaaff2a4e606504e4854d6719bf82686e61d8 SHA1 02fded68ee3e797203309ffa39e398c55d4a2d32 SHA256 4f56a4970a1cf271b094ccb2d0e200af65aab1e379dfbf7a73fba382aca40438
-EBUILD PyQt4-4.9.1.ebuild 5804 RMD160 0a26987acda81746411611c2b691ee20a1ffee7b SHA1 572e86788e4a63ae572ad2d021758b3ea8bd8050 SHA256 feb09cb27f86fc750ac212881bf5c7b57032dc2140cad97431c36336f5f33f61
-MISC ChangeLog 23834 RMD160 fc625a665eb9d58e2e9b6a4a3e7ff55578744c0f SHA1 9e845fa3b90d1fe16cb498ace97ebf8d4c8c1796 SHA256 42a2cdb1925f03de1c7c0fdf15d81cf228fd9ac7229b77c3e651afc853da6833
+EBUILD PyQt4-4.9.1.ebuild 5701 RMD160 3b42c4ea9782c57dce078bebdde58e0cd3f7a79e SHA1 ab5a03a990964e6891353ac1bfa7851f3ccc1fcc SHA256 080a514c86ccc765bf706ab7db14ec9a31f63a28fc34d8ca70473f5a0b0de7f2
+MISC ChangeLog 24015 RMD160 dd0b08b44f83c5603f497a6bda28b7d655aa3d37 SHA1 e843f68998fa713dcf7ed520b9981ca012bdb31b SHA256 f5a7f9c1a8ce8e4405c5db8b8f9c034565e4486987eaebea8302bc58619ff978
 MISC metadata.xml 1101 RMD160 063bcdaa197bc36e68607dc1763db7632e9bf2a7 SHA1 0e0af73c38ef13195a610013895660d5b644156f SHA256 7cea702a27791d9fd0f1d8f4f220dfbbab50faad817f807df7a15bf7b3f8f470
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPQu4tAAoJENXLsxwXqFxy0MoQALA9bTrKymiIr/RUBaHh2pNx
-6k6ziwCXG3Y+Y8P109nYqyrhOkykJ3p0RvactaIC8LcL86rmVfiCTijv6yPX2Q2M
-F16ubJ7JPbNc8F6CNQzXKUM1ibtUgHMELbZQmbAbVJsaMxDOMaVl+aKahnWvflXH
-l6JregDtvumCYKYz6vI3YRzH2/462l7V1Za92Gwp1+oqfFTXlP7B7z345SUVlB/s
-KlpQWpXyA76v+WrzGo6FBLFnr3jLBhAMaPqOFIzkWKTfHlmiyVDPKpZwUylDaIKV
-vNOpcuCociRsW3foyY57mLpF0CJJHd/K4EiO+g1JKctM5cO/zQXS0xxM5ShI/Vir
-ymbHxlqrhH9rmM1KbmSWvz2mFQPEnitBkpGyMr5XRaRF4kC6kSovuApAI/oqSnys
-QdPZde589UXdxAtvE4ra9yPS6SFZo7qtgdZi0bKSrCmM5sDv/Pwcns0Si2La2KyO
-g3Dv7DeQqHGy8YAObntZZlq532nfS1rupyFgA2Qs1JibUirUgRQML6yWryNW/47V
-GP/FcnMAFHBoePPUaNP/MPpGsT4NloiBZnj4UOKB82ykTXHC0q0A5ai22o2Xes1d
-nafqMuUbDkYp8dIQnWqS14IBkswyMTlYH9yhm1iqYtXgHp3CT/TlNphPT9qwRhYk
-2VHEmhi6IZuUoKF6UQEU
-=VhqG
+iQIcBAEBCgAGBQJPURAtAAoJENXLsxwXqFxyCewP/ia4Ll+mN/wy35215eQ/pR0C
+uHo31Pzx9DxHeNy3byUjaTZ7YV4x4+f+Avaby21oLixDpcDuvYDBpXy/4d3cu0uu
+JSgYCoqjefbM4RwG4P7fIxcUcXZzmZyTjD+VB828Z6vszCVEdTT3XMrWT0KrSQDa
+HPBG3AVETyAzCoB/CYVF/3rHQTH+MQs4dDqiXqlVH1TadevGgNtTFTr7ETO2yRnp
+f0bn5opKlTSZ4fo8vfps9sDNgcKsynjTYpNM27emD7qsvVYe9YyA+EKoobrKjM4W
+8GwzY1Mm3UBz+fhuG8kEQXonXqi4Ync4z33IN5sFRfS4BCiKLRkpmh0UAZiSbHm5
+0W+oQzl0O2vF9Py5BIJwmf8yRcmTCgeY8bDcRrTRfVuVuTbSyptLHQreB1b2DpyF
+YEbh13dscOY/Okzg/4h+nB15KWCOVTpV4Q9uDthWuq0rSzidbc1qCvNhr9lLY4Yu
+F3bDn9EPX0ruvo2qfFe7nkbtzT4LSThyQ43kSyPYt9Fu8Hi20cgm5982/UB6CDSZ
+zh7LmIDBJV5N8V10WY/lMOAqEmyYe5btKPijFcFQ+gsV1hv+K5LfwtlMfxvLuJ8o
+TfAoU0GMh63Fp9PFiDhNKXm1YCIU2po7POD+hCu09Q9NltEyPWyI5Gx2DPnpE9d5
+8sctWAdztXpqK6DTMhE6
+=1VjO
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.9.1.ebuild b/dev-python/PyQt4/PyQt4-4.9.1.ebuild
index cc72f96fd2cd..26de845435f1 100644
--- a/dev-python/PyQt4/PyQt4-4.9.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.1.ebuild,v 1.3 2012/02/21 00:46:23 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.1.ebuild,v 1.4 2012/03/02 18:23:33 pesa Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -118,8 +118,6 @@ src_configure() {
 			$(pyqt4_use_enable X QtDesigner) $(use X || echo --no-designer-plugin)
 			$(pyqt4_use_enable X QtScriptTools)
 			$(pyqt4_use_enable X QtTest)
-			# QtAssistant module is not available with Qt >=4.7.0.
-			$(pyqt4_use_enable assistant QtAssistant)
 			$(pyqt4_use_enable assistant QtHelp)
 			$(pyqt4_use_enable dbus QtDBus)
 			$(pyqt4_use_enable declarative QtDeclarative)