[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c4945b28532728c8aafd2804256e09c3002c883b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  3 17:58:25 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  8 20:07:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4945b28

qt5-build.eclass: xkbcommon-{evdev,x11} was dropped in >=5.12.1

Bug: https://bugs.gentoo.org/672340
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d709e3cd58b..ee4875deaad 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -612,10 +612,10 @@ qt5_base_configure() {
                -no-libpng -no-libjpeg
                -no-freetype -no-harfbuzz
                -no-openssl -no-libproxy
-               -no-xkbcommon-x11 -no-xkbcommon-evdev
                -no-xcb-xlib
-               $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2)
-               $([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput)
+               $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2 
-no-xkbcommon-x11 -no-xkbcommon-evdev)
+               $([[ ${PV} = 5.12.0* ]] && echo -no-xcb-xinput 
-no-xkbcommon-x11 -no-xkbcommon-evdev) # bug 672340
+               $([[ ${QT5_MINOR_VERSION} -ge 12 && ${PV} != 5.12.0* ]] && echo 
-no-xcb-xinput -no-xkbcommon) # bug 672340
 
                # cannot use -no-gif because there is no way to override it 
later
                #-no-gif