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

Package-Manager: portage-2.1.4.4

10 files changed, 31 insertions, 20 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 )
diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index d3fc5ec146ac..51dce50cad26 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.87 2008/07/16 12:46:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.88 2008/07/26 21:36:25 carlo Exp $
+
+  26 Jul 2008; Carsten Lohrke <carlo@gentoo.org> mkvtoolnix-2.1.0.ebuild,
+  mkvtoolnix-2.2.0.ebuild, mkvtoolnix-2.2.0-r1.ebuild:
+  Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
 
   16 Jul 2008; Alexis Ballier <aballier@gentoo.org>
   mkvtoolnix-2.2.0-r1.ebuild:
diff --git a/media-video/mkvtoolnix/mkvtoolnix-2.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-2.1.0.ebuild
index c063afa9651d..0e66c27e58e2 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-2.1.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-2.1.0.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/mkvtoolnix/mkvtoolnix-2.1.0.ebuild,v 1.8 2008/05/09 10:03:35 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-2.1.0.ebuild,v 1.9 2008/07/26 21:36:25 carlo Exp $
 
 EAPI="1"
 inherit eutils wxwidgets flag-o-matic qt4 autotools
@@ -25,7 +25,7 @@ DEPEND=">=dev-libs/libebml-0.7.7
 	flac? ( media-libs/flac )
 	bzip2? ( app-arch/bzip2 )
 	lzo? ( dev-libs/lzo )
-	qt4? ( || ( >=x11-libs/qt-4.3.0 x11-libs/qt-gui:4 ) )"
+	qt4? ( || ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* ) )"
 
 pkg_setup() {
 	WX_GTK_VER="2.6"
diff --git a/media-video/mkvtoolnix/mkvtoolnix-2.2.0-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-2.2.0-r1.ebuild
index ca0ed15a8e17..f11ef74be134 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-2.2.0-r1.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-2.2.0-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/media-video/mkvtoolnix/mkvtoolnix-2.2.0-r1.ebuild,v 1.2 2008/07/16 12:46:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-2.2.0-r1.ebuild,v 1.3 2008/07/26 21:36:25 carlo Exp $
 
 EAPI="1"
 inherit eutils wxwidgets flag-o-matic qt4 autotools
@@ -25,7 +25,7 @@ DEPEND=">=dev-libs/libebml-0.7.7
 	flac? ( media-libs/flac )
 	bzip2? ( app-arch/bzip2 )
 	lzo? ( dev-libs/lzo )
-	qt4? ( || ( >=x11-libs/qt-4.3.0 x11-libs/qt-gui:4 ) )"
+	qt4? ( || ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* ) )"
 
 pkg_setup() {
 	WX_GTK_VER="2.8"
diff --git a/media-video/mkvtoolnix/mkvtoolnix-2.2.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-2.2.0.ebuild
index bc3bd789245e..d47a2fe434d3 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-2.2.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-2.2.0.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/mkvtoolnix/mkvtoolnix-2.2.0.ebuild,v 1.3 2008/05/09 10:03:35 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-2.2.0.ebuild,v 1.4 2008/07/26 21:36:25 carlo Exp $
 
 EAPI="1"
 inherit eutils wxwidgets flag-o-matic qt4 autotools
@@ -25,7 +25,7 @@ DEPEND=">=dev-libs/libebml-0.7.7
 	flac? ( media-libs/flac )
 	bzip2? ( app-arch/bzip2 )
 	lzo? ( dev-libs/lzo )
-	qt4? ( || ( >=x11-libs/qt-4.3.0 x11-libs/qt-gui:4 ) )"
+	qt4? ( || ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* ) )"
 
 pkg_setup() {
 	WX_GTK_VER="2.6"
diff --git a/media-video/ttcut/ChangeLog b/media-video/ttcut/ChangeLog
index 3bf7d7d7b2ed..d2f9837b5efd 100644
--- a/media-video/ttcut/ChangeLog
+++ b/media-video/ttcut/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ttcut
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ChangeLog,v 1.16 2008/07/25 19:05:05 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ChangeLog,v 1.17 2008/07/26 21:30:59 carlo Exp $
+
+  26 Jul 2008; Carsten Lohrke <carlo@gentoo.org> ttcut-0.19.6-r1.ebuild:
+  Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
 
   25 Jul 2008; Steve Dibb <beandog@gentoo.org> ttcut-0.19.6-r1.ebuild:
   Drop amd64, bug 228145
diff --git a/media-video/ttcut/ttcut-0.19.6-r1.ebuild b/media-video/ttcut/ttcut-0.19.6-r1.ebuild
index 4e8514dae602..00b843ddeb60 100644
--- a/media-video/ttcut/ttcut-0.19.6-r1.ebuild
+++ b/media-video/ttcut/ttcut-0.19.6-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/media-video/ttcut/ttcut-0.19.6-r1.ebuild,v 1.7 2008/07/25 19:05:05 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ttcut-0.19.6-r1.ebuild,v 1.8 2008/07/26 21:30:59 carlo Exp $
 
 EAPI="1"
 inherit eutils qt4
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="-amd64 x86"
 IUSE=""
 
-DEPEND="|| ( >=x11-libs/qt-4.3.0:4 ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) )
+DEPEND="|| ( ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) =x11-libs/qt-4.3* )
 	>=media-libs/libmpeg2-0.4.0
 	virtual/opengl"