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

Package-Manager: portage-2.1.4.4

4 files changed, 12 insertions, 10 deletions

diff --git a/app-editors/juffed/ChangeLog b/app-editors/juffed/ChangeLog
index 0e0334776b80..0cd37d8122f0 100644
--- a/app-editors/juffed/ChangeLog
+++ b/app-editors/juffed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/juffed
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/ChangeLog,v 1.2 2008/07/07 23:58:09 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/ChangeLog,v 1.3 2008/07/27 02:09:27 carlo Exp $
+
+  27 Jul 2008; Carsten Lohrke <carlo@gentoo.org>
+  juffed-0.3_beta20080421.ebuild, juffed-0.3_beta20080705.ebuild:
+  Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
 
 *juffed-0.3_beta20080705 (07 Jul 2008)
 
diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest
index a0af1dcdbc57..75e1b7cad3de 100644
--- a/app-editors/juffed/Manifest
+++ b/app-editors/juffed/Manifest
@@ -1,6 +1,6 @@
 DIST juffed_0.3-beta2.tar.gz 107097 RMD160 dd65b128b55ec8395227f29607985326c3a195b2 SHA1 6dbde92a4ac55f1e53ba9e5b3f20e5ea1aa76f76 SHA256 f9984245de3d033b60b176423ade4baf7fd58e821b18f2f982e80ad2bf595b4b
 DIST juffed_0.3-dev-20080421.tar.gz 100770 RMD160 058cb7b84de962999d8cbf49012cbddae28bd142 SHA1 9ffe1cc16f6e0cbd4336bbb469be66b780e4abd5 SHA256 0a9700f93c371f9b934f8e7e801796d7f4b27405867aa25498c2b503fda91085
-EBUILD juffed-0.3_beta20080421.ebuild 999 RMD160 345937d4e9a62cc79696a537f3680e733c1a2f83 SHA1 8d9c5386e36a87fea60c4b1716676acaeee303c7 SHA256 825923e6e68c48703b1fd8aceee12d0c2c6a53073a5bb893e426401a37ea9250
-EBUILD juffed-0.3_beta20080705.ebuild 977 RMD160 7ace058c8e38ade85fd801e4bb7bd974652b635b SHA1 2a19ee2ed3dc8dca6443348fd8b5a242ae2d54b2 SHA256 e5fdfd7877d93d8e9c219a0661db795646b920f8464c684725d9c400c2b6d2b7
-MISC ChangeLog 707 RMD160 15496cb91db4b9c7a9afcb2a8ac29e3828c87382 SHA1 96d5b03c9ad27f1433d2937d738ad0bccc95f86e SHA256 6217423862833d29ac5bfee31f89a60af9c66b0dd4012e03f38ac8138f3b9405
+EBUILD juffed-0.3_beta20080421.ebuild 993 RMD160 a8a81e2bf9e366ef11538678b152e3998f839286 SHA1 f946a2b6bfa62d146bdf8cb61d5af2f4d7eae55e SHA256 825986c3fdebe06957cd72ca6df510ff0dba2f27440c7b9d362558701567417f
+EBUILD juffed-0.3_beta20080705.ebuild 971 RMD160 f744d7501f1961bf370aa6b63148a4366542693a SHA1 cce57ae6f9e6e2fc1cb747c13552d2d9042da060 SHA256 b2cb7afb5b2aa7e9ae7abcadf77f310c32ead998268b0c4fc3848c3343a53749
+MISC ChangeLog 889 RMD160 05099e50506c072d1a6e309b51c50d410ca4bd4e SHA1 3133083d05466daacbac6cbeac714043c1d7df5f SHA256 b1692ed73dab5f9514b9e7dc8473bbbbba30aedbf6bca0fedc73563b23cec054
 MISC metadata.xml 255 RMD160 e3e91ebc01de2437993e02feffb8acb60795a3aa SHA1 aeabb415f098f2396fc363625e54a0078aeb1eff SHA256 dda5e93ee2137815bce4c850c9b8e56862b8ef06cb7eefd806fbd799491123be
diff --git a/app-editors/juffed/juffed-0.3_beta20080421.ebuild b/app-editors/juffed/juffed-0.3_beta20080421.ebuild
index 7395983469aa..bb4cf09137f4 100644
--- a/app-editors/juffed/juffed-0.3_beta20080421.ebuild
+++ b/app-editors/juffed/juffed-0.3_beta20080421.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/app-editors/juffed/juffed-0.3_beta20080421.ebuild,v 1.2 2008/06/04 15:58:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/juffed-0.3_beta20080421.ebuild,v 1.3 2008/07/27 02:09:27 carlo Exp $
 
 EAPI=1
 inherit qt4
@@ -17,8 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/qscintilla-2.1
-	|| ( >=x11-libs/qt-4.2:4
-		x11-libs/qt-gui:4 )"
+	|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/app-editors/juffed/juffed-0.3_beta20080705.ebuild b/app-editors/juffed/juffed-0.3_beta20080705.ebuild
index 1568f645ae17..f561a8af6749 100644
--- a/app-editors/juffed/juffed-0.3_beta20080705.ebuild
+++ b/app-editors/juffed/juffed-0.3_beta20080705.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/app-editors/juffed/juffed-0.3_beta20080705.ebuild,v 1.2 2008/07/08 15:51:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/juffed-0.3_beta20080705.ebuild,v 1.3 2008/07/27 02:09:27 carlo Exp $
 
 EAPI=1
 inherit qt4
@@ -17,8 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/qscintilla-2.1
-	|| ( >=x11-libs/qt-4.2:4
-		x11-libs/qt-gui:4 )"
+	|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}