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

Package-Manager: portage-2.1.4.4

5 files changed, 15 insertions, 11 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/Manifest b/media-sound/qmpdclient/Manifest
index ad67a3775eb1..619f9d89e089 100644
--- a/media-sound/qmpdclient/Manifest
+++ b/media-sound/qmpdclient/Manifest
@@ -1,8 +1,8 @@
 AUX 1.0.8-argc-ref-fix.patch 1088 RMD160 3051805d1fee865c688932fb8f5b3bb2e677e7c3 SHA1 79ea75eef9d224fd4bc9abb3e172dec03f5bc813 SHA256 384c0bb68beac7d7a81eb4f760ca3835974dc19fc495f2d4e00086f85fa04165
 DIST qmpdclient-1.0.8.tar.gz 190349 RMD160 1f3d25c24c3724204ac82630d6c1a1914800a228 SHA1 0711d19a117634e97ba1f568cd186a5cfaf35e3c SHA256 2b9076a5c51b2c201f64e74b8756645427de539974fda10c8dd77dd2b7973381
 DIST qmpdclient-1.0.9.tar.gz 181058 RMD160 ab70218ff0088596ad92326e5cb0e14f4404e642 SHA1 579ce90eb9bcfe9a7c5a63763f219c28a063a3c4 SHA256 4b979cbb8429f86cca49ee5b307c3971b16e6e21f6ea303ec55638ccf5025a3b
-EBUILD qmpdclient-1.0.8-r1.ebuild 1229 RMD160 7c2b143bacc532d8da481240f9f00ebcf423653e SHA1 720201ec4c955446f21aec19d6e9e05f639137ea SHA256 11a48c9a5b12e020ae1df7d5140120892c16caca6f822b1e8d732fedb93bd468
-EBUILD qmpdclient-1.0.8.ebuild 1531 RMD160 2e357ad8b3b3c5b089d4ba043afca88e906526c6 SHA1 fafc39a206a7cf65f805718b4f2286133f2a4183 SHA256 1d9688660934eac55bb4d2a1469c425f944b7fb278f03aeaabf69ff14e781e5b
-EBUILD qmpdclient-1.0.9.ebuild 1114 RMD160 ba2401746cfaa612a61d2f700e1c2c82ce4bd97a SHA1 7e0c8d51b762b28894df1b242632b3b2fb0db74e SHA256 996b2eb27575d28fea61c27a8f339c4c4ff408c09ca5521746e8f209e79e180f
-MISC ChangeLog 5408 RMD160 9a19b7d98638aecc10a52eae72c03c498ef0e44a SHA1 fc51bd1fbbe83a48a1dcf76306884b158091f255 SHA256 2526813d1543d8389c99ee0a7b4851dc45e3c0f05e06401309c005b8c099c75d
+EBUILD qmpdclient-1.0.8-r1.ebuild 1225 RMD160 2d3ce10913a0baaed48c31d67f3f230e91969096 SHA1 0fcfda0be43156492bd4f084bda2ec1eef57f9df SHA256 f79da5d0102bee08498c6f3edb1312f154239a56c3a83931c91766246618ad21
+EBUILD qmpdclient-1.0.8.ebuild 1527 RMD160 7e926e072b8a6dbdb0d09306ce56d790a6431ef6 SHA1 c58f5712cf44cfdfdb69195aeedadcb814bb8f9a SHA256 067632db710c2f77bd555252bcddd2fca3be8e749d4cdf6794867b16fd7b366e
+EBUILD qmpdclient-1.0.9.ebuild 1112 RMD160 0e203c85bf14eb4831f8af196b92afd9e07be3f7 SHA1 5b8f9e9cf23964b79e5f363644e95c25b181a6a5 SHA256 cbc9dfff6a1ea9d1a5091f5e37f70b39f24e67769e4655fdac47ddd431601a50
+MISC ChangeLog 5603 RMD160 db777d7f7870bef3fb8b79378d78b5e2ab25e567 SHA1 c66e0991e2016b7eb0c72f9ff1f270490cbda962 SHA256 6ca83d3789bc8cc8839e56501b31d2134559d52e294beb6249cef3733015fae0
 MISC metadata.xml 258 RMD160 f32ba62126b21562a3642f9d351eec482fa91c19 SHA1 c9dcd2a5a50ab150a1ddd117357dd705c4d05e77 SHA256 3f6828f13a57795ebfa18907e3cb7a9bf80b7be961ab0b198ec135762e90c723
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}