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

Package-Manager: portage-2.1.4.4

6 files changed, 17 insertions, 10 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index d507eb2dfb67..2bc3daed0bd5 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/lyx
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.139 2008/07/14 14:40:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.140 2008/07/27 00:59:56 carlo Exp $
+
+  27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> lyx-1.5.5.ebuild,
+  lyx-1.6.0_beta3.ebuild, lyx-1.6.0_beta4.ebuild:
+  Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
 
 *lyx-1.6.0_beta4 (14 Jul 2008)
 
diff --git a/app-office/lyx/lyx-1.5.5.ebuild b/app-office/lyx/lyx-1.5.5.ebuild
index 898c2346925b..648bca3d82a6 100644
--- a/app-office/lyx/lyx-1.5.5.ebuild
+++ b/app-office/lyx/lyx-1.5.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/app-office/lyx/lyx-1.5.5.ebuild,v 1.7 2008/06/15 09:36:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.5.5.ebuild,v 1.8 2008/07/27 00:59:56 carlo Exp $
 
 EAPI=1
 
@@ -26,7 +26,7 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" # dev-tex/ivritex
 IUSE="cups debug nls linguas_he latex"
 RESTRICT="test"
 
-RDEPEND="|| ( ( x11-libs/qt-gui x11-libs/qt-core ) >=x11-libs/qt-4.1.1:4 )
+RDEPEND="|| ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 )
 	x11-libs/libXrandr
 	x11-libs/libXcursor
 	x11-libs/libXrender
diff --git a/app-office/lyx/lyx-1.6.0_beta3.ebuild b/app-office/lyx/lyx-1.6.0_beta3.ebuild
index dab2a14a392a..aee01f9fd0d0 100644
--- a/app-office/lyx/lyx-1.6.0_beta3.ebuild
+++ b/app-office/lyx/lyx-1.6.0_beta3.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/app-office/lyx/lyx-1.6.0_beta3.ebuild,v 1.1 2008/06/04 21:24:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.0_beta3.ebuild,v 1.2 2008/07/27 00:59:56 carlo Exp $
 
 EAPI=1
 
@@ -33,7 +33,7 @@ for X in ${LANGS}; do
 	IUSE="${IUSE} linguas_${X}"
 done
 
-COMMONDEPEND="|| ( ( x11-libs/qt-gui x11-libs/qt-core ) >=x11-libs/qt-4.2.0:4 )
+COMMONDEPEND="|| ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 )
 	x11-libs/libXrandr
 	x11-libs/libXcursor
 	x11-libs/libXrender
diff --git a/app-office/lyx/lyx-1.6.0_beta4.ebuild b/app-office/lyx/lyx-1.6.0_beta4.ebuild
index 9572d9f8dc29..dd41c1790a91 100644
--- a/app-office/lyx/lyx-1.6.0_beta4.ebuild
+++ b/app-office/lyx/lyx-1.6.0_beta4.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/app-office/lyx/lyx-1.6.0_beta4.ebuild,v 1.1 2008/07/14 14:40:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.0_beta4.ebuild,v 1.2 2008/07/27 00:59:56 carlo Exp $
 
 EAPI=1
 
@@ -33,7 +33,7 @@ for X in ${LANGS}; do
 	IUSE="${IUSE} linguas_${X}"
 done
 
-COMMONDEPEND="|| ( ( x11-libs/qt-gui x11-libs/qt-core ) >=x11-libs/qt-4.2.0:4 )
+COMMONDEPEND="|| ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 )
 	x11-libs/libXrandr
 	x11-libs/libXcursor
 	x11-libs/libXrender
diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index a079e35af4d8..33400555d34d 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.46 2008/07/02 20:12:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.47 2008/07/27 01:00:21 carlo Exp $
+
+  27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> texmaker-1.71-r1.ebuild:
+  Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
 
   02 Jul 2008; Alexis Ballier <aballier@gentoo.org> -texmaker-1.71.ebuild:
   remove unused version
diff --git a/app-office/texmaker/texmaker-1.71-r1.ebuild b/app-office/texmaker/texmaker-1.71-r1.ebuild
index 46bf478bbdd8..2b5984edcf95 100644
--- a/app-office/texmaker/texmaker-1.71-r1.ebuild
+++ b/app-office/texmaker/texmaker-1.71-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/app-office/texmaker/texmaker-1.71-r1.ebuild,v 1.2 2008/07/02 15:07:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.71-r1.ebuild,v 1.3 2008/07/27 01:00:21 carlo Exp $
 
 EAPI=1
 
@@ -33,7 +33,7 @@ IUSE=""
 
 COMMON_DEPEND="x11-libs/libX11
 	x11-libs/libXext
-	|| ( ( x11-libs/qt-gui x11-libs/qt-core ) >=x11-libs/qt-4.3.0:4 )
+	|| ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 )
 	>=app-text/hunspell-1.2.2"
 
 RDEPEND="${COMMON_DEPEND}