Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.

Package-Manager: portage-2.1.4.4

5 files changed, 16 insertions, 11 deletions

diff --git a/x11-themes/qtcurve-qt4/ChangeLog b/x11-themes/qtcurve-qt4/ChangeLog
index 029129e12786..5ef6b1bdc124 100644
--- a/x11-themes/qtcurve-qt4/ChangeLog
+++ b/x11-themes/qtcurve-qt4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/qtcurve-qt4
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.36 2008/07/19 22:09:50 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.37 2008/07/27 00:40:23 carlo Exp $
+
+  27 Jul 2008; Carsten Lohrke <carlo@gentoo.org>
+  qtcurve-qt4-0.59.3-r1.ebuild, qtcurve-qt4-0.59.4.ebuild,
+  qtcurve-qt4-0.59.5.ebuild:
+  Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
 
 *qtcurve-qt4-0.59.5 (19 Jul 2008)
 
diff --git a/x11-themes/qtcurve-qt4/Manifest b/x11-themes/qtcurve-qt4/Manifest
index 99e183802868..596e87a49b1f 100644
--- a/x11-themes/qtcurve-qt4/Manifest
+++ b/x11-themes/qtcurve-qt4/Manifest
@@ -1,8 +1,8 @@
 DIST QtCurve-KDE4-0.59.3.tar.bz2 104678 RMD160 182edcc31157ef44c7efb459d77d1929b079072e SHA1 91983b62fe0ba8588e71214b522bec56223236d6 SHA256 1040441d84f126e53989fb82290ebe1f0d841c05d8405a71f2ff9331370fb51b
 DIST QtCurve-KDE4-0.59.4.tar.bz2 104852 RMD160 4cf7b0709102dd62db6ee2d5a5029b92cd8bf27f SHA1 4e103c3ebec2ded66fc629fd4d6ce9ddb33ba49c SHA256 fc07061f9e4e5ffb1923b95aa6ab13f3183d28789a6773c9ebc2a20a443f259f
 DIST QtCurve-KDE4-0.59.5.tar.bz2 104893 RMD160 d42f7d8c4459ed783ac32a37e09357163c867e94 SHA1 b0d5463c3bbf95e40e9d3ae331617bf5bf7e21c4 SHA256 b2fde05e54ae90d6e9969d1a3d68009014097adb8dd92395d54285ebeeb56eef
-EBUILD qtcurve-qt4-0.59.3-r1.ebuild 1031 RMD160 e21b653db0f0eb49f062a220e378bdeaaf1aeb47 SHA1 4444c775d7a3d14118672bf558303c732164c7d9 SHA256 a923823f61e6dd47862560d159799d98e901256eb2057e0dff1a698b35cd9028
-EBUILD qtcurve-qt4-0.59.4.ebuild 1031 RMD160 f883037fb6c1cb4ea58d6bd8637e1bf1a942a293 SHA1 51a44b5569c6f38c182b56852102dc250aa7ce8f SHA256 0dea0c9947261808ed733ff18d0d3ffca938f8d9fd08571f4a766cf4d4de9577
-EBUILD qtcurve-qt4-0.59.5.ebuild 1031 RMD160 9309e7f2d03e230730571cf82523ed352116ef17 SHA1 3dc0b9571a71ac66cda07895de0108ae0750de2e SHA256 23bcdf9e0e4bb745bc5318c74d2793ef7b9fd5b7fb5bf20a338d8f16da6d3621
-MISC ChangeLog 5437 RMD160 8746304275a175e1fb866c9a68ab429546373f92 SHA1 610bd31cae155615c68a0b9a2625fce8c2823043 SHA256 0566c6ad113e86e71369e69fdad5f5abd8a3d49676c3fe9dbae2458bfd585707
+EBUILD qtcurve-qt4-0.59.3-r1.ebuild 1027 RMD160 b83c88ec5cffdb891b99b217526f878036ddeeec SHA1 c4c0cff75499bd885ada2d79cbab7e68b6e546bc SHA256 e88096f20df0495c1645acde07ff04ae4c690a081c6927be7b7d237746228e39
+EBUILD qtcurve-qt4-0.59.4.ebuild 1029 RMD160 18ace3f697642e2fb2b2785e5dd9aef36e978752 SHA1 a180761ce5d78f7fa67bdf10afb72abbc3529923 SHA256 238e9e5b469cefbeaf1f86fd906f9b07b8f21aa729696cc3542c84dfb6ac3066
+EBUILD qtcurve-qt4-0.59.5.ebuild 1029 RMD160 03b25a7988aae43c92552d151a0006185e3adbed SHA1 135c9e4d9669ed6f59e02402e923ed10e17292e4 SHA256 fd087060d3611fde8a14652f75c2cfae191c39a35d923fc0f0c37b2127e71d2b
+MISC ChangeLog 5641 RMD160 e4216e41407656f5dbe43d1216e3bf2a17305c93 SHA1 22fa8d0acc8b91707ccd1adf926e9771f2ee29d7 SHA256 eac3d03ac665fbba93a1d2ebd0e4a88edd0eecb00963ca7a4f4d1603dbd31e29
 MISC metadata.xml 258 RMD160 b88c8ff982ed8c04828ce3073cc9818e5fc9cbd3 SHA1 e450b9221477ece8b7e7673831e267f4469023ff SHA256 4e391eaa1ae5034e90d207c6eeff2894646226c878256378a48702bf038bcdea
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.3-r1.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.3-r1.ebuild
index 7d02855a3566..a043c11df237 100644
--- a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.3-r1.ebuild
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.3-r1.ebuild,v 1.10 2008/07/14 19:19:27 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.3-r1.ebuild,v 1.11 2008/07/27 00:40:23 carlo Exp $
 
 EAPI="1"
 inherit flag-o-matic cmake-utils
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc64 sparc x86"
 IUSE="kde"
 
-DEPEND="|| ( >=x11-libs/qt-4.0:4 x11-libs/qt-gui:4 )
+DEPEND="|| ( x11-libs/qt-gui:4 <x11-libs/qt-4.4:4 )
 	kde? ( kde-base/kwin:kde-4
 		x11-libs/qt-gui:4 )"
 # kde-4 support needs methods from qt-gui-4.4
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.4.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.4.ebuild
index 9eab5433d260..04eed9efcf48 100644
--- a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.4.ebuild
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.4.ebuild,v 1.1 2008/06/26 14:36:38 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.4.ebuild,v 1.2 2008/07/27 00:40:23 carlo Exp $
 
 EAPI="1"
 inherit flag-o-matic cmake-utils
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~sparc ~x86"
 IUSE="kde"
 
-DEPEND="|| ( >=x11-libs/qt-4.0:4 x11-libs/qt-gui:4 )
+DEPEND="|| ( x11-libs/qt-gui:4 <x11-libs/qt-4.4:4 )
 	kde? ( kde-base/kwin:kde-4
 		x11-libs/qt-gui:4 )"
 # kde-4 support needs methods from qt-gui-4.4
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.5.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.5.ebuild
index a42c6f1b98b5..24c67a536492 100644
--- a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.5.ebuild
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.5.ebuild,v 1.1 2008/07/19 22:09:50 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.59.5.ebuild,v 1.2 2008/07/27 00:40:23 carlo Exp $
 
 EAPI="1"
 inherit flag-o-matic cmake-utils
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~sparc ~x86"
 IUSE="kde"
 
-DEPEND="|| ( >=x11-libs/qt-4.0:4 x11-libs/qt-gui:4 )
+DEPEND="|| ( x11-libs/qt-gui:4 <x11-libs/qt-4.4:4 )
 	kde? ( kde-base/kwin:kde-4
 		x11-libs/qt-gui:4 )"
 # kde-4 support needs methods from qt-gui-4.4