gentoo resync : 15.12.2019

7 files changed, 2 insertions, 340 deletions

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 4d14def58899..602fb6d97d16 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,10 +1,4 @@
-AUX qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch 4466 BLAKE2B 62a135c8f7270077873291dec3d2d29bd663e3c4583c4886e781a974704628bc46aa4aa24ac45ea3a70c2b8652e78029eed4bba441a6a02eafb6d9b34562ff6c SHA512 9feab732ee2bb7aaeb67049d202e8f6b12ac92b0a1e963b518e85c13e7e3a856c842c3c12c9662ce06d0d77d7a61795270749eba73070eadbb066dcb88aa066e
-AUX qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch 1164 BLAKE2B d0d12652387ed24a21548746687fb4689d3d9198e66ba5bb3fa6ec3aeb83db610f5f9e9910ec6c5f240ac6a0f2af855afa4413f971585588fe0d9bd6b718203c SHA512 52f34491d15cc8ca381347427cb440788f8ac6d7d8e52bab067fe997e321bd9e693c9d48669b6bbc23f060c9475d25563496e368b7a94198aff25a21a1491e3e
-AUX qtwebkit-5.212.0_pre20180120-functional.patch 723 BLAKE2B dec67933a798f485e59ea87fbcc2f9475f426427cbc80dff39808b48bcf4dd74f802b648db11f2611e85364e978f55eab029e09c7c88d9524a961bb6627682c1 SHA512 7f54f26a18f91ba7dd71e1c82c22533b13707d045c0d693c4102bd95c9a77ba74678c90394ea65816e9fa80845d46735d7c8b178e1b5ad34e6214e9a5ae8947f
-AUX qtwebkit-5.212.0_pre20180120-js-build-error.patch 2124 BLAKE2B 2c09bff3d9bcc950b7305c7aa943d5af8d47572b2b38063fe4de0e8d48768e9fd337e09fdcc314bd9ceda3e51f8bd6731beb4660a95104c0f1d8e6063d01c294 SHA512 01e090b390dcb78a998203806baa0677d39aa680107ee523e4fe1c26d9fa8750836a715a107eb00487e1ef100cdbfcb8ee9d2d9bb47f5f336dd153b591fb26d3
 AUX qtwebkit-5.212.0_pre20190629-icu-65.patch 1845 BLAKE2B c5bf1f575f55d61d57b6f603c66a18079e746c5cc7e124dd8cf950c4db7927d7fc2ad04606dacbcf41765d4d0e81d4106f5d08752066ab140b69581cf5a3051f SHA512 d934cfb5ef1373617db6b2cfc0ff5d542595b06b180bdd00124f91e9587936e6ab1b92842cdc18127d52db80d86e242febc39ac2f6697ee57489cdc1421c5c14
 DIST qtwebkit-5.212.0-alpha3.tar.xz 12457896 BLAKE2B 1b6ce78706a9696f0eb1fbe287d0d095d0089daf645a9ca60f9f31b9057669180b14d67a3bdfb387fc09dbbeee658c0e895a95edc46b2020f06f2b58188ba65d SHA512 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f
-DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
-EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3978 BLAKE2B f07d92bb3373319701138006ebd3408e25b728d58c1755134966be06b9b70c94dc0e7fc4baec54241db37f37261d9cb7e8e494798ada848bb2dd655bbb67c89d SHA512 3825142883d045a5fedd02848000d212173e6552bfb4b330041e6e1d9930d6fedeb4f0d8c15f41eb00375cb74f5e177c0ce56f37a722c9a5c5c43612bacb5d12
-EBUILD qtwebkit-5.212.0_pre20190629.ebuild 3765 BLAKE2B 0828a90bbd19e39548222bc1c44d70e8ddf825520dbda9170e139d1de7e7c201ef99732f3d9385d6aea6f1bf542462abc0b9485246d75b176c95cf4ec8e8c4be SHA512 daaac68f37dea30df1ecc34c416e4c930e0df746971343d5d79ae70a6d74532f132abc081a8e408e49518521803d62cd63e10160451afe563daa529a72019a1f
+EBUILD qtwebkit-5.212.0_pre20190629.ebuild 3763 BLAKE2B ebffe17831bd5c89dad23cc9d89a8a4aedc292b2e220e3b15da763baad34486159f9badf41bc4790f2119699a2913e717308abbd05ab967ed491f25afd17909f SHA512 cfcb8692e6b0c9012d72b79a2855c0cce5d605f057c87a93b9a0bbb5a1ec20e70af40040f65e0b1bd7316bc11e87ffd6b9dd69b9fe74deb11f5f8a6eb0e4b315
 MISC metadata.xml 1225 BLAKE2B 29d533721955dea3cd9f1d23494438d3abc079d713cf77d707920a765e3eba4e2160d0f80b05ec2ba8cbcf7999aad51201bbf002e8b59161bb2d0d85cd945e50 SHA512 b382f115f4705a577e210760d499fde421d0091818914674f0c2eb7fc4967d19d5dbf752be19f43f0edb27493ebec58b89e07a65ffa505842a089d06353aa122
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch
deleted file mode 100644
index a460cec609bc..000000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 326604b27878566d581ea8c1991abd280453a75b Mon Sep 17 00:00:00 2001
-From: Andrew Webster <awebster@arcx.com>
-Date: Tue, 20 Mar 2018 09:08:00 -0400
-Subject: [PATCH] [cmake] Make spelling for PKGCONFIG_DEPS consistent
-
-It was referenced as PKGCONGIG_DEPS and PKGCONFIG_DEPS which left
-Qt5WebKitWidgets with empty dependencies.  Correcting to
-PKGCONFIG_DEPS gives it the proper dependencies.
-
-Qt5WebKit was already working, but the spelling has also been
-corrected to avoid confusion.
----
- Source/WebKit/PlatformQt.cmake | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
-index 28976b611cd8..de3eabab1157 100644
---- a/Source/WebKit/PlatformQt.cmake
-+++ b/Source/WebKit/PlatformQt.cmake
-@@ -427,7 +427,7 @@ install(
-     COMPONENT Data
- )
- 
--set(WEBKIT_PKGCONGIG_DEPS "Qt5Core Qt5Gui Qt5Network")
-+set(WEBKIT_PKGCONFIG_DEPS "Qt5Core Qt5Gui Qt5Network")
- set(WEBKIT_PRI_DEPS "core gui network")
- set(WEBKIT_PRI_EXTRA_LIBS "")
- set(WEBKIT_PRI_RUNTIME_DEPS "core_private gui_private")
-@@ -448,11 +448,11 @@ if (USE_MEDIA_FOUNDATION)
-     set(WEBKIT_PRI_EXTRA_LIBS "-lmfuuid -lstrmiids ${WEBKIT_PRI_EXTRA_LIBS}")
- endif ()
- if (USE_QT_MULTIMEDIA)
--    set(WEBKIT_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Multimedia")
-+    set(WEBKIT_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} Qt5Multimedia")
-     set(WEBKIT_PRI_RUNTIME_DEPS "multimedia ${WEBKIT_PRI_RUNTIME_DEPS}")
- endif ()
- 
--set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit")
-+set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit")
- set(WEBKITWIDGETS_PRI_DEPS "${WEBKIT_PRI_DEPS} widgets webkit")
- set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKIT_PRI_RUNTIME_DEPS} widgets_private")
- 
-@@ -465,12 +465,12 @@ if (ENABLE_PRINT_SUPPORT)
- endif ()
- 
- if (USE_QT_MULTIMEDIA)
--    set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKITWIDGETS_PKGCONGIG_DEPS} Qt5MultimediaWidgets")
-+    set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} Qt5MultimediaWidgets")
-     set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKITWIDGETS_PRI_RUNTIME_DEPS} multimediawidgets")
- endif ()
- 
- if (QT_STATIC_BUILD)
--    set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKITWIDGETS_PKGCONGIG_DEPS} Qt5PrintSupport")
-+    set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} Qt5PrintSupport")
-     set(WEBKITWIDGETS_PRI_DEPS "${WEBKITWIDGETS_PRI_DEPS} printsupport")
-     set(EXTRA_LIBS_NAMES WebCore JavaScriptCore WTF)
-     append_lib_names_to_list(EXTRA_LIBS_NAMES ${LIBXML2_LIBRARIES} ${SQLITE_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
-@@ -494,7 +494,7 @@ if (QT_STATIC_BUILD)
-     endif ()
-     list(REMOVE_DUPLICATES EXTRA_LIBS_NAMES)
-     foreach (LIB_NAME ${EXTRA_LIBS_NAMES})
--        set(WEBKIT_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} ${LIB_PREFIX}${LIB_NAME}")
-+        set(WEBKIT_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} ${LIB_PREFIX}${LIB_NAME}")
-         set(WEBKIT_PRI_EXTRA_LIBS "${WEBKIT_PRI_EXTRA_LIBS} -l${LIB_PREFIX}${LIB_NAME}")
-     endforeach ()
- endif ()
-@@ -504,7 +504,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
-         BASE_NAME Qt5WebKit
-         DESCRIPTION "Qt WebKit module"
-         INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit"
--        DEPS "${WEBKIT_PKGCONGIG_DEPS}"
-+        DEPS "${WEBKIT_PKGCONFIG_DEPS}"
-         FILENAME_VAR WebKit_PKGCONFIG_FILENAME
-     )
-     set(ECM_PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.")
-From 8c76aabf062232c3fb26839b76716006eca44eec Mon Sep 17 00:00:00 2001
-From: Andrew Webster <awebster@arcx.com>
-Date: Tue, 20 Mar 2018 10:33:59 -0400
-Subject: [PATCH] [cmake] Another PKGCONFIG_DEPS correction
-
----
- Source/WebKit/PlatformQt.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
-index de3eabab1157..6ab441b98d29 100644
---- a/Source/WebKit/PlatformQt.cmake
-+++ b/Source/WebKit/PlatformQt.cmake
-@@ -452,7 +452,7 @@ if (USE_QT_MULTIMEDIA)
-     set(WEBKIT_PRI_RUNTIME_DEPS "multimedia ${WEBKIT_PRI_RUNTIME_DEPS}")
- endif ()
- 
--set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit")
-+set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} Qt5Widgets Qt5WebKit")
- set(WEBKITWIDGETS_PRI_DEPS "${WEBKIT_PRI_DEPS} widgets webkit")
- set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKIT_PRI_RUNTIME_DEPS} widgets_private")
- 
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch
deleted file mode 100644
index e5d7796ee142..000000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fbd1de045999d1e5b5dcae7ac6c1e674ac0044fe Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev <mitya57@gmail.com>
-Date: Sat, 24 Feb 2018 15:09:53 +0300
-Subject: [PATCH] [cmake] Fix include dir in the generated pkg-config files
-
----
- Source/WebKit/PlatformQt.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
-index 6fe440be800c..28976b611cd8 100644
---- a/Source/WebKit/PlatformQt.cmake
-+++ b/Source/WebKit/PlatformQt.cmake
-@@ -503,6 +503,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
-     ecm_generate_pkgconfig_file(
-         BASE_NAME Qt5WebKit
-         DESCRIPTION "Qt WebKit module"
-+        INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit"
-         DEPS "${WEBKIT_PKGCONGIG_DEPS}"
-         FILENAME_VAR WebKit_PKGCONFIG_FILENAME
-     )
-@@ -728,6 +729,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
-     ecm_generate_pkgconfig_file(
-         BASE_NAME Qt5WebKitWidgets
-         DESCRIPTION "Qt WebKitWidgets module"
-+        INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets"
-         DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}"
-         FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME
-     )
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
deleted file mode 100644
index d8b5ba6cf31e..000000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 4ce8ebc4094512b9916bfa5984065e95ac97c9d8 Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <annulen@yandex.ru>
-Date: Fri, 26 Jan 2018 20:50:07 +0300
-Subject: [PATCH] Add missing #include <functional>
-
-Change-Id: Ic5499c1854479064b735bff79b3501992a20a12f
----
- Source/WebCore/dom/SlotAssignment.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h
-index 0fcd4dfa6de8..9b9ebe429816 100644
---- a/Source/WebCore/dom/SlotAssignment.h
-+++ b/Source/WebCore/dom/SlotAssignment.h
-@@ -28,6 +28,7 @@
- 
- #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
- 
-+#include <functional>
- #include <wtf/HashMap.h>
- #include <wtf/HashSet.h>
- #include <wtf/Vector.h>
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-js-build-error.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-js-build-error.patch
deleted file mode 100644
index 904957c71861..000000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-js-build-error.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e9a78eafc172a69d48ee48d971b3e430613ab513 Mon Sep 17 00:00:00 2001
-From: bernhardu <bernhardu@mailbox.org>
-Date: Mon, 25 Mar 2019 01:57:26 +0100
-Subject: [PATCH] Add attribute fastcall to derived class member
- JSImageConstructor::construct (#803)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise the Debian build on i386 fails with this error:
-In file included from ../Source/WebCore/bindings/js/JSImageConstructor.cpp:24,
-                 from ../Source/WebCore/bindings/js/JSBindingsAllInOne.cpp:101:
-../Source/WebCore/bindings/js/JSDOMConstructor.h: In instantiation of ‘static JSC::ConstructType WebCore::JSDOMNamedConstructor<JSClass>::getConstructData(JSC::JSCell*, JSC::ConstructData&) [with JSClass = WebCore::JSHTMLImageElement]’:
-../Source/WebCore/bindings/js/JSImageConstructor.cpp:75:97:   required from here
-../Source/WebCore/bindings/js/JSDOMConstructor.h:195:35: error: invalid conversion from ‘JSC::EncodedJSValue (*)(JSC::ExecState*)’ {aka ‘long long int (*)(JSC::ExecState*)’} to ‘JSC::NativeFunction’ {aka ‘long long int (__attribute__((fastcall)) *)(JSC::ExecState*)’} [-fpermissive]
-     constructData.native.function = construct;
-     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~
----
- Source/WebCore/bindings/js/JSImageConstructor.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebCore/bindings/js/JSImageConstructor.cpp b/Source/WebCore/bindings/js/JSImageConstructor.cpp
-index 923690600ab1..de553f5fa899 100644
---- a/Source/WebCore/bindings/js/JSImageConstructor.cpp
-+++ b/Source/WebCore/bindings/js/JSImageConstructor.cpp
-@@ -44,7 +44,7 @@ template<> JSValue JSImageConstructor::prototypeForStructure(VM& vm, const JSDOM
-     return JSHTMLElement::getConstructor(vm, &globalObject);
- }
- 
--template<> EncodedJSValue JSImageConstructor::construct(ExecState* state)
-+template<> EncodedJSValue JSC_HOST_CALL JSImageConstructor::construct(ExecState* state)
- {
-     JSImageConstructor* jsConstructor = jsCast<JSImageConstructor*>(state->callee());
-     Document* document = jsConstructor->document();
\ No newline at end of file
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
deleted file mode 100644
index 5d0412d03ffe..000000000000
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs
-
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-HOMEPAGE="https://www.qt.io/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="BSD LGPL-2+"
-SLOT="5/5.212"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
-
-REQUIRED_USE="
-	nsplugin? ( X )
-	qml? ( opengl )
-	?? ( gstreamer multimedia )
-"
-
-# Dependencies found at Source/cmake/OptionsQt.cmake
-QT_MIN_VER="5.9.1:5"
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/icu:=
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtcore-${QT_MIN_VER}
-	>=dev-qt/qtgui-${QT_MIN_VER}
-	>=dev-qt/qtnetwork-${QT_MIN_VER}
-	>=dev-qt/qtwidgets-${QT_MIN_VER}=
-	media-libs/libpng:0=
-	virtual/jpeg:0
-	geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-bad:1.0
-	)
-	hyphen? ( dev-libs/hyphen )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
-	opengl? (
-		>=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
-		>=dev-qt/qtopengl-${QT_MIN_VER}[gles2=]
-	)
-	orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
-	qml? (
-		>=dev-qt/qtdeclarative-${QT_MIN_VER}
-		>=dev-qt/qtwebchannel-${QT_MIN_VER}[qml]
-	)
-	webp? ( media-libs/libwebp:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	dev-lang/perl
-	dev-util/gperf
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${COMMIT}
-
-PATCHES=(
-	"${FILESDIR}/${P}-functional.patch"
-	"${FILESDIR}/${P}-fix-pkgconfig.patch"
-	"${FILESDIR}/${P}-cmake-fix-pkgconfig_deps-spelling.patch"
-	"${FILESDIR}/${P}-js-build-error.patch"
-)
-
-CHECKREQS_DISK_BUILD="16G" # bug 417307
-
-_check_reqs() {
-	if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then
-		einfo "Checking for sufficient disk space to build ${PN} with debugging flags"
-		check-reqs_$1
-	fi
-}
-
-pkg_pretend() {
-	_check_reqs pkg_pretend
-}
-
-pkg_setup() {
-	_check_reqs pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix, bug #395875
-	tc-export CC
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local mycmakeargs=(
-		-DPORT=Qt
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_TOOLS=OFF
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		-DUSE_GSTREAMER=$(usex gstreamer)
-		-DUSE_LIBHYPHEN=$(usex hyphen)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_QT_MULTIMEDIA=$(usex multimedia)
-		-DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_PRINT_SUPPORT=$(usex printsupport)
-		-DENABLE_DEVICE_ORIENTATION=$(usex orientation)
-		-DENABLE_WEBKIT2=$(usex qml)
-		$(cmake-utils_use_find_package webp WebP)
-		-DENABLE_X11_TARGET=$(usex X)
-	)
-
-	if has_version "virtual/rubygems[ruby_targets_ruby26]"; then
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) )
-	elif has_version "virtual/rubygems[ruby_targets_ruby25]"; then
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
-	elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) )
-	else
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby23) )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# bug 572056
-	if [[ ! -f ${ED%/}$(qt5_get_libdir)/libQt5WebKit.so ]]; then
-		eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
-		die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
-	fi
-}
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
index 0d3882fcc276..196ec44e9343 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar
 
 LICENSE="BSD LGPL-2+"
 SLOT="5/5.212"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
 
 REQUIRED_USE="