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

(Portage version: 2.1.4.4)

4 files changed, 11 insertions, 7 deletions

diff --git a/media-sound/qmpdclient/ChangeLog b/media-sound/qmpdclient/ChangeLog
index 26cb9d5ef31e..13b16e807dff 100644
--- a/media-sound/qmpdclient/ChangeLog
+++ b/media-sound/qmpdclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/qmpdclient
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.32 2008/07/24 17:44:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.33 2008/07/26 21:28:46 carlo Exp $
+
+  26 Jul 2008; Carsten Lohrke <carlo@gentoo.org> qmpdclient-1.0.8.ebuild,
+  qmpdclient-1.0.8-r1.ebuild, qmpdclient-1.0.9.ebuild:
+  Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
 
   24 Jul 2008; Raúl Porcel <armin76@gentoo.org> qmpdclient-1.0.9.ebuild:
   x86 stable wrt #232002
diff --git a/media-sound/qmpdclient/qmpdclient-1.0.8-r1.ebuild b/media-sound/qmpdclient/qmpdclient-1.0.8-r1.ebuild
index c56a3bb97a88..496ee7f19a13 100644
--- a/media-sound/qmpdclient/qmpdclient-1.0.8-r1.ebuild
+++ b/media-sound/qmpdclient/qmpdclient-1.0.8-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-sound/qmpdclient/qmpdclient-1.0.8-r1.ebuild,v 1.4 2008/07/16 23:12:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.0.8-r1.ebuild,v 1.5 2008/07/26 21:28:46 carlo Exp $
 
 EAPI=1
 inherit eutils multilib qt4 toolchain-funcs
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND="|| ( =x11-libs/qt-4.3* x11-libs/qt-gui:4 )"
+DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-sound/qmpdclient/qmpdclient-1.0.8.ebuild b/media-sound/qmpdclient/qmpdclient-1.0.8.ebuild
index 19671cbb2436..a97d50a5bcc3 100644
--- a/media-sound/qmpdclient/qmpdclient-1.0.8.ebuild
+++ b/media-sound/qmpdclient/qmpdclient-1.0.8.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-sound/qmpdclient/qmpdclient-1.0.8.ebuild,v 1.11 2008/07/16 23:12:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.0.8.ebuild,v 1.12 2008/07/26 21:28:46 carlo Exp $
 
 EAPI=1
 inherit eutils multilib qt4 toolchain-funcs
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 hppa ppc x86"
 IUSE=""
 
-DEPEND="|| ( =x11-libs/qt-4.3* x11-libs/qt-gui:4 )"
+DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-sound/qmpdclient/qmpdclient-1.0.9.ebuild b/media-sound/qmpdclient/qmpdclient-1.0.9.ebuild
index ce7864aad1f5..26eb245f3bfa 100644
--- a/media-sound/qmpdclient/qmpdclient-1.0.9.ebuild
+++ b/media-sound/qmpdclient/qmpdclient-1.0.9.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-sound/qmpdclient/qmpdclient-1.0.9.ebuild,v 1.4 2008/07/24 17:44:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.0.9.ebuild,v 1.5 2008/07/26 21:28:46 carlo Exp $
 
 EAPI=1
 inherit eutils multilib qt4 toolchain-funcs
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ppc ~sparc x86"
 IUSE=""
 
-DEPEND="|| ( =x11-libs/qt-4.3* x11-libs/qt-gui:4 )"
+DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )"
 
 src_unpack() {
 	unpack ${A}