From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OzrLQ-0005Kz-Vh for garchives@archives.gentoo.org; Sun, 26 Sep 2010 13:32:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8055BE0683; Sun, 26 Sep 2010 13:32:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 42561E0683 for ; Sun, 26 Sep 2010 13:32:40 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 357C0672A1 for ; Sun, 26 Sep 2010 13:32:38 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2252) id A895920051; Sun, 26 Sep 2010 13:32:36 +0000 (UTC) From: "Alex Alexander (wired)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, wired@gentoo.org Subject: [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 X-VCS-Repository: gentoo-x86 X-VCS-Files: 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 X-VCS-Directories: x11-libs/qt-gui X-VCS-Committer: wired X-VCS-Committer-Name: Alex Alexander Content-Type: text/plain; charset=utf8 Message-Id: <20100926133236.A895920051@flycatcher.gentoo.org> Date: Sun, 26 Sep 2010 13:32:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d82d74f8-bcfb-433e-a34f-1baf1cb99a90 X-Archives-Hash: 61466f32f0596ee29a63415bc1c3cab8 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] =20 (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=3D1.9&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt= -gui-4.6.2.ebuild?rev=3D1.9&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt= -gui-4.6.2.ebuild?r1=3D1.8&r2=3D1.9 Index: qt-gui-4.6.2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 $ =20 EAPI=3D"2" inherit confutils eutils qt4-build @@ -38,6 +38,7 @@ x11-proto/xextproto x11-proto/inputproto ) + gtk? ( || ( >=3Dx11-libs/cairo-1.10.0[-qt4] =3Dx11-libs/cairo-1.10.0[-qt4] 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] =20 24 Sep 2010; Alex Alexander 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=3D1.3&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt= -gui-4.6.2-r1.ebuild?rev=3D1.3&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt= -gui-4.6.2-r1.ebuild?r1=3D1.2&r2=3D1.3 Index: qt-gui-4.6.2-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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.ebuil= d,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.ebuil= d,v 1.3 2010/09/26 13:32:36 wired Exp $ =20 EAPI=3D"2" inherit confutils eutils qt4-build @@ -38,6 +38,7 @@ x11-proto/xextproto x11-proto/inputproto ) + gtk? ( || ( >=3Dx11-libs/cairo-1.10.0[-qt4] =3Dx11-libs/cairo-1.10.0[-qt4] =3Dx11-libs/cairo-1.10.0[-qt4]