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 80D391389EF for ; Wed, 13 Feb 2013 08:38:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 440B421C001; Wed, 13 Feb 2013 08:38:16 +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 C5A7921C001 for ; Wed, 13 Feb 2013 08:38:15 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B010E33E670 for ; Wed, 13 Feb 2013 08:38:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E7184E4073 for ; Wed, 13 Feb 2013 08:38:11 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1360744651.ef58d3d2c39b219152829c458d5fd40de1933caa.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/ X-VCS-Repository: proj/qt X-VCS-Files: x11-libs/qt-gui/qt-gui-4.8.9999.ebuild X-VCS-Directories: x11-libs/qt-gui/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: ef58d3d2c39b219152829c458d5fd40de1933caa X-VCS-Branch: master Date: Wed, 13 Feb 2013 08:38:11 +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: f14689a5-4cc3-4696-aa97-3ee44c3b73eb X-Archives-Hash: 304336766b2b958e815087eb86c34040 commit: ef58d3d2c39b219152829c458d5fd40de1933caa Author: Davide Pesavento gmail com> AuthorDate: Wed Feb 13 08:37:31 2013 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Wed Feb 13 08:37:31 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ef58d3d2 [x11-libs/qt-gui:4] Sync with portage. --- x11-libs/qt-gui/qt-gui-4.8.9999.ebuild | 33 +++++++------------------------ 1 files changed, 8 insertions(+), 25 deletions(-) diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild index acf33ef..9fc733f 100644 --- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild @@ -19,6 +19,7 @@ REQUIRED_USE=" gtkstyle? ( glib ) " +# cairo[-qt4] is needed because of bug 454066 RDEPEND=" app-admin/eselect-qtgraphicssystem media-libs/fontconfig @@ -43,7 +44,10 @@ RDEPEND=" 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 ) @@ -63,27 +67,6 @@ PATCHES=( ) 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 @@ -144,7 +127,7 @@ src_configure() { $(qt_use xv xvideo)" myconf+=" - -system-libpng -system-libjpeg + -system-libpng -system-libjpeg -system-zlib -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" @@ -163,7 +146,7 @@ src_configure() { src_install() { QCONFIG_ADD=" - mitshm x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync + mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync fontconfig gif png system-png jpeg system-jpeg $(usev accessibility) $(usev cups) @@ -184,7 +167,7 @@ src_install() { $(use nas && echo QT_NAS) $(use nis && echo QT_NIS) $(use tiff && echo QT_IMAGEFORMAT_TIFF) - QT_SESSIONMANAGER QT_SHAPE QT_XCURSOR QT_XFIXES + QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES $(use xinerama && echo QT_XINERAMA) QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC $(use xv && echo QT_XVIDEO)"