[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/

[Davide Pesavento]

commit:     5fa116b5b64531687d673a31455ce252180d67d4
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 28 12:55:44 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul 28 12:55:44 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5fa116b5

[dev-qt/qtgui:5] Fix xkb and xkbcommon support.

Package-Manager: portage-2.2.10

---
 dev-qt/qtgui/qtgui-5.3.1.ebuild    | 5 ++++-
 dev-qt/qtgui/qtgui-5.3.9999.ebuild | 5 ++++-
 dev-qt/qtgui/qtgui-5.9999.ebuild   | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1.ebuild
index ee936d2..88324f7 100644
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1.ebuild
@@ -107,6 +107,7 @@ QT5_GENTOO_CONFIG=(
        xcb:xcb-sm:SESSIONMANAGER
        xcb:xcb-xlib:
        xcb:xinput2:
+       xcb::XKB
 )
 
 pkg_setup() {
@@ -144,7 +145,9 @@ src_configure() {
                $(qt_use kms)
                $(qt_use png libpng system)
                $(qt_use udev libudev)
-               $(use xcb && echo -xcb -xcb-xlib -xinput2 -xrender -sm)
+               $(qt_use xcb xcb system)
+               $(qt_use xcb xkbcommon system)
+               $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender)
        )
        qt5-build_src_configure
 }

diff --git a/dev-qt/qtgui/qtgui-5.3.9999.ebuild 
b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
index ee936d2..88324f7 100644
--- a/dev-qt/qtgui/qtgui-5.3.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
@@ -107,6 +107,7 @@ QT5_GENTOO_CONFIG=(
        xcb:xcb-sm:SESSIONMANAGER
        xcb:xcb-xlib:
        xcb:xinput2:
+       xcb::XKB
 )
 
 pkg_setup() {
@@ -144,7 +145,9 @@ src_configure() {
                $(qt_use kms)
                $(qt_use png libpng system)
                $(qt_use udev libudev)
-               $(use xcb && echo -xcb -xcb-xlib -xinput2 -xrender -sm)
+               $(qt_use xcb xcb system)
+               $(qt_use xcb xkbcommon system)
+               $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender)
        )
        qt5-build_src_configure
 }

diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index a755ca2..8f5e29e 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -108,6 +108,7 @@ QT5_GENTOO_CONFIG=(
        xcb:xcb-sm:SESSIONMANAGER
        xcb:xcb-xlib:
        xcb:xinput2:
+       xcb::XKB
 )
 
 pkg_setup() {
@@ -145,7 +146,9 @@ src_configure() {
                $(qt_use kms)
                $(qt_use png libpng system)
                $(qt_use udev libudev)
-               $(use xcb && echo -xcb -xcb-xlib -xinput2 -xrender -sm)
+               $(qt_use xcb xcb system)
+               $(qt_use xcb xkbcommon system)
+               $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender)
        )
        qt5-build_src_configure
 }