gentoo resync 08.09.2018

6 files changed, 2 insertions, 507 deletions

diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 229686469021..8808dcf702da 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,10 +1,5 @@
-AUX qtgui-5.9.4-libinput-pixeldelta.patch 3597 BLAKE2B 88f54e4c832f132472aea296e8bcc4cf318456af48db3e260eed30b620acf98af0cfa2abd6d396a1396be678e133f5721cccbc79877d4f8934606aba6a0d6d39 SHA512 47aa0fb3971cd956d08fac4ace0b98b4034178d00c89db3fe31060d548acb8a075621dc2fb43ef0357dee79a927f82a7626e6cdf784b009028ae1435f68176d4
-AUX qtgui-5.9.4-opengl.patch 3586 BLAKE2B 56e5192b0455c8d6ccd307466fe9583c7ac8f3a6114bc3bfed62dad36aa7f72eb505452da4fd2af1ea3b2bb24241ac1716332064e5a97d0c97951ea92ddd55a6 SHA512 d77fbd4e44d32f70b9047f7ae4531684e7d142b659be03ead0bce0252635a6bd35eaa8cd5d0cbcca59a19ee740f809ca6ad950dd199805fa6a379e41fbb68582
-AUX qtgui-5.9.4-qsimpledrag.patch 6887 BLAKE2B 9da87acfe69c1cb8b1dd92b05a7b919d01227d0aa1316adfe97261bd59a7e0eb3b1e6d9b0896cc2f6a6a64eac3f31f72039a3acc2767998a668656acc8d8ffc2 SHA512 8229b87a40287c3c6e74d5aec9bfc346a1e0f7002687ba661573566ff5f700c99819850fc97f07d3a36d63ba83348f2ab315f835e44abce22242b4d1f29e7c7b
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
 EBUILD qtgui-5.11.1.ebuild 3582 BLAKE2B afd6e3826fd0174918df37a35cc2b302c916e4604d73d2d393bfa22af246f2db6aab41ecf93a5914bac689e28c9030cd964a7f472a5cdcd8596a9f1729f26cc9 SHA512 a2738fa9656b28c7b7de86ef0a08d29746f3fd614b3244e6d19b45d4c9bf5082d8328d19f714859fc050910a575fc31c5dadf522bf2c509f71e652cb394cff79
-EBUILD qtgui-5.9.4-r3.ebuild 3725 BLAKE2B d83d8e0c8407a8d4e9c0b7ab22f9c5bea55d4ebccba03b17ea70d22d00bff15ffe9bf8bedc1c8ce860d3f80ccbe38bfbef60ba656c0524d6a4dddac95c0f7488 SHA512 9d1e09c76bc4581c54a17b635de66a478a95dbc23072c27e593f4fad0b207b4825ccd2ccac83c873f68cc4ecbd97cfe10cec40c07f784e2420c0d245656e877b
-EBUILD qtgui-5.9.6.ebuild 3561 BLAKE2B e13ce2fbc4bbd9ffad3441f6ad58750b3ab51a6767235df8db21d67c76e0c55373f08c42ea5c76c2e0442f2931dcd7c920c0a810d2636fa04f743a7ff67e45dc SHA512 538be305b7dd0571ab5956d9fc8d48374854a719afb78637c0c1b1d095e5397ec1c702439a9232504aac2eb87527f7b4f545da239e20b39dcd18a309552eb722
+EBUILD qtgui-5.9.6.ebuild 3560 BLAKE2B 8f85331e6c6ae16810f546a993a2b19ac94f358ff84a6610f49eef9184b42329b2c1b096f857bf958ff12c122d72baddfeb00e762a63d4219ecd0e4d601b054a SHA512 ff2e051a60f35b729827e57fbe5ff0d40449536cb3dd2f79658435b747bbc72fa356c4b42e44a9b76b4725483857af90037c0773b8a05d1854aa32bc7137a217
 MISC metadata.xml 1200 BLAKE2B 272e152cc1a9d596407c3d687fbb7b9f7b1b553cbf07e78e649031a427782f3377d3ee71d40e472b6f5978a8c1e9c2bfb9c0669edebcfcd1605d27973ba0ba1b SHA512 5ed40f7fdc6e289bd23bc5d4ce54794e58acf8c14863c45fe228d29c555e3afff84ee5b73f6f9e6be8b43e2ca28a96e4a73c22129ed2099262b5f682bf8b3aa6
diff --git a/dev-qt/qtgui/files/qtgui-5.9.4-libinput-pixeldelta.patch b/dev-qt/qtgui/files/qtgui-5.9.4-libinput-pixeldelta.patch
deleted file mode 100644
index b9adb8b2f623..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.9.4-libinput-pixeldelta.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From d196036024697a75868c1f1626525710495ca428 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Thu, 23 Nov 2017 14:25:04 +0100
-Subject: [PATCH] Avoid providing bad pixelDeltas on X11
-
-With libinput we now get a hardcoded resolution that is unrelated to
-the hardware. So avoid using that as a real pixel delta and document
-pixel deltas as being driver specific and unreliable on X11.
-
-Task-number: QTBUG-59261
-Change-Id: I9fe86d80e7ccd290ed2e4091d7eafa52cb537d34
-Reviewed-by: David Edmundson <davidedmundson@kde.org>
-Reviewed-by: Marco Martin <mart@kde.org>
-Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
----
- src/gui/kernel/qevent.cpp                        |  1 +
- src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 14 ++++++++------
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
-index 06d52aa..c68f9af 100644
---- a/src/gui/kernel/qevent.cpp
-+++ b/src/gui/kernel/qevent.cpp
-@@ -971,6 +971,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
-     \li scrolling is about to begin, but the distance did not yet change (Qt::ScrollBegin),
-     \li or scrolling has ended and the distance did not change anymore (Qt::ScrollEnd).
-     \endlist
-+    \note On X11 this value is driver specific and unreliable, use angleDelta() instead
- */
- 
- /*!
-diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
-index d1d97af..94f543f 100644
---- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
-+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
-@@ -953,10 +953,12 @@ void QXcbConnection::xi2HandleScrollEvent(void *event, ScrollingDevice &scrollin
-                     double delta = scrollingDevice.lastScrollPosition.y() - value;
-                     scrollingDevice.lastScrollPosition.setY(value);
-                     angleDelta.setY((delta / scrollingDevice.verticalIncrement) * 120);
--                    // We do not set "pixel" delta if it is only measured in ticks.
--                    if (scrollingDevice.verticalIncrement > 1)
-+                    // With most drivers the increment is 1 for wheels.
-+                    // For libinput it is hardcoded to a useless 15.
-+                    // For a proper touchpad driver it should be in the same order of magnitude as 120
-+                    if (scrollingDevice.verticalIncrement > 15)
-                         rawDelta.setY(delta);
--                    else if (scrollingDevice.verticalIncrement < -1)
-+                    else if (scrollingDevice.verticalIncrement < -15)
-                         rawDelta.setY(-delta);
-                 }
-             }
-@@ -965,10 +967,10 @@ void QXcbConnection::xi2HandleScrollEvent(void *event, ScrollingDevice &scrollin
-                     double delta = scrollingDevice.lastScrollPosition.x() - value;
-                     scrollingDevice.lastScrollPosition.setX(value);
-                     angleDelta.setX((delta / scrollingDevice.horizontalIncrement) * 120);
--                    // We do not set "pixel" delta if it is only measured in ticks.
--                    if (scrollingDevice.horizontalIncrement > 1)
-+                    // See comment under vertical
-+                    if (scrollingDevice.horizontalIncrement > 15)
-                         rawDelta.setX(delta);
--                    else if (scrollingDevice.horizontalIncrement < -1)
-+                    else if (scrollingDevice.horizontalIncrement < -15)
-                         rawDelta.setX(-delta);
-                 }
-             }
--- 
-2.7.4
-
diff --git a/dev-qt/qtgui/files/qtgui-5.9.4-opengl.patch b/dev-qt/qtgui/files/qtgui-5.9.4-opengl.patch
deleted file mode 100644
index 2a447414c215..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.9.4-opengl.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From b63aeba4a88088c7de61c1664a510c02d38ade84 Mon Sep 17 00:00:00 2001
-From: Antonio Larrosa <alarrosa@suse.com>
-Date: Fri, 16 Feb 2018 13:18:42 +0100
-Subject: [PATCH] opengl: Bail if cached shader fails to load
-
-QOpenGLProgramBinaryCache::setProgramBinary() should check
-GL_LINK_STATUS after glProgramBinary(), but doesn't.
-
-In practice, this means that SDDM is a white screen, and KDE is just
-a gray task bar.
-
-So far, Qt tries to check this using its internal ::link() function.
-But in case the cached binary fails to load, Qt currently attempts to
-link the inexistent program, resulting in a zero-length, fixed
-pipeline shader.
-
-Checking this already in ::setProgramBinary() makes the call to
-::link() superfluous, so we remove that as well.
-
-Done-with: Max Staudt <mstaudt@suse.com>
-Done-with: Michal Srb <msrb@suse.com>
-Done-with: Fabian Vogt <fvogt@suse.de>
-Task-number: QTBUG-66420
-Change-Id: Iabb51d0eb2c0c16bde696efff623e57d15f28d82
-Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
-Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
-(cherry picked from commit fa091640134b3ff99a9eb92df8286d15203122bf)
----
- src/gui/opengl/qopenglprogrambinarycache.cpp | 20 ++++++++++++++++++--
- src/gui/opengl/qopenglshaderprogram.cpp      |  8 +-------
- 2 files changed, 19 insertions(+), 9 deletions(-)
-
-diff --git a/src/gui/opengl/qopenglprogrambinarycache.cpp b/src/gui/opengl/qopenglprogrambinarycache.cpp
-index 06373e1..d16173d 100644
---- a/src/gui/opengl/qopenglprogrambinarycache.cpp
-+++ b/src/gui/opengl/qopenglprogrambinarycache.cpp
-@@ -161,10 +161,26 @@ bool QOpenGLProgramBinaryCache::setProgramBinary(uint programId, uint blobFormat
-     QOpenGLExtraFunctions *funcs = QOpenGLContext::currentContext()->extraFunctions();
-     while (funcs->glGetError() != GL_NO_ERROR) { }
-     funcs->glProgramBinary(programId, blobFormat, p, blobSize);
--    int err = funcs->glGetError();
-+
-+    GLenum err = funcs->glGetError();
-+    if (err != GL_NO_ERROR) {
-+        qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program %u, size %d, "
-+                                  "format 0x%x, err = 0x%x",
-+                programId, blobSize, blobFormat, err);
-+        return false;
-+    }
-+    GLint linkStatus = 0;
-+    funcs->glGetProgramiv(programId, GL_LINK_STATUS, &linkStatus);
-+    if (linkStatus != GL_TRUE) {
-+        qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program %u, size %d, "
-+                                  "format 0x%x, linkStatus = 0x%x, err = 0x%x",
-+                programId, blobSize, blobFormat, linkStatus, err);
-+        return false;
-+    }
-+
-     qCDebug(DBG_SHADER_CACHE, "Program binary set for program %u, size %d, format 0x%x, err = 0x%x",
-             programId, blobSize, blobFormat, err);
--    return err == 0;
-+    return true;
- }
- 
- #ifdef Q_OS_UNIX
-diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp
-index cc8af16..3b82bac 100644
---- a/src/gui/opengl/qopenglshaderprogram.cpp
-+++ b/src/gui/opengl/qopenglshaderprogram.cpp
-@@ -3824,13 +3824,7 @@ bool QOpenGLShaderProgramPrivate::linkBinary()
-     bool needsCompile = true;
-     if (binCache.load(cacheKey, q->programId())) {
-         qCDebug(DBG_SHADER_CACHE, "Program binary received from cache");
--        linkBinaryRecursion = true;
--        bool ok = q->link();
--        linkBinaryRecursion = false;
--        if (ok)
--            needsCompile = false;
--        else
--            qCDebug(DBG_SHADER_CACHE, "Link failed after glProgramBinary");
-+        needsCompile = false;
-     }
- 
-     bool needsSave = false;
--- 
-2.7.4
-
diff --git a/dev-qt/qtgui/files/qtgui-5.9.4-qsimpledrag.patch b/dev-qt/qtgui/files/qtgui-5.9.4-qsimpledrag.patch
deleted file mode 100644
index 60d2ec424f47..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.9.4-qsimpledrag.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 4a7771f206d4b29be549d3827c36a46679d90de6 Mon Sep 17 00:00:00 2001
-From: Eike Hein <hein@kde.org>
-Date: Sun, 7 Jan 2018 13:02:01 +0900
-Subject: [PATCH] QSimpleDrag: Fix mouse release coords for delayed event
- transmission
-
-On platforms such as XCB, the drag cursor pixmap is shown via a window
-(a QShapedPixmapWindow) under the cursor.
-
-The mouse button release event at the end of the drag is received in
-this QXcbWindow, but intercepted by an event filter that QSimpleDrag
-installs on the QApplication. It then resends it unmodified(!) after
-the drag has ended and the drag pixmap window destroyed, causing it to
-be delivered to the new top-level window.
-
-The local coordinates in the unmodified QMouseEvent are local to the
-drag pixmap window and don't match the window it is delayed-transmitted
-to.
-
-This ends up having fatal, user-visible effects particularly in Qt
-Quick: QQuickWindow synthesizes a hover event once per frame using
-the last received mouse coordinates, here: the release posted by
-QSimpleDrag. This is done to update the hover event state for items
-under the cursor when the mouse hasn't moved (e.g. QQuickMouseArea::
-containsMouse). The bogus event coordinates in the release event then
-usually end up causing an item near the top-left of the QQuickWindow
-to assume it is hovered (because drag pixmap windows tend to be small),
-even when the mouse cursor is actually far away from it at the end of
-the drag.
-
-This shows up e.g. in the Plasma 5 desktop, where dragging an icon
-on the desktop will cause the icon at the top-left of the screen (if
-any) to switch to hovered state, as the release coordinates on the
-drag pixmap window (showing a dragged icon) fall into the geometry
-of the top-left icon.
-
-QSimpleDrag contains a topLevelAt() function to find the top-level
-window under the global cursor coordinates that is not the drag
-pixmap window. This is used by the drop event delivery code.
-
-This patch uses this function to find the relevant top-level window,
-then asks it to map the global cusor coordinates to its local
-coordinate system, then synthesizes a new QMouseEvent with local
-coordinates computed in this fashion. As a result the window now
-gets a release event with coordinates that make sense and are
-correct.
-
-Task-number: QTBUG-66103
-Change-Id: I04ebe6ccd4a991fdd4b540ff0227973ea8896a9d
-Reviewed-by: Eike Hein <hein@kde.org>
-Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
----
- src/gui/kernel/qsimpledrag.cpp | 32 +++++++++++++++++++++++++++-----
- src/gui/kernel/qsimpledrag_p.h |  6 +++---
- 2 files changed, 30 insertions(+), 8 deletions(-)
-
-diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp
-index a1e25dc..87d3ba5 100644
---- a/src/gui/kernel/qsimpledrag.cpp
-+++ b/src/gui/kernel/qsimpledrag.cpp
-@@ -58,6 +58,7 @@
- 
- #include <QtCore/QEventLoop>
- #include <QtCore/QDebug>
-+#include <QtCore/QLoggingCategory>
- 
- #include <private/qguiapplication_p.h>
- #include <private/qdnd_p.h>
-@@ -69,6 +70,8 @@ QT_BEGIN_NAMESPACE
- 
- #ifndef QT_NO_DRAGANDDROP
- 
-+Q_LOGGING_CATEGORY(lcDnd, "qt.gui.dnd")
-+
- static QWindow* topLevelAt(const QPoint &pos)
- {
-     QWindowList list = QGuiApplication::topLevelWindows();
-@@ -94,10 +97,10 @@ static QWindow* topLevelAt(const QPoint &pos)
- */
- 
- QBasicDrag::QBasicDrag() :
--    m_restoreCursor(false), m_eventLoop(0),
-+    m_current_window(nullptr), m_restoreCursor(false), m_eventLoop(nullptr),
-     m_executed_drop_action(Qt::IgnoreAction), m_can_drop(false),
--    m_drag(0), m_drag_icon_window(0), m_useCompositing(true),
--    m_screen(Q_NULLPTR)
-+    m_drag(nullptr), m_drag_icon_window(nullptr), m_useCompositing(true),
-+    m_screen(nullptr)
- {
- }
- 
-@@ -161,6 +164,7 @@ bool QBasicDrag::eventFilter(QObject *o, QEvent *e)
-             return true; // Eat all mouse move events
-         }
-         case QEvent::MouseButtonRelease:
-+        {
-             disableEventFilter();
-             if (canDrop()) {
-                 QPoint nativePosition = getNativeMousePos(e, m_drag_icon_window);
-@@ -169,8 +173,25 @@ bool QBasicDrag::eventFilter(QObject *o, QEvent *e)
-                 cancel();
-             }
-             exitDndEventLoop();
--            QCoreApplication::postEvent(o, new QMouseEvent(*static_cast<QMouseEvent *>(e)));
-+
-+            // If a QShapedPixmapWindow (drag feedback) is being dragged along, the
-+            // mouse event's localPos() will be relative to that, which is useless.
-+            // We want a position relative to the window where the drag ends, if possible (?).
-+            // If there is no such window (belonging to this Qt application),
-+            // make the event relative to the window where the drag started. (QTBUG-66103)
-+            const QMouseEvent *release = static_cast<QMouseEvent *>(e);
-+            const QWindow *releaseWindow = topLevelAt(release->globalPos());
-+            qCDebug(lcDnd) << "mouse released over" << releaseWindow << "after drag from" << m_current_window << "globalPos" << release->globalPos();
-+            if (!releaseWindow)
-+                releaseWindow = m_current_window;
-+            QPoint releaseWindowPos = (releaseWindow ? releaseWindow->mapFromGlobal(release->globalPos()) : release->globalPos());
-+            QMouseEvent *newRelease = new QMouseEvent(release->type(),
-+                releaseWindowPos, releaseWindowPos, release->screenPos(),
-+                release->button(), release->buttons(),
-+                release->modifiers(), release->source());
-+            QCoreApplication::postEvent(o, newRelease);
-             return true; // defer mouse release events until drag event loop has returned
-+        }
-         case QEvent::MouseButtonDblClick:
-         case QEvent::Wheel:
-             return true;
-@@ -349,7 +370,7 @@ static inline QPoint fromNativeGlobalPixels(const QPoint &point)
-     into account.
- */
- 
--QSimpleDrag::QSimpleDrag() : m_current_window(0)
-+QSimpleDrag::QSimpleDrag()
- {
- }
- 
-@@ -373,6 +394,7 @@ void QSimpleDrag::startDrag()
-         updateCursor(Qt::IgnoreAction);
-     }
-     setExecutedDropAction(Qt::IgnoreAction);
-+    qCDebug(lcDnd) << "drag began from" << m_current_window<< "cursor pos" << QCursor::pos() << "can drop?" << canDrop();
- }
- 
- void QSimpleDrag::cancel()
-diff --git a/src/gui/kernel/qsimpledrag_p.h b/src/gui/kernel/qsimpledrag_p.h
-index 0b8a0bc..bbd7f7f 100644
---- a/src/gui/kernel/qsimpledrag_p.h
-+++ b/src/gui/kernel/qsimpledrag_p.h
-@@ -105,6 +105,9 @@ protected:
- 
-     QDrag *drag() const { return m_drag; }
- 
-+protected:
-+    QWindow *m_current_window;
-+
- private:
-     void enableEventFilter();
-     void disableEventFilter();
-@@ -132,9 +135,6 @@ protected:
-     virtual void cancel() Q_DECL_OVERRIDE;
-     virtual void move(const QPoint &globalPos) Q_DECL_OVERRIDE;
-     virtual void drop(const QPoint &globalPos) Q_DECL_OVERRIDE;
--
--private:
--    QWindow *m_current_window;
- };
- 
- #endif // QT_NO_DRAGANDDROP
--- 
-2.7.4
-
diff --git a/dev-qt/qtgui/qtgui-5.9.4-r3.ebuild b/dev-qt/qtgui/qtgui-5.9.4-r3.ebuild
deleted file mode 100644
index 33dfa6703cc0..000000000000
--- a/dev-qt/qtgui/qtgui-5.9.4-r3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
-	jpeg +libinput +png tslib tuio +udev vnc +xcb"
-REQUIRED_USE="
-	|| ( eglfs xcb )
-	accessibility? ( dbus xcb )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	xcb? ( gles2? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}
-	media-libs/fontconfig
-	>=media-libs/freetype-2.6.1:2
-	>=media-libs/harfbuzz-1.0.6:=
-	>=sys-libs/zlib-1.2.5
-	virtual/opengl
-	dbus? ( ~dev-qt/qtdbus-${PV} )
-	egl? ( media-libs/mesa[egl] )
-	eglfs? (
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	gles2? ( media-libs/mesa[gles2] )
-	jpeg? ( virtual/jpeg:0 )
-	libinput? (
-		dev-libs/libinput:=
-		x11-libs/libxkbcommon
-	)
-	png? ( media-libs/libpng:0= )
-	tslib? ( x11-libs/tslib )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	vnc? ( ~dev-qt/qtnetwork-${PV} )
-	xcb? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libXi-1.7.5
-		>=x11-libs/libxcb-1.10:=[xkb]
-		>=x11-libs/libxkbcommon-0.4.1[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qsimpledrag.patch" # QTBUG-66103
-	"${FILESDIR}/${P}-libinput-pixeldelta.patch" # QTBUG-59261
-	"${FILESDIR}/${P}-opengl.patch" # QTBUG-66420
-)
-
-QT5_TARGET_SUBDIRS=(
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl
-	eglfs
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev
-	evdev:mtdev:
-	:fontconfig
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	!gif:no-gif:
-	gles2::OPENGL_ES
-	gles2:opengles2:OPENGL_ES_2
-	!:no-gui:
-	:system-harfbuzz:HARFBUZZ
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon-evdev:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib
-	udev:libudev:
-	xcb:xcb:
-	xcb:xcb-glx:
-	xcb:xcb-plugin:
-	xcb:xcb-render:
-	xcb:xcb-sm:
-	xcb:xcb-xlib:
-	xcb:xinput2:
-	xcb::XKB
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-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)
-
-	qt_use_disable_config dbus dbus \
-		src/platformsupport/themes/genericunix/genericunix.pri
-
-	qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
-		src/plugins/platforms/platforms.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usex dbus -dbus-linked '')
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usex eglfs '-gbm -kms' '')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usex gif '' -no-gif)
-		-gui
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		$(qt_use libinput xkbcommon-evdev)
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use xcb xcb system)
-		$(qt_use xcb xkbcommon-x11 system)
-		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtgui/qtgui-5.9.6.ebuild b/dev-qt/qtgui/qtgui-5.9.6.ebuild
index 5716168faaf7..39a6ad3bc7d0 100644
--- a/dev-qt/qtgui/qtgui-5.9.6.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9.6.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 # TODO: linuxfb