gentoo resync : 11.05.2018

9 files changed, 61 insertions, 395 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index adc3045afc62..594c6820cb71 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,20 +1,14 @@
+AUX qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch 1897 BLAKE2B b72be2793ccfe5738136cf6456e7929905ed975101625b859b4eb298f37f6b28125df54edbe61d66689b824acd9aefc05cfba32d49c3bcce12710a2632574650 SHA512 ee2a483751e576b5508a8ae9c5afffde6df63b5431371abf71bdb3635c9dddfea1c918f43516ef78222ab9ea7bdd1fc804ee81662fbd8bf83ce544bcf0248e1d
 AUX qtwebengine-5.11.0-update-shim-headers.patch 2030 BLAKE2B 53325012dc516ac1c6dc43bcb0e22e5e59e6f7c808f85b884183922053886816a9b7887211a4e607b39f52ab7f9fd97940e2fb009f72bd918790e76066f8c365 SHA512 88aca795e37ff45fbe35a0cdb4324573005dd4bfad1bfa82220d48e5b4adaff03ebe3897d7813a130b8d8786dd9ba9279c65ec25e0a66a6605e46b8a1834b683
-AUX qtwebengine-5.7.0-fix-system-ffmpeg.patch 953 BLAKE2B 39aa2013ec17b4f347db0224c8c441e6f4dafcd17e89a1718b18a5d17304a1136180d474a826efa30f4febcdb9de6181869bfa69403b093d85fc55f82d98d5bf SHA512 7fe43758f0f20ce1d4952d36773fede8def13c60dc4ac01186ef0d1b79055f02151a89e94c61b6dbe5e0a0560e53e3a27c2f40aaba181704b752b3618b3f3b9f
-AUX qtwebengine-5.7.0-icu58.patch 3126 BLAKE2B 263e6d3411b6dec2cd2f3151a43c062c85f8500771921e23716ae268e8aee66e27d11dc8fe62347accc151a9d7659caf118d7314bc637a49e3bd54d8677e99fc SHA512 573741564c85dfa8df1f8b89f075214067f4892d9cc4280d986709c4438823a82ab1eb752b39fdae4e0321a0ae30479fce2ecacb4d35f197bc3699ee24583d67
-AUX qtwebengine-5.7.0-undef-madv_free.patch 1132 BLAKE2B 26f441b8e06bd059476a640a79db73b789bb387d095f51d0b5a993204a6b76be5926fff45880559fba687c3b5baf8b6a564076d58a0ae720d383acf172fdad67 SHA512 1f581749438b07df03f8123957b31d2749a702c00dae06d5c4ab8bd9a4a3d9f14ee0457f5fa9221e7b1d0dc4eac8965990336140f09787df4e46757165b1e22e
-AUX qtwebengine-5.7.1-fix-audio-detection.patch 802 BLAKE2B 0567ca41667c62c794c9c782df07aac966849101b23a8979352d83a990636935aabe7d7d7e945b286714121e963e43509fd6b6115376a883ccf4ec8777747b14 SHA512 d461dc066eda63d9cc7131852d12f2a0ed0abdaf849f9d7ec0e1da20098e031877c07ae37ebd3ba47af1ef1d7cf4d909ef594bcb4682f9e4f69d7deeaeb01f2c
-AUX qtwebengine-5.7.1-gcc-7.patch 5612 BLAKE2B 2ee8a7411dcdd397e9dfd17af0b0081fd16b16da4598ba976e94b3b14d4e1a3fbfc7abed83204e472d5f9a8aea60bc402ca98c3d355f653117556a6047a1393f SHA512 a2824a8ea4b2499fb6f5b583349c3b3428a3a99e5f534d624e00c7820f7a70c824ffc90fc9abd0f981fd707e5361b1d466de1094f65d5c1c8d62db9dc118be0a
 AUX qtwebengine-5.9.3-icu-60.1.patch 664 BLAKE2B eb36ee21a907677d6599dfd7fa3960619492ca0616cace73e475ceba64b1f43631d6f81b303801d934dc6e4a71bf7dc4c4b43fc73d3d048ca51bd7ceea13bc68 SHA512 9652916b675ae2d94f761ebd1e13effbb7545d14bda130a61122d082ea7e826da1be1d22d9063f5e3a4a3b2bb3bc51edb7a98a51869ec8bb9db9089e4c31dd5b
 AUX qtwebengine-5.9.3-paxmark-mksnapshot.patch 997 BLAKE2B e6fd8d6830ee2ca7b4e9c5586e52ce0ce577ddf6839d1de33a125606bc94bd483e4bef3008196f60e6c622074d23166a01b560dacfc5cec86e82dd360376627d SHA512 4a93fa1bdc7c4bbf22c68af4eff9473c4c9e39bc9cdc725441d5bdaec0521fd54db2b25f6900d4dc5d41a8cbeb04d5b420a85f334e3c18348d2e9dd1d9700dc3
 AUX qtwebengine-5.9.4-jpeg-9-1.patch 2782 BLAKE2B eb52d5ab51ca47603f3cdf684e0d34bdb0e6441aed99603608866d41fbfaeb812129199d28f7d01763bd9a86cf0a4e9b46199ab1b227d5e0a3add1ad7bc43329 SHA512 85f305333741e88461c792e5ab1e65f3efaa762d60c52f6afd56c6344375e3467b3268c478d51de0340d99ad2ce3ea2aa5fad83364dfeed2d665244dc84c36ab
 AUX qtwebengine-5.9.4-jpeg-9-2.patch 1295 BLAKE2B 93fdcc0a69fa39c85583dcacd3052b87897e4b8df045b81090524e84a90e259d7824521e71639eec5ef8cfd86c5823302846bd1a05dff3fb39d5b988544bf46b SHA512 57551a4859791431d921fc0f514332d408f43c05ead7919468727069e01b9cf3cfe70f5ca014af57b8842f8ba745d1abe5838fa271d354b775a520ef296bd6a5
 AUX qtwebengine-paxmark-mksnapshot.patch 1478 BLAKE2B 99f99e8264c0bd534e5efe0dce1d2bd58662f83e35f3426cf3daba0ea49d28689723c59c14ed2d357102d8eefbc4c7afcce298efa516f82710bcabe930a6e566 SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019
-DIST qtwebengine-everywhere-src-5.11.0-beta4.tar.xz 233777616 BLAKE2B 7d96784f26e7b7d9423c10d9377b2466812140573cdc12a4c6839b4308fdf6f9a525833f94d26aabfbe124e7bdd474705bcfa5d4f4db7f3cd9408a82ba151182 SHA512 f91406ac4a9eccd84a01abd1aa07a12ad61a73f2a8acdbe925687df75016f9c1bdf038e65fa5c962f1f681ba13bf2f1833574611a03cfdca9b6b292511c77294
-DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 BLAKE2B 624df9c61b887ed393d8021db4e7bd058544abab3a13341fd0bb76fa3c00cf2692c4e08c2058e1576dfe5c62f9e9bc9ac8a1b5a4a640a204e74ba88516fb4ffd SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a
+DIST qtwebengine-everywhere-src-5.11.0-rc.tar.xz 233695496 BLAKE2B e9dc4449cd56a7079091f5f78fdbbd19197c3f770b98d98828f99b45dd65bb3a2198e8f4f16a693408c6aac40b494c884bd0b3116678d76e9cf7e54741ea6507 SHA512 2ec16851e45540aab65f891be0ac33518f7d9a017ff7bf3c49a012b29e08c8f17c2c90683ceaacb7359259f08fbf073d8edd53563f8604293ab71fce61adf76f
 DIST qtwebengine-opensource-src-5.9.4.tar.xz 217337248 BLAKE2B 8a8c55dc08b06b07822fd53c780c1b7898516c8a7d021711f4ad5409630a131a90b1916c21d4e83e43dac773c4c73b4a1045baf96ed3c1d39f2d3d4c35c4a8c0 SHA512 c576e81cd9d202a4614c3eedd008bc41bd6212cd4d06e639469b843726be427f9e7a9551b3e604cbfee90f8dde22afb5bcd4905818ca65234e198078971d6ac9
 DIST qtwebengine-opensource-src-5.9.5.tar.xz 216767300 BLAKE2B 9c05c808d18ed27833b48deaab1c0a6d12a7fa17288a522a8aa04c9b06746e9d69ba06467297369353979844e94efad354a124e28dae94d3128e853a8218e6d7 SHA512 74aa2a36ba5a56d0870f5269f93b54c036fccabf60d906b5b0f0db38afb8582d8794be4025ecea28e4c5b8c4c9beda345e3c2b2155e77bbedfe688308009de2a
-EBUILD qtwebengine-5.11.0_beta4.ebuild 3250 BLAKE2B b1fca651f4057173c4a5ce1123abef72b3a1b72cb3d34f1c6ce2b8d6814b08e6652b79b3df9924efa8081e020c7402fc0e712b2af0171fe52d9d97044ca4010a SHA512 5d64e83fba39557cdd2b437e297314a175469c9095e358c435eb710beb876271ca5fb9007239846eeda39e294febac37dc683371091c46cae04b934fa193dad3
-EBUILD qtwebengine-5.7.1-r2.ebuild 3109 BLAKE2B 5ecfaf15205fb4d3ea2a2a688c1fedf312efcfb44140de281738ae45f16ec38f4a81bf37fd963c6847c94d64b7b013580056feea224d40cfe56dc1a10ca3cf0c SHA512 618c00c7d5edc4d9fcae5b25e61f957ada6555afe53a2e52164eb7cf22c05a6a015041b2ead744624fd8eeb9c35edbd951786337cb2d3ebd4a1747af339bd730
+EBUILD qtwebengine-5.11.0_rc.ebuild 3322 BLAKE2B 966f7dfc43a58160e3f42fc3f612006b143fb8809e94a23367a38d7fb2e73b47cbf9f2625b9fd26aa4fb39be09ab57677a841d08ff635db12378a09e31b06a0d SHA512 40cbdb054465624a2a033a426926c56bffd8574e51b34b479ff39e3c8c153bc9deb8443ab5afd8628d73b8f7daed4283f1ad3174c16624a807553636843e6a3e
 EBUILD qtwebengine-5.9.4.ebuild 3223 BLAKE2B ef411c3f0e15c72b2592cd04ef8f04b57cedd089c4b83005b575ef4db264dfadccf711f8598309fbabed6c2a141dcd983eca53f3e8506ea7517eb62301b9caec SHA512 8002221d79b292097d23cae4f6423d28ede730564ba09b164f9494ca08b84f46d9cade2247622739f41dfea37939891795ec1b12421a02d53f349de0c9851faf
 EBUILD qtwebengine-5.9.5.ebuild 3195 BLAKE2B 8165a853d4a02ea34babf6ce46f897cec10b7597fcadf1df9c2b0089d8ecde55ba1d482b7d4622870c55cc630148181805e30959bd9c9d6772b955cbd3b7f45c SHA512 ec0540064675ca249271a812b1f632b9f0cc1d0879f8099cf3949bb7413d812d52a18d7a90bf915c8b0f1d0dfe2f11bd41df9f8c44675dda823735deda0e46ab
 MISC metadata.xml 948 BLAKE2B c3f99b9a59aeb8ad3754b0caafdd7132ee60142f41d992b0fecdb3ed0f396ec7903fb68bc2e734e127f4f722c4f0c6c8398f94685925296037684912ace05764 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch
new file mode 100644
index 000000000000..2c5012ee34b4
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch
@@ -0,0 +1,56 @@
+From 383ee1aa19b7b72c686d70f34bc9c377a51aaf5e Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Wed, 9 May 2018 13:23:17 +0200
+Subject: [PATCH] Fix build without qtlocation
+
+Change-Id: I81ac6fcf14563a6d093c51d93754d438992ee52a
+---
+ src/core/content_browser_client_qt.cpp | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
+index 30ec43ca0..3878bd1bf 100644
+--- a/src/core/content_browser_client_qt.cpp
++++ b/src/core/content_browser_client_qt.cpp
+@@ -68,6 +68,7 @@
+ #include "content/public/common/main_function_params.h"
+ #include "content/public/common/service_names.mojom.h"
+ #include "content/public/common/url_constants.h"
++#include "device/geolocation/public/cpp/location_provider.h"
+ #include "mojo/public/cpp/bindings/binding.h"
+ #include "mojo/public/cpp/bindings/binding_set.h"
+ #include "printing/features/features.h"
+@@ -93,7 +94,6 @@
+ #include "certificate_error_controller_p.h"
+ #include "desktop_screen_qt.h"
+ #include "devtools_manager_delegate_qt.h"
+-#include "location_provider_qt.h"
+ #include "media_capture_devices_dispatcher.h"
+ #include "net/network_delegate_qt.h"
+ #include "net/qrc_protocol_handler_qt.h"
+@@ -123,6 +123,10 @@
+ #include "renderer_host/pepper/pepper_host_factory_qt.h"
+ #endif
+ 
++#if defined(QT_USE_POSITIONING)
++#include "location_provider_qt.h"
++#endif
++
+ #include <QGuiApplication>
+ #include <QLocale>
+ #ifndef QT_NO_OPENGL
+@@ -737,7 +741,11 @@ bool ContentBrowserClientQt::CanCreateWindow(
+ 
+ std::unique_ptr<device::LocationProvider> ContentBrowserClientQt::OverrideSystemLocationProvider()
+ {
++#if defined(QT_USE_POSITIONING)
+     return base::WrapUnique(new LocationProviderQt());
++#else
++    return nullptr;
++#endif
+ }
+ 
+ scoped_refptr<net::URLRequestContextGetter> GetSystemRequestContextOnUIThread()
+-- 
+2.16.3
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch
deleted file mode 100644
index 71881e0f77c2..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h	2016-11-23 13:01:20.929772871 -0800
-+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h	2016-11-23 13:02:18.879462854 -0800
-@@ -24,7 +24,9 @@
- // Disable deprecated features which result in spammy compile warnings.  This
- // list of defines must mirror those in the 'defines' section of BUILD.gn file &
- // ffmpeg.gyp file or the headers below will generate different structures!
-+#if !defined(USE_SYSTEM_FFMPEG)
- #define FF_API_CONVERGENCE_DURATION 0
-+#endif
- // Upstream libavcodec/utils.c still uses the deprecated
- // av_dup_packet(), causing deprecation warnings.
- // The normal fix for such things is to disable the feature as below,
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch
deleted file mode 100644
index ced5367c4826..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp	2016-11-15 17:07:38.680665385 -0800
-+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp	2016-11-15 17:12:17.564001354 -0800
-@@ -26,6 +26,9 @@
- #include "wtf/StdLibExtras.h"
- #include "wtf/text/CharacterNames.h"
- 
-+#include <unicode/uchar.h>
-+#include <unicode/uvernum.h>
-+
- namespace blink {
- 
- unsigned numGraphemeClusters(const String& string)
-@@ -122,13 +125,18 @@
-     { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // DEL
- };
- 
-+#if U_ICU_VERSION_MAJOR_NUM >= 58
-+#define BA_LB_COUNT (U_LB_COUNT - 3)
-+#else
-+#define BA_LB_COUNT U_LB_COUNT
-+#endif
- // Line breaking table for CSS word-break: break-all. This table differs from
- // asciiLineBreakTable in:
- // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking
- //   Algorithm: http://unicode.org/reports/tr14/#DescriptionOfProperties
- // - 1 indicates additional break opportunities. 0 indicates to fallback to
- //   normal line break, not "prohibit break."
--static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = {
-+static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = {
-     // XX AI AL B2 BA BB BK CB    CL CM CR EX GL HY ID IN    IS LF NS NU OP PO PR QU    SA SG SP SY ZW NL WJ H2    H3 JL JT JV CP CJ HL RI
-     { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX
-     { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI
-@@ -178,7 +186,7 @@
- #undef AL
- 
- static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + 1, "asciiLineBreakTable should be consistent");
--static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
-+static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
- 
- static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh)
- {
-@@ -209,7 +217,7 @@
- 
- static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, ULineBreak lineBreak)
- {
--    if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < U_LB_COUNT) {
-+    if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < BA_LB_COUNT) {
-         const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak];
-         return tableRow[lineBreak / 8] & (1 << (lineBreak % 8));
-     }
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch
deleted file mode 100644
index 193e71362065..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fa8cdb3a32c377b6290d0a92d2522186bcd48293 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-Date: Tue, 9 Aug 2016 16:21:29 +0200
-Subject: Do not depend on Linux 4.5
-
-Avoid using MADV_FREE that was only recently added to Linux. It will fail when
-run on older Linux kernels.
-
-Change-Id: I9b0369fb31402f088b2327c12f70dd39f5e4c8c0
-Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
----
- chromium/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
-index 12c9a7b..1639013 100644
---- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
-@@ -39,6 +39,11 @@
-
- #include <sys/mman.h>
- 
-+#if OS(LINUX) && defined(MADV_FREE)
-+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime
-+#undef MADV_FREE
-+#endif
-+
- #ifndef MADV_FREE
- #define MADV_FREE MADV_DONTNEED
- #endif
--- 
-cgit v1.0-4-g1e03
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch
deleted file mode 100644
index 597554e685cd..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# dev-qt/qtwebengine: Fix detecting audio backends.
-
-# The upstream change doesn't really work for us, so we'll make
-# it work with us.
-# Gentoo-Bug: https://bugs.gentoo.org/603498
-
---- /src/core/config/linux.pri	2016-12-23 00:05:41.057955774 +0200
-+++ /src/core/config/linux.pri	2016-12-23 00:09:39.000573909 +0200
-@@ -35,12 +35,12 @@
- contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
- contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
- contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1
--contains(QT_CONFIG, pulseaudio) {
-+use?(pulseaudio) {
-     GYP_CONFIG += use_pulseaudio=1
- } else {
-     GYP_CONFIG += use_pulseaudio=0
- }
--contains(QT_CONFIG, alsa) {
-+use?(alsa) {
-     GYP_CONFIG += use_alsa=1
- } else {
-     GYP_CONFIG += use_alsa=0
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch
deleted file mode 100644
index a5c3072a4777..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 64fdd317d4127142ad9e967197a2df6ac81ef55f Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Wed, 29 Mar 2017 17:42:18 +0200
-Subject: [PATCH] Fix build with GCC 7.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Fixes some ambiguities and outright wrong code GCC 7 doesn't accept but
-earlier compilers did.
-
-Task-number:QTBUG-59776
-Change-Id: I012f121842ac6cde49db0d571efc62aabe2115e3
-Reviewed-by: Michael Brüning <michael.bruning@qt.io>
----
- .../mojo/public/cpp/bindings/interface_ptr_info.h     |  2 +-
- .../third_party/WebKit/Source/wtf/LinkedHashSet.h     |  2 ++
- chromium/v8/src/objects-body-descriptors.h            |  2 +-
- chromium/v8/src/objects-inl.h                         | 19 +++++++++++++++++++
- chromium/v8/src/objects.h                             | 16 ++--------------
- 5 files changed, 25 insertions(+), 16 deletions(-)
-
-diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
-index 5bd29d5..c94a5ac 100644
---- a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
-+++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
-@@ -34,7 +34,7 @@ class InterfacePtrInfo {
- 
-   InterfacePtrInfo& operator=(InterfacePtrInfo&& other) {
-     if (this != &other) {
--      handle_ = other.handle_.Pass();
-+      handle_ = std::move(other.handle_);
-       version_ = other.version_;
-       other.version_ = 0u;
-     }
--- 
-2.7.4
-From 493441248c82d9f39d0947e3bbf4571736e1cf85 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Wed, 29 Mar 2017 15:53:00 +0200
-Subject: [PATCH 1/1] Fix build with GCC 7.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Fixes a few problems with using undeclared functions and ambigious
-code.
-
-Task-number: QTBUG-59776
-Change-Id: I59813919b4867d5dd3499a45baed004a1a1c1a3c
-Reviewed-by: Michael Brüning <michael.bruning@qt.io>
----
- chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h |  2 ++
- .../third_party/pdfium/fpdfsdk/javascript/global.cpp   |  8 ++++----
- chromium/v8/src/objects-body-descriptors.h             |  2 +-
- chromium/v8/src/objects-inl.h                          | 18 ++++++++++++++++++
- chromium/v8/src/objects.h                              | 16 ++--------------
- 5 files changed, 27 insertions(+), 19 deletions(-)
-
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
-index e85c72f..6f94cd6 100644
---- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
-@@ -542,6 +542,8 @@ inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=(LinkedHas
-     return *this;
- }
- 
-+inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b);
-+
- template<typename T, typename U, typename V, typename W>
- inline void LinkedHashSet<T, U, V, W>::swap(LinkedHashSet& other)
- {
-diff --git a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
-index 91cb888..a1c3634 100644
---- a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
-+++ b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
-@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase {
- 
-   template <typename StaticVisitor>
-   static inline void IterateBody(HeapObject* obj, int object_size) {
--    IterateBody(obj);
-+    IterateBody<StaticVisitor>(obj);
-   }
- };
- 
-diff --git a/src/3rdparty/chromium/v8/src/objects-inl.h b/src/3rdparty/chromium/v8/src/objects-inl.h
-index 58441d3..4c486ea 100644
---- a/src/3rdparty/chromium/v8/src/objects-inl.h
-+++ b/src/3rdparty/chromium/v8/src/objects-inl.h
-@@ -7588,6 +7588,24 @@ bool GlobalDictionaryShape::IsDeleted(Dictionary* dict, int entry) {
- }
- 
- 
-+template <typename Derived, typename Shape, typename Key>
-+inline uint32_t HashTable<Derived,Shape,Key>::Hash(Key key) {
-+  if (Shape::UsesSeed) {
-+    return Shape::SeededHash(key, GetHeap()->HashSeed());
-+  } else {
-+    return Shape::Hash(key);
-+  }
-+}
-+
-+template <typename Derived, typename Shape, typename Key>
-+inline uint32_t HashTable<Derived,Shape,Key>::HashForObject(Key key, Object* object) {
-+  if (Shape::UsesSeed) {
-+    return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
-+  } else {
-+    return Shape::HashForObject(key, object);
-+  }
-+}
-+
- bool ObjectHashTableShape::IsMatch(Handle<Object> key, Object* other) {
-   return key->SameValue(other);
- }
-diff --git a/src/3rdparty/chromium/v8/src/objects.h b/src/3rdparty/chromium/v8/src/objects.h
-index 7d774be..42da5fa 100644
---- a/src/3rdparty/chromium/v8/src/objects.h
-+++ b/src/3rdparty/chromium/v8/src/objects.h
-@@ -3194,21 +3194,9 @@ class HashTable : public HashTableBase {
-   typedef Shape ShapeT;
- 
-   // Wrapper methods
--  inline uint32_t Hash(Key key) {
--    if (Shape::UsesSeed) {
--      return Shape::SeededHash(key, GetHeap()->HashSeed());
--    } else {
--      return Shape::Hash(key);
--    }
--  }
-+  inline uint32_t Hash(Key key);
- 
--  inline uint32_t HashForObject(Key key, Object* object) {
--    if (Shape::UsesSeed) {
--      return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
--    } else {
--      return Shape::HashForObject(key, object);
--    }
--  }
-+  inline uint32_t HashForObject(Key key, Object* object);
- 
-   // Returns a new HashTable object.
-   MUST_USE_RESULT static Handle<Derived> New(
--- 
-2.7.4
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_beta4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild
index 32064b192b08..735be56a730c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.0_beta4.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild
@@ -77,6 +77,8 @@ DEPEND="${RDEPEND}
 	pax_kernel? ( sys-apps/elfix )
 "
 
+PATCHES+=( "${FILESDIR}/${PN}-5.11.0-fix-build-w-o-qtlocation.patch" )
+
 src_prepare() {
 	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
 	use system-icu && has_version ">=dev-libs/icu-59" && \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
deleted file mode 100644
index 78b9daea2884..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils 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"
-fi
-
-IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg system-icu widgets"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtwebchannel-${PV}[qml]
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/protobuf:=
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc]
-	media-libs/libwebp:=
-	media-libs/mesa
-	media-libs/opus
-	net-libs/libsrtp:0=
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/libcap
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( <dev-libs/icu-59:= )
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	sys-devel/bison
-	pax_kernel? ( sys-apps/elfix )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.7.1-fix-audio-detection.patch"
-	"${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch"
-	"${FILESDIR}/${PN}-5.7.0-icu58.patch"
-	"${FILESDIR}/${PN}-5.7.0-undef-madv_free.patch"
-	"${FILESDIR}/${PN}-5.7.1-gcc-7.patch"
-)
-
-src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
-
-	if use system-icu; then
-		# ensure build against system headers - bug #601264
-		rm -r src/3rdparty/chromium/third_party/icu/source || die
-	fi
-
-	qt_use_disable_mod geolocation positioning \
-		src/core/core_common.pri \
-		src/core/core_gyp_generator.pro
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		$(usex alsa 'WEBENGINE_CONFIG+=use_alsa' '')
-		$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
-		$(usex pulseaudio 'WEBENGINE_CONFIG+=use_pulseaudio' '')
-		$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
-		$(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-
-	pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
-}