commit: cb9be82a3738b8c2f5c6818a21997855cc68d5b1
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 17:59:13 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 17:59:13 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cb9be82a
[dev-qt/qtgui:5] Add USE=dbus to control platformsupport/dbus{menu,tray}.
Package-Manager: portage-2.2.20
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 18 +++++++++++++-----
dev-qt/qtgui/qtgui-5.5.9999.ebuild | 18 +++++++++++++-----
dev-qt/qtgui/qtgui-5.9999.ebuild | 18 +++++++++++++-----
3 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index 5f18a22..e890de3 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -14,10 +14,12 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg
kms +png tslib udev +xcb"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus
jpeg kms +png tslib udev +xcb"
REQUIRED_USE="
+ accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
+ ibus? ( dbus )
kms? ( egl gles2 )
"
@@ -28,6 +30,7 @@ RDEPEND="
>=media-libs/freetype-2.5.5:2
>=sys-libs/zlib-1.2.5
virtual/opengl
+ dbus? ( ~dev-qt/qtdbus-${PV} )
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gtkstyle? (
@@ -37,7 +40,6 @@ RDEPEND="
)
gles2? ( media-libs/mesa[gles2] )
harfbuzz? ( >=media-libs/harfbuzz-0.9.40:= )
- ibus? ( ~dev-qt/qtdbus-${PV} )
jpeg? ( virtual/jpeg:0 )
kms? (
media-libs/mesa[gbm]
@@ -59,7 +61,6 @@ RDEPEND="
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-renderutil
x11-libs/xcb-util-wm
- accessibility? ( ~dev-qt/qtdbus-${PV} )
)
"
DEPEND="${RDEPEND}
@@ -125,10 +126,17 @@ pkg_setup() {
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
+
+ qt5-build_src_prepare
+}
+
src_configure() {
local myconf=(
- $(use accessibility && usex xcb -dbus-linked '')
- $(usex ibus -dbus-linked '')
+ $(usex dbus -dbus-linked '')
$(qt_use egl)
$(qt_use eglfs)
$(qt_use evdev)
diff --git a/dev-qt/qtgui/qtgui-5.5.9999.ebuild
b/dev-qt/qtgui/qtgui-5.5.9999.ebuild
index 5f18a22..e890de3 100644
--- a/dev-qt/qtgui/qtgui-5.5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.9999.ebuild
@@ -14,10 +14,12 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg
kms +png tslib udev +xcb"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus
jpeg kms +png tslib udev +xcb"
REQUIRED_USE="
+ accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
+ ibus? ( dbus )
kms? ( egl gles2 )
"
@@ -28,6 +30,7 @@ RDEPEND="
>=media-libs/freetype-2.5.5:2
>=sys-libs/zlib-1.2.5
virtual/opengl
+ dbus? ( ~dev-qt/qtdbus-${PV} )
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gtkstyle? (
@@ -37,7 +40,6 @@ RDEPEND="
)
gles2? ( media-libs/mesa[gles2] )
harfbuzz? ( >=media-libs/harfbuzz-0.9.40:= )
- ibus? ( ~dev-qt/qtdbus-${PV} )
jpeg? ( virtual/jpeg:0 )
kms? (
media-libs/mesa[gbm]
@@ -59,7 +61,6 @@ RDEPEND="
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-renderutil
x11-libs/xcb-util-wm
- accessibility? ( ~dev-qt/qtdbus-${PV} )
)
"
DEPEND="${RDEPEND}
@@ -125,10 +126,17 @@ pkg_setup() {
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
+
+ qt5-build_src_prepare
+}
+
src_configure() {
local myconf=(
- $(use accessibility && usex xcb -dbus-linked '')
- $(usex ibus -dbus-linked '')
+ $(usex dbus -dbus-linked '')
$(qt_use egl)
$(qt_use eglfs)
$(qt_use evdev)
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index 5f18a22..e890de3 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -14,10 +14,12 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg
kms +png tslib udev +xcb"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus
jpeg kms +png tslib udev +xcb"
REQUIRED_USE="
+ accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
+ ibus? ( dbus )
kms? ( egl gles2 )
"
@@ -28,6 +30,7 @@ RDEPEND="
>=media-libs/freetype-2.5.5:2
>=sys-libs/zlib-1.2.5
virtual/opengl
+ dbus? ( ~dev-qt/qtdbus-${PV} )
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gtkstyle? (
@@ -37,7 +40,6 @@ RDEPEND="
)
gles2? ( media-libs/mesa[gles2] )
harfbuzz? ( >=media-libs/harfbuzz-0.9.40:= )
- ibus? ( ~dev-qt/qtdbus-${PV} )
jpeg? ( virtual/jpeg:0 )
kms? (
media-libs/mesa[gbm]
@@ -59,7 +61,6 @@ RDEPEND="
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-renderutil
x11-libs/xcb-util-wm
- accessibility? ( ~dev-qt/qtdbus-${PV} )
)
"
DEPEND="${RDEPEND}
@@ -125,10 +126,17 @@ pkg_setup() {
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
+
+ qt5-build_src_prepare
+}
+
src_configure() {
local myconf=(
- $(use accessibility && usex xcb -dbus-linked '')
- $(usex ibus -dbus-linked '')
+ $(usex dbus -dbus-linked '')
$(qt_use egl)
$(qt_use eglfs)
$(qt_use evdev)
