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

Package-Manager: portage-2.1.4.4

4 files changed, 14 insertions, 10 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 683fff31db38..631c1f74418f 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.132 2008/07/12 21:36:40 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.133 2008/07/26 21:34:46 carlo Exp $
+
+  26 Jul 2008; Carsten Lohrke <carlo@gentoo.org> avidemux-2.4.ebuild,
+  avidemux-2.4.1.ebuild, avidemux-2.4.2.ebuild:
+  Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
 
 *avidemux-2.4.2 (12 Jul 2008)
 
diff --git a/media-video/avidemux/avidemux-2.4.1.ebuild b/media-video/avidemux/avidemux-2.4.1.ebuild
index 031c522d7ac0..acbd29ccde68 100644
--- a/media-video/avidemux/avidemux-2.4.1.ebuild
+++ b/media-video/avidemux/avidemux-2.4.1.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/media-video/avidemux/avidemux-2.4.1.ebuild,v 1.9 2008/06/22 15:14:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.1.ebuild,v 1.10 2008/07/26 21:34:46 carlo Exp $
 
 EAPI="1"
 
@@ -43,8 +43,8 @@ RDEPEND="dev-libs/libxml2
 	xvid? ( media-libs/xvid )
 	gtk? ( >=x11-libs/gtk+-2
 		x11-libs/libX11 )
-	qt4? ( || ( >=x11-libs/qt-4.3:4
-			x11-libs/qt-gui:4 )
+	qt4? ( || ( x11-libs/qt-gui:4 
+		=x11-libs/qt-4.3* )
 		x11-libs/libX11 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
diff --git a/media-video/avidemux/avidemux-2.4.2.ebuild b/media-video/avidemux/avidemux-2.4.2.ebuild
index 086f5260caca..5addbce3ee45 100644
--- a/media-video/avidemux/avidemux-2.4.2.ebuild
+++ b/media-video/avidemux/avidemux-2.4.2.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/media-video/avidemux/avidemux-2.4.2.ebuild,v 1.2 2008/07/13 13:43:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.2.ebuild,v 1.3 2008/07/26 21:34:46 carlo Exp $
 
 EAPI="1"
 
@@ -43,8 +43,8 @@ RDEPEND="dev-libs/libxml2
 	xvid? ( media-libs/xvid )
 	gtk? ( >=x11-libs/gtk+-2
 		x11-libs/libX11 )
-	qt4? ( || ( >=x11-libs/qt-4.3:4
-			x11-libs/qt-gui:4 )
+	qt4? ( || ( x11-libs/qt-gui:4
+			=x11-libs/qt-4.3* )
 		x11-libs/libX11 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
diff --git a/media-video/avidemux/avidemux-2.4.ebuild b/media-video/avidemux/avidemux-2.4.ebuild
index 2ffebe6019f4..0cda7336d95b 100644
--- a/media-video/avidemux/avidemux-2.4.ebuild
+++ b/media-video/avidemux/avidemux-2.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/media-video/avidemux/avidemux-2.4.ebuild,v 1.6 2008/04/19 19:27:49 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.ebuild,v 1.7 2008/07/26 21:34:46 carlo Exp $
 
 EAPI="1"
 
@@ -39,8 +39,8 @@ RDEPEND="dev-libs/libxml2
 		media-libs/fontconfig )
 	gtk? ( >=x11-libs/gtk+-2
 		x11-libs/libX11 )
-	qt4? ( || ( >=x11-libs/qt-4.3:4
-			x11-libs/qt-gui:4 )
+	qt4? ( || ( x11-libs/qt-gui:4
+		=x11-libs/qt-4.3* )
 		x11-libs/libX11 )
 	encode? (
 		aac? ( media-libs/faac )