public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-gui: qt-gui-4.6.2.ebuild qt-gui-4.5.3-r2.ebuild ChangeLog qt-gui-4.6.2-r1.ebuild qt-gui-4.6.3.ebuild qt-gui-4.7.0.ebuild
@ 2010-09-26 13:32 Alex Alexander (wired)
  0 siblings, 0 replies; only message in thread
From: Alex Alexander (wired) @ 2010-09-26 13:32 UTC (permalink / raw
  To: gentoo-commits

wired       10/09/26 13:32:36

  Modified:             qt-gui-4.6.2.ebuild qt-gui-4.5.3-r2.ebuild
                        ChangeLog qt-gui-4.6.2-r1.ebuild
                        qt-gui-4.6.3.ebuild qt-gui-4.7.0.ebuild
  Log:
  temporarily fix bug 336801 by depending on cairo[-qt4]
  
  (Portage version: 2.2_rc86/cvs/Linux x86_64)

Revision  Changes    Path
1.9                  x11-libs/qt-gui/qt-gui-4.6.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2.ebuild?r1=1.8&r2=1.9

Index: qt-gui-4.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qt-gui-4.6.2.ebuild	13 Sep 2010 21:20:24 -0000	1.8
+++ qt-gui-4.6.2.ebuild	26 Sep 2010 13:32:36 -0000	1.9
@@ -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 @@
 		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=] )"
 



1.11                 x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild?r1=1.10&r2=1.11

Index: qt-gui-4.5.3-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qt-gui-4.5.3-r2.ebuild	23 Jul 2010 22:27:02 -0000	1.10
+++ qt-gui-4.5.3-r2.ebuild	26 Sep 2010 13:32:36 -0000	1.11
@@ -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 @@
 	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=] )"



1.115                x11-libs/qt-gui/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.115&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.115&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?r1=1.114&r2=1.115

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- ChangeLog	24 Sep 2010 07:00:33 -0000	1.114
+++ ChangeLog	26 Sep 2010 13:32:36 -0000	1.115
@@ -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_



1.3                  x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild?r1=1.2&r2=1.3

Index: qt-gui-4.6.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-gui-4.6.2-r1.ebuild	12 May 2010 09:52:47 -0000	1.2
+++ qt-gui-4.6.2-r1.ebuild	26 Sep 2010 13:32:36 -0000	1.3
@@ -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 @@
 		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=] )"
 



1.3                  x11-libs/qt-gui/qt-gui-4.6.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3.ebuild?r1=1.2&r2=1.3

Index: qt-gui-4.6.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-gui-4.6.3.ebuild	23 Jul 2010 22:27:02 -0000	1.2
+++ qt-gui-4.6.3.ebuild	26 Sep 2010 13:32:36 -0000	1.3
@@ -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 @@
 		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=] )"
 



1.4                  x11-libs/qt-gui/qt-gui-4.7.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild?r1=1.3&r2=1.4

Index: qt-gui-4.7.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt-gui-4.7.0.ebuild	24 Sep 2010 07:00:33 -0000	1.3
+++ qt-gui-4.7.0.ebuild	26 Sep 2010 13:32:36 -0000	1.4
@@ -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 @@
 		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=] )"
 






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2010-09-26 13:32 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-26 13:32 [gentoo-commits] gentoo-x86 commit in x11-libs/qt-gui: qt-gui-4.6.2.ebuild qt-gui-4.5.3-r2.ebuild ChangeLog qt-gui-4.6.2-r1.ebuild qt-gui-4.6.3.ebuild qt-gui-4.7.0.ebuild Alex Alexander (wired)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox