From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7FBFB138995 for ; Mon, 11 Feb 2013 09:44:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0465B21C00D; Mon, 11 Feb 2013 09:44:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7448821C00D for ; Mon, 11 Feb 2013 09:44:50 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 71EED33E62A for ; Mon, 11 Feb 2013 09:44:49 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2307) id 3A9AA2171D; Mon, 11 Feb 2013 09:44:48 +0000 (UTC) From: "Davide Pesavento (pesa)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, pesa@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-gui: qt-gui-4.8.4-r1.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: qt-gui-4.8.4-r1.ebuild ChangeLog X-VCS-Directories: x11-libs/qt-gui X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130211094448.3A9AA2171D@flycatcher.gentoo.org> Date: Mon, 11 Feb 2013 09:44:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6a55c7dc-9dce-45da-ae70-ca97f8a3cca5 X-Archives-Hash: 3b96e553211742489b667b8bffb5624f pesa 13/02/11 09:44:48 Modified: qt-gui-4.8.4-r1.ebuild ChangeLog Log: Depend on cairo[-qt4] if gtkstyle is enabled, wrt bug 454066. Remove dead code in pkg_setup. (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 17A85C72) Revision Changes Path 1.8 x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild?r1=1.7&r2=1.8 Index: qt-gui-4.8.4-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qt-gui-4.8.4-r1.ebuild 10 Feb 2013 23:50:24 -0000 1.7 +++ qt-gui-4.8.4-r1.ebuild 11 Feb 2013 09:44:48 -0000 1.8 @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.8.4-r1.ebuild,v 1.7 2013/02/10 23:50:24 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild,v 1.8 2013/02/11 09:44:48 pesa Exp $ EAPI=4 @@ -19,6 +19,7 @@ gtkstyle? ( glib ) " +# cairo[-qt4] is needed because of bug 454066 RDEPEND=" app-admin/eselect-qtgraphicssystem media-libs/fontconfig @@ -43,7 +44,10 @@ cups? ( net-print/cups ) dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] ) egl? ( media-libs/mesa[egl] ) - gtkstyle? ( x11-libs/gtk+:2[aqua=] ) + gtkstyle? ( + x11-libs/cairo[-qt4] + x11-libs/gtk+:2[aqua=] + ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) tiff? ( media-libs/tiff:0 ) @@ -64,27 +68,6 @@ ) pkg_setup() { - # this belongs to pkg_pretend, we have to upgrade to EAPI 4 :) - # was planning to use a dep, but to reproduce this you have to - # clean-emerge qt-gui[gtkstyle] while having cairo[qt4] installed. - # no need to restrict normal first time users for that :) - if use gtkstyle && ! has_version x11-libs/qt-gui && has_version x11-libs/cairo[qt4]; then - echo - eerror "When building qt-gui[gtkstyle] from scratch with cairo present," - eerror "cairo must have the qt4 use flag disabled, otherwise the gtk" - eerror "style cannot be built." - ewarn - eerror "You have the following options:" - eerror " - rebuild cairo with -qt4 USE" - eerror " - build qt-gui with -gtkstyle USE" - ewarn - eerror "After you successfully install qt-gui, you'll be able to" - eerror "re-enable the disabled use flag and/or reinstall cairo." - ewarn - echo - die "can't build ${PN} with USE=gtkstyle if cairo has 'qt4' USE flag enabled" - fi - QT4_TARGET_DIRECTORIES=" src/gui src/scripttools 1.227 x11-libs/qt-gui/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.227&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.227&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?r1=1.226&r2=1.227 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v retrieving revision 1.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- ChangeLog 10 Feb 2013 23:50:24 -0000 1.226 +++ ChangeLog 11 Feb 2013 09:44:48 -0000 1.227 @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-gui # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.226 2013/02/10 23:50:24 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.227 2013/02/11 09:44:48 pesa Exp $ + + 11 Feb 2013; Davide Pesavento qt-gui-4.8.4-r1.ebuild: + Depend on cairo[-qt4] if gtkstyle is enabled, wrt bug 454066. Remove dead code + in pkg_setup. 10 Feb 2013; Jeroen Roovers qt-gui-4.8.4-r1.ebuild: Stable for HPPA (bug #455884).