Removed alternative dependency on Qt metapackage

Package-Manager: portage-2.2_rc43/cvs/Linux x86_64

14 files changed, 55 insertions, 44 deletions

diff --git a/media-sound/lmms/ChangeLog b/media-sound/lmms/ChangeLog
index 7f14cf350ad6..95c75dbe27cc 100644
--- a/media-sound/lmms/ChangeLog
+++ b/media-sound/lmms/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/lmms
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.10 2009/08/13 07:07:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.11 2009/10/06 17:06:06 ayoy Exp $
+
+  06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> lmms-0.4.5.ebuild:
+  Removed alternative dependency on Qt metapackage
 
 *lmms-0.4.5 (13 Aug 2009)
 
diff --git a/media-sound/lmms/lmms-0.4.5.ebuild b/media-sound/lmms/lmms-0.4.5.ebuild
index 8cecb8e5b4b3..14416fe2787c 100644
--- a/media-sound/lmms/lmms-0.4.5.ebuild
+++ b/media-sound/lmms/lmms-0.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.5.ebuild,v 1.1 2009/08/13 07:07:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.5.ebuild,v 1.2 2009/10/06 17:06:06 ayoy Exp $
 
 EAPI="2"
 
@@ -16,10 +16,8 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="alsa debug fftw fluidsynth jack ogg pulseaudio sdl stk vst"
 
-RDEPEND="|| ( (
-				x11-libs/qt-core
-				x11-libs/qt-gui[accessibility]
-			) >=x11-libs/qt-4.3.0:4[accessibility] )
+RDEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4[accessibility]
 	>=media-libs/libsndfile-1.0.11
 	>=media-libs/libsamplerate-0.1.7
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index ff1c33531b37..f67d4b9f0e5d 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mixxx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.47 2009/07/23 09:08:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.48 2009/10/06 17:08:52 ayoy Exp $
+
+  06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> mixxx-1.6.0.ebuild,
+  mixxx-1.6.0-r1.ebuild:
+  Removed alternative dependency on Qt metapackage
 
 *mixxx-1.7.0_beta2 (23 Jul 2009)
 
diff --git a/media-sound/mixxx/mixxx-1.6.0-r1.ebuild b/media-sound/mixxx/mixxx-1.6.0-r1.ebuild
index 24552a233ff7..8178ac42ee09 100644
--- a/media-sound/mixxx/mixxx-1.6.0-r1.ebuild
+++ b/media-sound/mixxx/mixxx-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.6.0-r1.ebuild,v 1.4 2009/08/03 13:25:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.6.0-r1.ebuild,v 1.5 2009/10/06 17:08:52 ayoy Exp $
 
 EAPI=2
 
@@ -27,10 +27,10 @@ RDEPEND="media-libs/mesa
 	shout? ( media-libs/libshout )
 	ladspa? ( media-libs/ladspa-sdk )
 	virtual/glu
-	|| ( ( x11-libs/qt-core
-		x11-libs/qt-gui
-		x11-libs/qt-opengl )
-		=x11-libs/qt-4.3*:4[opengl,qt3support] )"
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-qt3support:4
+	x11-libs/qt-opengl:4"
 DEPEND="${RDEPEND}
 	dev-util/scons
 	dev-util/pkgconfig"
diff --git a/media-sound/mixxx/mixxx-1.6.0.ebuild b/media-sound/mixxx/mixxx-1.6.0.ebuild
index 4a102383e9d6..c550c3b7d9f1 100644
--- a/media-sound/mixxx/mixxx-1.6.0.ebuild
+++ b/media-sound/mixxx/mixxx-1.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.6.0.ebuild,v 1.4 2008/12/04 22:32:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.6.0.ebuild,v 1.5 2009/10/06 17:08:52 ayoy Exp $
 
 EAPI=1
 
@@ -27,10 +27,9 @@ RDEPEND="media-libs/mesa
 	shout? ( media-libs/libshout )
 	ladspa? ( media-libs/ladspa-sdk )
 	virtual/glu
-	|| ( ( x11-libs/qt-core
-		x11-libs/qt-gui
-		x11-libs/qt-opengl )
-		=x11-libs/qt-4.3*:4 )"
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4"
 DEPEND="${RDEPEND}
 	dev-util/scons
 	dev-util/pkgconfig"
diff --git a/media-sound/qjackctl/ChangeLog b/media-sound/qjackctl/ChangeLog
index 99ba4cf06015..5c22f5c6348d 100644
--- a/media-sound/qjackctl/ChangeLog
+++ b/media-sound/qjackctl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/qjackctl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/ChangeLog,v 1.62 2009/10/01 21:37:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/ChangeLog,v 1.63 2009/10/06 17:10:49 ayoy Exp $
+
+  06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> qjackctl-0.3.2.ebuild,
+  qjackctl-0.3.4.ebuild:
+  Removed alternative dependency on Qt metapackage
 
 *qjackctl-0.3.5 (01 Oct 2009)
 
diff --git a/media-sound/qjackctl/qjackctl-0.3.2.ebuild b/media-sound/qjackctl/qjackctl-0.3.2.ebuild
index 93af4c241289..393310e3b59e 100644
--- a/media-sound/qjackctl/qjackctl-0.3.2.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.3.2.ebuild,v 1.9 2009/09/15 15:18:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.3.2.ebuild,v 1.10 2009/10/06 17:10:49 ayoy Exp $
 
 EAPI=1
 
@@ -17,10 +17,8 @@ KEYWORDS="amd64 ppc sparc x86"
 IUSE="alsa debug"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
-	|| ( (
-			x11-libs/qt-core:4
-			x11-libs/qt-gui:4
-		) =x11-libs/qt-4.3*:4 )
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
 	>=media-sound/jack-audio-connection-kit-0.109.2"
 DEPEND="${RDEPEND}"
 
diff --git a/media-sound/qjackctl/qjackctl-0.3.4.ebuild b/media-sound/qjackctl/qjackctl-0.3.4.ebuild
index c7984b894c82..3cb61dd06714 100644
--- a/media-sound/qjackctl/qjackctl-0.3.4.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.3.4.ebuild,v 1.5 2009/09/15 15:18:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.3.4.ebuild,v 1.6 2009/10/06 17:10:49 ayoy Exp $
 
 EAPI=2
 
@@ -17,10 +17,8 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="alsa debug"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
-	|| ( (
-			x11-libs/qt-core:4
-			x11-libs/qt-gui:4
-		) =x11-libs/qt-4.3*:4 )
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
 	>=media-sound/jack-audio-connection-kit-0.109.2"
 DEPEND="${RDEPEND}"
 
diff --git a/media-sound/qsynth/ChangeLog b/media-sound/qsynth/ChangeLog
index 5539bed56077..942d1675ec5b 100644
--- a/media-sound/qsynth/ChangeLog
+++ b/media-sound/qsynth/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/qsynth
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/ChangeLog,v 1.47 2009/05/10 19:01:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/ChangeLog,v 1.48 2009/10/06 17:12:34 ayoy Exp $
+
+  06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> qsynth-0.3.4.ebuild:
+  Removed alternative dependency on Qt metapackage
 
 *qsynth-0.3.4 (10 May 2009)
 
diff --git a/media-sound/qsynth/qsynth-0.3.4.ebuild b/media-sound/qsynth/qsynth-0.3.4.ebuild
index 67a1afb037d4..ef80db87c063 100644
--- a/media-sound/qsynth/qsynth-0.3.4.ebuild
+++ b/media-sound/qsynth/qsynth-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.3.4.ebuild,v 1.1 2009/05/10 19:01:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.3.4.ebuild,v 1.2 2009/10/06 17:12:34 ayoy Exp $
 
 EAPI=2
 
@@ -15,11 +15,8 @@ SLOT="0"
 IUSE="debug jack alsa pulseaudio"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-DEPEND="
-	|| ( (
-			x11-libs/qt-core:4
-			x11-libs/qt-gui:4
-		) =x11-libs/qt-4.3*:4 )
+DEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4
 	>=media-sound/fluidsynth-1.0.7a[jack?,alsa?,pulseaudio?]
 	!pulseaudio? ( !jack? ( !alsa? ( >=media-sound/fluidsynth-1.0.7a[oss] ) ) )"
 RDEPEND="${DEPEND}"
diff --git a/media-sound/qtractor/ChangeLog b/media-sound/qtractor/ChangeLog
index 10e144017c88..b18a8cf0c52c 100644
--- a/media-sound/qtractor/ChangeLog
+++ b/media-sound/qtractor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/qtractor
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/ChangeLog,v 1.21 2009/08/01 06:35:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/ChangeLog,v 1.22 2009/10/06 17:14:06 ayoy Exp $
+
+  06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> qtractor-0.4.2.ebuild:
+  Removed alternative dependency on Qt metapackage
 
   01 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> qtractor-0.4.2.ebuild:
   Remove USE depend for media-libs/alsa-lib[midi].
diff --git a/media-sound/qtractor/qtractor-0.4.2.ebuild b/media-sound/qtractor/qtractor-0.4.2.ebuild
index 6ade96df7dc6..99eb79e4a4a6 100644
--- a/media-sound/qtractor/qtractor-0.4.2.ebuild
+++ b/media-sound/qtractor/qtractor-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/qtractor-0.4.2.ebuild,v 1.3 2009/08/01 06:35:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtractor/qtractor-0.4.2.ebuild,v 1.4 2009/10/06 17:14:06 ayoy Exp $
 
 EAPI=2
 
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="debug dssi libsamplerate mad osc rubberband vorbis sse"
 
-RDEPEND="|| ( ( x11-libs/qt-core x11-libs/qt-gui )
-			=x11-libs/qt-4.3*:4 )
+RDEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4
 	media-libs/alsa-lib
 	media-libs/libsndfile
 	media-sound/jack-audio-connection-kit
diff --git a/media-sound/sonic-visualiser/ChangeLog b/media-sound/sonic-visualiser/ChangeLog
index c704669a4066..287e2c6dd763 100644
--- a/media-sound/sonic-visualiser/ChangeLog
+++ b/media-sound/sonic-visualiser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/sonic-visualiser
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/ChangeLog,v 1.14 2009/07/25 15:06:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/ChangeLog,v 1.15 2009/10/06 17:15:42 ayoy Exp $
+
+  06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org>
+  sonic-visualiser-1.6.ebuild:
+  Removed alternative dependency on Qt metapackage
 
   25 Jul 2009; Alexis Ballier <aballier@gentoo.org>
   -sonic-visualiser-1.5.ebuild:
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-1.6.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-1.6.ebuild
index 0a3986932897..17b09d8a4c24 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-1.6.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/sonic-visualiser-1.6.ebuild,v 1.2 2009/07/25 15:04:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/sonic-visualiser-1.6.ebuild,v 1.3 2009/10/06 17:15:42 ayoy Exp $
 
 EAPI=1
 
@@ -15,8 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="fftw id3tag jack mad ogg osc portaudio pulseaudio"
 
-RDEPEND="|| ( ( x11-libs/qt-core:4  x11-libs/qt-gui:4 )
-				=x11-libs/qt-4.3*:4 )
+RDEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4
 	media-libs/libsndfile
 	media-libs/libsamplerate
 	fftw? ( =sci-libs/fftw-3* )