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 2D12C138D04 for ; Tue, 23 Jun 2015 20:57:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3163AE0935; Tue, 23 Jun 2015 20:57:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4E80E0935 for ; Tue, 23 Jun 2015 20:57:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 89C623409AA for ; Tue, 23 Jun 2015 20:57:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15DB0A55 for ; Tue, 23 Jun 2015 20:57:09 +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: <1435092961.cc7af6de212bf63a2cf4d51a0e2ad00c4255da1e.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtgui/qtgui-5.5.0_rc.ebuild dev-qt/qtgui/qtgui-5.5.9999.ebuild dev-qt/qtgui/qtgui-5.9999.ebuild X-VCS-Directories: dev-qt/qtgui/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: cc7af6de212bf63a2cf4d51a0e2ad00c4255da1e X-VCS-Branch: master Date: Tue, 23 Jun 2015 20:57:09 +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: 7c0a1a9a-0b30-4137-ab87-ba667fa08475 X-Archives-Hash: 7093df6fefb62072bb314b7bf4148bdb commit: cc7af6de212bf63a2cf4d51a0e2ad00c4255da1e Author: Davide Pesavento gentoo org> AuthorDate: Tue Jun 23 20:56:01 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Jun 23 20:56:01 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cc7af6de [dev-qt/qtgui:5] Rework how we enable/disable certain plugins. Package-Manager: portage-2.2.20 dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 13 ++++++------- dev-qt/qtgui/qtgui-5.5.9999.ebuild | 13 ++++++------- dev-qt/qtgui/qtgui-5.9999.ebuild | 13 ++++++------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild index dc1a65f..2ec9eca 100644 --- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild +++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild @@ -81,6 +81,8 @@ QT5_TARGET_SUBDIRS=( src/plugins/generic src/plugins/imageformats src/plugins/platforms + src/plugins/platforminputcontexts + src/plugins/platformthemes ) QT5_GENTOO_CONFIG=( @@ -119,20 +121,17 @@ QT5_GENTOO_CONFIG=( xcb::XKB ) -pkg_setup() { - use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) - use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) - use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose) - +src_prepare() { # egl_x11 is activated when both egl and xcb are enabled use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) -} -src_prepare() { # avoid automagic dep on qtdbus use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ src/platformsupport/platformsupport.pro || die + qt_use_disable_mod ibus dbus \ + src/plugins/platforminputcontexts/platforminputcontexts.pro + # avoid automagic dep on qtnetwork use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \ src/plugins/generic/generic.pro || die diff --git a/dev-qt/qtgui/qtgui-5.5.9999.ebuild b/dev-qt/qtgui/qtgui-5.5.9999.ebuild index dc1a65f..2ec9eca 100644 --- a/dev-qt/qtgui/qtgui-5.5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.5.9999.ebuild @@ -81,6 +81,8 @@ QT5_TARGET_SUBDIRS=( src/plugins/generic src/plugins/imageformats src/plugins/platforms + src/plugins/platforminputcontexts + src/plugins/platformthemes ) QT5_GENTOO_CONFIG=( @@ -119,20 +121,17 @@ QT5_GENTOO_CONFIG=( xcb::XKB ) -pkg_setup() { - use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) - use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) - use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose) - +src_prepare() { # egl_x11 is activated when both egl and xcb are enabled use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) -} -src_prepare() { # avoid automagic dep on qtdbus use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ src/platformsupport/platformsupport.pro || die + qt_use_disable_mod ibus dbus \ + src/plugins/platforminputcontexts/platforminputcontexts.pro + # avoid automagic dep on qtnetwork use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \ src/plugins/generic/generic.pro || die diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild index dc1a65f..2ec9eca 100644 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild @@ -81,6 +81,8 @@ QT5_TARGET_SUBDIRS=( src/plugins/generic src/plugins/imageformats src/plugins/platforms + src/plugins/platforminputcontexts + src/plugins/platformthemes ) QT5_GENTOO_CONFIG=( @@ -119,20 +121,17 @@ QT5_GENTOO_CONFIG=( xcb::XKB ) -pkg_setup() { - use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) - use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) - use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose) - +src_prepare() { # egl_x11 is activated when both egl and xcb are enabled use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) -} -src_prepare() { # avoid automagic dep on qtdbus use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ src/platformsupport/platformsupport.pro || die + qt_use_disable_mod ibus dbus \ + src/plugins/platforminputcontexts/platforminputcontexts.pro + # avoid automagic dep on qtnetwork use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \ src/plugins/generic/generic.pro || die