temporarily fix bug 336801 by depending on cairo[-qt4]

(Portage version: 2.2_rc86/cvs/Linux x86_64)

6 files changed, 16 insertions, 6 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 9f6c69ea9020..0ecd1ee708bb 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.114 2010/09/24 07:00:33 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.115 2010/09/26 13:32:36 wired Exp $
+
+  26 Sep 2010; Alex Alexander <wired@gentoo.org> qt-gui-4.5.3-r2.ebuild,
+  qt-gui-4.6.2.ebuild, qt-gui-4.6.2-r1.ebuild, qt-gui-4.6.3.ebuild,
+  qt-gui-4.7.0.ebuild:
+  temporarily fix bug 336801 by depending on cairo[-qt4]
 
   24 Sep 2010; Alex Alexander <wired@gentoo.org> qt-gui-4.7.0.ebuild:
   prefix fix, thanks to heiko_
diff --git a/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild
index a8ef3bd519b5..c66d0b6b6c01 100644
--- a/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild,v 1.10 2010/07/23 22:27:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild,v 1.11 2010/09/26 13:32:36 wired Exp $
 
 EAPI="2"
 inherit eutils qt4-build
@@ -33,6 +33,7 @@ RDEPEND="media-libs/fontconfig
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
 	xinerama? ( x11-proto/xineramaproto )
+	gtk? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) )
 	x11-proto/xextproto
 	x11-proto/inputproto"
 PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[debug=] )"
diff --git a/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild
index 07a8355949a3..1d025b8a066c 100644
--- a/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild,v 1.2 2010/05/12 09:52:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild,v 1.3 2010/09/26 13:32:36 wired Exp $
 
 EAPI="2"
 inherit confutils eutils qt4-build
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 		x11-proto/xextproto
 		x11-proto/inputproto
 	)
+	gtk? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) )
 	xinerama? ( x11-proto/xineramaproto )"
 PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
 
diff --git a/x11-libs/qt-gui/qt-gui-4.6.2.ebuild b/x11-libs/qt-gui/qt-gui-4.6.2.ebuild
index a7752b6f0337..d2327e5ac05c 100644
--- a/x11-libs/qt-gui/qt-gui-4.6.2.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2.ebuild,v 1.8 2010/09/13 21:20:24 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2.ebuild,v 1.9 2010/09/26 13:32:36 wired Exp $
 
 EAPI="2"
 inherit confutils eutils qt4-build
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 		x11-proto/xextproto
 		x11-proto/inputproto
 	)
+	gtk? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) )
 	xinerama? ( x11-proto/xineramaproto )"
 PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
 
diff --git a/x11-libs/qt-gui/qt-gui-4.6.3.ebuild b/x11-libs/qt-gui/qt-gui-4.6.3.ebuild
index ca262ed71f4e..16f516f10ef2 100644
--- a/x11-libs/qt-gui/qt-gui-4.6.3.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3.ebuild,v 1.2 2010/07/23 22:27:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3.ebuild,v 1.3 2010/09/26 13:32:36 wired Exp $
 
 EAPI="2"
 inherit confutils eutils qt4-build
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 		x11-proto/xextproto
 		x11-proto/inputproto
 	)
+	gtk? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) )
 	xinerama? ( x11-proto/xineramaproto )"
 PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
 
diff --git a/x11-libs/qt-gui/qt-gui-4.7.0.ebuild b/x11-libs/qt-gui/qt-gui-4.7.0.ebuild
index c374ac24c942..d198df273370 100644
--- a/x11-libs/qt-gui/qt-gui-4.7.0.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild,v 1.3 2010/09/24 07:00:33 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild,v 1.4 2010/09/26 13:32:36 wired Exp $
 
 EAPI="3"
 inherit confutils qt4-build
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 		x11-proto/xextproto
 		x11-proto/inputproto
 	)
+	gtk? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) )
 	xinerama? ( x11-proto/xineramaproto )"
 PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"