commit: cc7af6de212bf63a2cf4d51a0e2ad00c4255da1e
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 20:56:01 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> 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
