gentoo Easter resync : 12.04.2020

7 files changed, 70 insertions, 220 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index f67c9c17779e..584aef98af98 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,11 +1,10 @@
-AUX qtwebengine-5.12.0-nouveau-disable-gpu.patch 3740 BLAKE2B fc2745ba0e3ac264d2f59ede3628f6d4d94db8f175c4cf68444e5dabb5fd0266957c804da7e0e761d8f39ddbe2781ae023aef8db1a907907e7db116b48a8cd11 SHA512 fe407c7907e6e9dd09be6e53f4c560ab453e5081fbbac4392b29fdb32cfccd1157e6a9ed2c7839b1aeda2088309e124b7130963175472a660ea46807299e8d9a
 AUX qtwebengine-5.12.5-icu-65.patch 1394 BLAKE2B 223e449a1086c2f062e34752278ba83a828283aa577b92aa3ba28343fb06e18ed6b94990e46729076b099674e2a0936f08958aa72ac3b44f4cc7dd1602b13cfa SHA512 2b530a6a60e1ca71aba7c7d86f7e831799e8bec20ab6c97d79e753d337767c9f44938f19c00714706f2720bb4b0a3599a44046a69ed42372b21bac452b713b68
-AUX qtwebengine-5.12.5-pulseaudio-13.patch 5034 BLAKE2B 12bce7933a58472dfad4581fa8e949d3326c32f307af73bcac054a94759cd5163d97c5ceb326ea1924d086022b9d316d45a4fbed81483eddcfe1c7ba91d708f3 SHA512 7160583ba150812d6e860550a0b7b9f53ae157679025e41aca6e1b0e5186549ecd49d70724ef84ff9d58abf65b598df44f3c54a456ffb1698d96159db2778811
+AUX qtwebengine-5.14.1-detect-ninja-1.10.patch 938 BLAKE2B 570ec70494e8025d43aa666deb08610bb87ce493d724d844935f7af6cd59e1cc2e8967051d17d68a827abb27771cf7262eb81405ce1e429c0cd4563dfcc51209 SHA512 d9e4cac4fc13e97a3ef9e91956f76af4ea7bae7f7686e84f077c59411397b88eda7ce3184650cc3edba70af5905ffd14bfb92717e4fd9ae0957d6dff43f2f8a3
 AUX qtwebengine-5.14.1-disable-fatal-warnings.patch 463 BLAKE2B 711aea51b588c899bc45131e05cf14b3d78c8d88e75ed2531ee338cb70924f6a195bc541e3d00883951b04cca94100ef2b5c5c2c27d5d5546f8da40450c788c2 SHA512 c3c13b4e98079f566a4ac5ac3272f2643f9d2fe179922a8d4e964d604e15d8c386c7cd8e13aa960bba64a6fdd6f590e9fd34a4e824e2054a3f6ea7f7f9935f86
-DIST qtwebengine-everywhere-src-5.12.3.tar.xz 249275648 BLAKE2B 7d2404084a510c62b638dd09736130eeb40e494f9594339afc7df6628878aafed778a2785f6848702d51b3a4ef1dc8b333d5e5eeeeb8f930b4da839eb70bc175 SHA512 5b500ec6653aa6ed70e7826fe394f95c7932eaea5b1b48f6342a6f18294f75e4f954959fa2f42de0685097679389245d2bc80454e8eea202fa18a326d6d5a9a5
 DIST qtwebengine-everywhere-src-5.13.2.tar.xz 255593964 BLAKE2B 458f718183aa53376e1aeeb6306b0b3960bd001aebf61e9650d30afd408af003183b7748a87aa0c6a1aa0b3a4be548b417609146b71dc6afa46db49c4b48919f SHA512 10ae5cca36230069ef117cae15b84e29124c43e4864dbfa7a1f99879764b871355281edcb1942e86ec3a4cac12bbfd2749577745c8c7e736eb6a9909876554d0
 DIST qtwebengine-everywhere-src-5.14.1.tar.xz 242438244 BLAKE2B d24210b2e04522b27409cc5ccfe722114f711c1c5e9aaff76882c178b0c455b475b90fd2acd5f7ba4f5dfba85c228c4baf2c231d3661eadf83e984d7e7b9e30f SHA512 fafa2fbc789941e837e35945857a6da00e73bd2abe512290674b9957719b998d8b8b95a35c709a171c9d0d111e6f418cec630dfcdbe47ecbae25a3b94e4c99f9
-EBUILD qtwebengine-5.12.3.ebuild 3440 BLAKE2B dd0b8549dbc036929320cdec79dc2e1ef71385eda722153668ea44e28f35bc6333a85763e318bf3d749257207b99a659a1d36a8420a11927a638d2ac4c23ef28 SHA512 4559734707f5eb1ea14b6696b4ec5df188d060198a872093db8a096736876df8cc35fc479082e812746a5260a4816deae7180034c7906a467fd35a939fbad96e
-EBUILD qtwebengine-5.13.2.ebuild 3085 BLAKE2B bebfe0b97a8c40a0b863403d6330f654ecd755b00ff916e255ba2b250bf2b2685515ea3e29717323c35eefb0d00e845545113c8f5e090e8546143191a3dad9c1 SHA512 c2f5dbc70cadbf1992ccf94aa1c60e96fb9a4924b2864e53cddc5a01e766cac81a90306a51ddd369859ff3141ff4e18391a7c51ea28b54d50976f3b5bb808300
-EBUILD qtwebengine-5.14.1.ebuild 3323 BLAKE2B 52bb7f548a8a01f631f56898ffdf6c5049f212154fb9afd4a60bf7fee92a2a716c61c5b5aaadb10530b32dadf3c3af5e1f08e52e603c4029df447f15af2c2df9 SHA512 cb3023c439cfe26ba965af490b6a7e1d8ab7f2c4671ab0bd047342b4ecd548b7021671ffa080c0965bef90cedb968e9cbbcd8b95e8b366979cd6c26b36df4321
+DIST qtwebengine-everywhere-src-5.14.2.tar.xz 242467568 BLAKE2B 2b69af846d9f6b1b1bd6380f56868e7fe86c88baf00e4b596e6a825d636472f837c1fc3b9ed41182dcc20dc0ba03360182aba39aee4adca66f407a8346f90fbf SHA512 bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf
+EBUILD qtwebengine-5.13.2.ebuild 3068 BLAKE2B f0db7b00bddbc7f1611ceada0c920bd121c124f2d5386e667a4ba9cb817bf2e05435f279f43e3ec120759079e4bc6a92aa42d823dafc481f3fd061b800120962 SHA512 6542f71d03f9e22fed7711d22b6b89be354fd728d7e034b01b0510dd384e6dca49c913c91ac32acc475f10dd069dd290059502d0f0efa9884d2658a37bcf50e7
+EBUILD qtwebengine-5.14.1.ebuild 3398 BLAKE2B 09f99f74123804158d4077e779f7def2ae28bc2d34cd2e9d303817874e80b9e9ebe54b6d1c1d68e933f22f8a86d691339a4ab867133f812ca97a83fc2373ba06 SHA512 b713b9c5a2ac86dbbccc90cfd62d2d2b9489db91c8bfb3288f09987f23f3dae5d49d787d528a6bece0e1b50a87975ac62866024b4078587573613adf8690b1af
+EBUILD qtwebengine-5.14.2.ebuild 4368 BLAKE2B b9fc8ad1f5cb5501c3f04121d406bffd23200fbb53a4c3c04f85d4ab5d0df538ffb51a11a5f284a119c9706d7200d92009be01efa6081c49c08eba6b86edffce SHA512 8b1fb7a7996d764480eb82a928e9d2694116e1a541f1c2f3faeea5bfdaf4f68dbc3a42eea466dbbade6c351c836f9b46a53ab738745d027bed37facf6166a994
 MISC metadata.xml 1102 BLAKE2B 7ba2157c180e35ea470d8296d157d73f2fa565cbc8319f41f5ae533b02dc981a4d4352efb1ad94f1e298047a3b56cea097aef3ff09a19d33cf861cfb64ee9119 SHA512 d96e13fa5eddde448bce28c9373022909035f9b63e75584e7f320510f853e1c89dc9417f4280d307e29c9a7f75c89c75b5cc00c19c2d6cd6360812719dd0acc8
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-nouveau-disable-gpu.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-nouveau-disable-gpu.patch
deleted file mode 100644
index ec315ca210e8..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-nouveau-disable-gpu.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From: Antonio Larrosa <alarrosa@suse.com>
-Subject: Disable GPU when using nouveau or running on wayland
-References: boo#1005323, boo#1060990
-
-Qt WebEngine uses multi-threaded OpenGL, which nouveau does not support.
-It also crashes when running on wayland, the cause is not yet known.
-Work around these issues by not doing GPU-accelerated rendering in such
-cases.
-
-Index: qtwebengine-everywhere-src-5.12.0-alpha/src/core/web_engine_context.cpp
-===================================================================
---- qtwebengine-everywhere-src-5.12.0-alpha.orig/src/core/web_engine_context.cpp
-+++ qtwebengine-everywhere-src-5.12.0-alpha/src/core/web_engine_context.cpp
-@@ -101,6 +101,7 @@
- #include <QOffscreenSurface>
- #ifndef QT_NO_OPENGL
- # include <QOpenGLContext>
-+# include <QOpenGLFunctions>
- #endif
- #include <QQuickWindow>
- #include <QStringList>
-@@ -162,6 +163,39 @@ void dummyGetPluginCallback(const std::v
- }
- #endif
- 
-+#ifndef QT_NO_OPENGL
-+QString openGLVendor()
-+{
-+    QString vendor;
-+
-+    QOpenGLContext *oldContext = QOpenGLContext::currentContext();
-+    QSurface *oldSurface = 0;
-+    if (oldContext)
-+        oldSurface = oldContext->surface();
-+
-+    QScopedPointer<QOffscreenSurface> surface( new QOffscreenSurface );
-+    surface->create();
-+    QOpenGLContext context;
-+    if (!context.create()) {
-+        qDebug() << "Error creating openGL context";
-+    }
-+    else if (!context.makeCurrent(surface.data())) {
-+        qDebug() << "Error making openGL context current context";
-+    } else {
-+        const GLubyte *p;
-+        QOpenGLFunctions *f = context.functions();
-+        if ((p = f->glGetString(GL_VENDOR)))
-+            vendor = QString::fromLatin1(reinterpret_cast<const char *>(p));
-+    }
-+
-+    context.doneCurrent();
-+    if (oldContext && oldSurface)
-+        oldContext->makeCurrent(oldSurface);
-+
-+    return vendor;
-+}
-+#endif
-+
- } // namespace
- 
- namespace QtWebEngineCore {
-@@ -440,6 +474,27 @@ WebEngineContext::WebEngineContext()
-     const char *glType = 0;
- #ifndef QT_NO_OPENGL
- 
-+    bool disableGpu = qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_GPU");
-+
-+    if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND") && qApp->platformName().startsWith("wayland", Qt::CaseInsensitive))
-+    {
-+        qWarning() << "Running on wayland. Qt WebEngine will disable usage of the GPU.\n"
-+                      "Note: you can set the QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND\n"
-+                      "environment variable before running this application, but this is \n"
-+                      "not recommended since this usually causes applications to crash.";
-+        disableGpu = true;
-+    }
-+
-+    if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND") && openGLVendor() == QStringLiteral("nouveau"))
-+    {
-+        qWarning() << "Nouveau openGL driver detected. Qt WebEngine will disable usage of the GPU.\n"
-+                      "Note: you can set the QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND\n"
-+                      "environment variable before running this application, but this is \n"
-+                      "not recommended since this usually causes applications to crash as\n"
-+                      "Nouveau openGL drivers don't support multithreaded rendering";
-+        disableGpu = true;
-+    }
-+
-     bool tryGL =
-             !usingANGLE()
-             && (!usingSoftwareDynamicGL()
-@@ -450,7 +505,7 @@ WebEngineContext::WebEngineContext()
-                 || enableWebGLSoftwareRendering
- #endif
-                 )
--            && !usingQtQuick2DRenderer();
-+            && !usingQtQuick2DRenderer() && !disableGpu;
- 
-     if (tryGL) {
-         if (qt_gl_global_share_context() && qt_gl_global_share_context()->isValid()) {
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-pulseaudio-13.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-pulseaudio-13.patch
deleted file mode 100644
index 1e57f0ed8349..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-pulseaudio-13.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 7ac85fb4cc6f44a21761a591ac497ae3d6bf966d Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Mon, 23 Sep 2019 13:49:53 +0200
-Subject: [PATCH] Fix building with pulseaudio 13
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-The function signature changed though the ABI stayed the same.
-
-Change-Id: I86ca361b5e4f0c523e1031910df438c23beee876
-Fixes: QTBUG-77037
-Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
----
- src/3rdparty/chromium/media/audio/pulse/pulse.sigs                 | 16 ++++++++--------
- src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment | 11 +++++++++++
- 2 files changed, 19 insertions(+), 8 deletions(-)
-
-diff --git a/src/3rdparty/chromium/media/audio/pulse/pulse.sigs b/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
-index 8b5888786a9..daaeb149c13 100644
---- a/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
-+++ b/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
-@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_context* c, uint32_t idx, p
- pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata);
- pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata);
- pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata);
--pa_context_state_t pa_context_get_state(pa_context* c);
-+pa_context_state_t pa_context_get_state(const_pa_context_ptr c);
- pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name);
- pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata);
- void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata);
--pa_operation_state_t pa_operation_get_state(pa_operation* o);
-+pa_operation_state_t pa_operation_get_state(const_pa_operation_ptr o);
- void pa_context_unref(pa_context* c);
- void pa_operation_unref(pa_operation* o);
- int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes);
-@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_stream_success_cb_t cb, voi
- int pa_stream_disconnect(pa_stream* s);
- int pa_stream_drop(pa_stream *p);
- pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata);
--uint32_t pa_stream_get_device_index(pa_stream* s);
-+uint32_t pa_stream_get_device_index(const_pa_stream_ptr s);
- int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative);
--pa_stream_state_t pa_stream_get_state(pa_stream* p);
-+pa_stream_state_t pa_stream_get_state(const_pa_stream_ptr p);
- pa_stream* pa_stream_new(pa_context*  c, const char*  name, const pa_sample_spec*  ss, const pa_channel_map *  map);
- pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p);
- pa_proplist* pa_proplist_new(void);
--int pa_proplist_contains(pa_proplist* p, const char* key);
-+int pa_proplist_contains(const_pa_proplist_ptr p, const char* key);
- void pa_proplist_free(pa_proplist* p);
--const char* pa_proplist_gets(pa_proplist* p, const char* key);
-+const char* pa_proplist_gets(const_pa_proplist_ptr p, const char* key);
- int pa_proplist_sets(pa_proplist* p, const char* key, const char* value);
--size_t pa_stream_readable_size(pa_stream *p);
-+size_t pa_stream_readable_size(const_pa_stream_ptr p);
- int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes);
- void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata);
- void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata);
- int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
- void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
- void pa_stream_unref(pa_stream* s);
--int pa_context_errno(pa_context *c);
-+int pa_context_errno(const_pa_context_ptr c);
- const char* pa_strerror(int error);
- pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned  channels, pa_volume_t v);
-diff --git a/src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment b/src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment
-index 2a2d3e7552b..cdaa841b29f 100644
---- a/src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment
-+++ b/src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment
-@@ -5,4 +5,15 @@ extern "C" {
- 
- #include <pulse/pulseaudio.h>
- 
-+#if PA_MAJOR > 12
-+typedef const pa_context* const_pa_context_ptr;
-+typedef const pa_operation* const_pa_operation_ptr;
-+typedef const pa_proplist* const_pa_proplist_ptr;
-+typedef const pa_stream* const_pa_stream_ptr;
-+#else
-+typedef pa_context* const_pa_context_ptr;
-+typedef pa_operation* const_pa_operation_ptr;
-+typedef pa_proplist* const_pa_proplist_ptr;
-+typedef pa_stream* const_pa_stream_ptr;
-+#endif
- }
--- 
-2.16.3
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch
new file mode 100644
index 000000000000..8200fb9f9060
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch
@@ -0,0 +1,27 @@
+From 8c1a4841174a90299ba2e2851b4d9e79da3b9b25 Mon Sep 17 00:00:00 2001
+From: Kirill Burtsev <kirill.burtsev@qt.io>
+Date: Fri, 6 Mar 2020 17:38:45 +0100
+Subject: [PATCH] Support build with system ninja >= 1.10.0
+
+Fixes: QTBUG-82715
+Change-Id: I9a269efa20d092f75a8a43cb20d1e0dc0f46b9f9
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+---
+ configure.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.pri b/configure.pri
+index 3a144e3f8e..3cfce71e03 100644
+--- a/configure.pri
++++ b/configure.pri
+@@ -163,7 +163,7 @@ defineTest(qtConfTest_detectNinja) {
+     !isEmpty(ninja) {
+         qtLog("Found ninja from path: $$ninja")
+         qtRunLoggedCommand("$$ninja --version", version)|return(false)
+-        contains(version, "1.[7-9].*"): return(true)
++        contains(version, "1\.([7-9]|1[0-9])\..*"): return(true)
+         qtLog("Ninja version too old")
+     }
+     qtLog("Building own ninja")
+-- 
+2.16.3
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
index f5c244acbfc5..7e5b3e377e4d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
@@ -9,7 +9,7 @@ inherit multiprocessing python-any-r1 qt5-build
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~x86"
+	KEYWORDS="arm"
 fi
 
 IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
index 92e75c3c12e5..4706adab319f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
@@ -9,7 +9,7 @@ inherit multiprocessing python-any-r1 qt5-build
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 fi
 
 IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
@@ -79,6 +79,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${P}-disable-fatal-warnings.patch" # bug 695446
+	"${FILESDIR}/${P}-detect-ninja-1.10.patch" # QTBUG-82715, fixed in Qt 5.14.2
 )
 
 src_prepare() {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
index ec2e98d5c56a..029e99a265a7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 inherit multiprocessing python-any-r1 qt5-build
@@ -9,10 +9,10 @@ inherit multiprocessing python-any-r1 qt5-build
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
-IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
 REQUIRED_USE="designer? ( widgets )"
 
 RDEPEND="
@@ -60,6 +60,7 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	designer? ( ~dev-qt/designer-${PV} )
 	geolocation? ( ~dev-qt/qtpositioning-${PV} )
+	kerberos? ( virtual/krb5 )
 	pulseaudio? ( media-sound/pulseaudio:= )
 	system-ffmpeg? ( media-video/ffmpeg:0= )
 	system-icu? ( >=dev-libs/icu-60.2:= )
@@ -75,35 +76,41 @@ DEPEND="${RDEPEND}
 	dev-util/ninja
 	dev-util/re2c
 	sys-devel/bison
-	!!=sys-devel/binutils-2.31.1-r5
-	!!=sys-devel/binutils-2.32-r0
 "
 
-PATCHES+=(
-	"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
-	"${FILESDIR}/${PN}-5.12.5-pulseaudio-13.patch" # bug 694960, 705434
-	"${FILESDIR}/${PN}-5.12.5-icu-65.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" ) # bug 695446
 
 src_prepare() {
 	if ! use jumbo-build; then
 		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
-			src/core/config/common.pri || die
+			src/buildtools/config/common.pri || die
 	fi
 
+	# bug 630834 - pass appropriate options to ninja when building GN
+	sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+		-i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
+
 	# bug 620444 - ensure local headers are used
 	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
 
-	qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
+	if use system-icu; then
+		# Sanity check to ensure that bundled copy of ICU is not used.
+		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
+		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
+		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
+		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
+		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
+		local file
+		while read file; do
+			echo "#error This file should not be used!" > "${file}" || die
+		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
+	fi
+
+	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
+	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
 
 	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
 
-	qt_use_disable_mod geolocation positioning \
-		mkspecs/features/configure.prf \
-		src/core/core_chromium.pri \
-		src/core/core_common.pri
-
 	qt_use_disable_mod widgets widgets src/src.pro
 
 	qt5-build_src_prepare
@@ -115,14 +122,16 @@ src_configure() {
 
 	local myqmakeargs=(
 		--
-		-opus
 		-printing-and-pdf
-		-webp
-		$(usex alsa '-alsa' '')
-		$(usex bindist '' '-proprietary-codecs')
-		$(usex pulseaudio '-pulseaudio' '')
-		$(usex system-ffmpeg '-ffmpeg' '')
-		$(usex system-icu '-webengine-icu' '')
+		-system-opus
+		-system-webp
+		$(usex alsa '-alsa' '-no-alsa')
+		$(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
+		$(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
+		$(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
+		$(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
+		$(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
+		$(usex system-icu '-webengine-icu' '-no-webengine-icu')
 	)
 	qt5-build_src_configure
 }
@@ -131,7 +140,7 @@ src_install() {
 	qt5-build_src_install
 
 	# bug 601472
-	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
 		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
 	fi
 }