gentoo Easter resync : 12.04.2020

4 files changed, 21 insertions, 76 deletions

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 900f78195ff6..f1b983f4a541 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,4 +1,3 @@
-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
-EBUILD qtwebkit-5.212.0_pre20190629.ebuild 3865 BLAKE2B 4db7c5a2fce90d307dd33e4558fa94737a27528f09cc1f55cc6d2d2930754b1bc24d36389d193c386f11c7c3ebd2d8aeeb2ba64e0db5f5be533a6fdbb1e9ca11 SHA512 cd9ae8755bfd923274f533e8cd5ea97366a2f862bd8c87a1ad75f7bf13bb4036ca570cf56aeac766284558194d9e7f9fb20a650e334d1c4be4c309d5aadc54b7
-MISC metadata.xml 1225 BLAKE2B 29d533721955dea3cd9f1d23494438d3abc079d713cf77d707920a765e3eba4e2160d0f80b05ec2ba8cbcf7999aad51201bbf002e8b59161bb2d0d85cd945e50 SHA512 b382f115f4705a577e210760d499fde421d0091818914674f0c2eb7fc4967d19d5dbf752be19f43f0edb27493ebec58b89e07a65ffa505842a089d06353aa122
+DIST qtwebkit-5.212.0-alpha4.tar.xz 12528508 BLAKE2B 72d7444f270f47b62044cf683ed306803660bfbafe1450440ea29e43e3c0e6e841b6e860dfa8affc1b32b7c539448f04e22a7ae38cce055d37905dfb3240aab0 SHA512 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
+EBUILD qtwebkit-5.212.0_pre20200309-r1.ebuild 3878 BLAKE2B 10afa1ed2e8d40814c9a456537b7fc9f9143332a3549a88a059d81a523f98f288cbed30573e9f1c8a6bbc7b670cb24d378404d23c612dd1677390aa689bf97e9 SHA512 4e7e2bf93491360f325ea6c7e4a370592d1b73d46b87f21ff005b1ed0a0ebe64f389e1ae47ed2d471bb6b5dc324a7f1eed6f2042312487931616e01abeec2956
+MISC metadata.xml 1152 BLAKE2B 6291c4643d29dd68af56e6054c4db1ebb307fdf2097012182dc77a2754e51bca84c1f53ae7c9f6305ead35cc47334a9e0ca605871aac899ce06482d983c8406f SHA512 28146a11931ab5b106d7bfa08dd3cb38ed3ae1fec003ca27f3f3234887bc9d65a82c76e5ab50334e94de02c3b6455a228acec2574c551e218e53e2005becc6c6
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch
deleted file mode 100644
index 1891f73d5a44..000000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From dc02ec4080010e33b737db6491d71d6bb961a77d Mon Sep 17 00:00:00 2001
-From: "commit-queue@webkit.org"
- <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Fri, 4 Oct 2019 21:51:37 +0000
-Subject: [PATCH] Fix build with icu 65.1
- https://bugs.webkit.org/show_bug.cgi?id=202600
-
-Patch by Heiko Becker <heirecka@exherbo.org> on 2019-10-04
-Reviewed by Konstantin Tokarev.
-
-Source/WebCore:
-
-* dom/Document.cpp:
-(WebCore::isValidNameNonASCII):
-(WebCore::Document::parseQualifiedName):
-
-Source/WTF:
-
-* wtf/URLHelpers.cpp:
-(WTF::URLHelpers::allCharactersInIDNScriptWhiteList):
-
-Change-Id: I1b087322cbae43fbe155facdf933717ac8569b6c
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@250747 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WebCore/dom/Document.cpp |  6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
-index 1bca2d0a66f8..19355f166019 100644
---- a/Source/WebCore/dom/Document.cpp
-+++ b/Source/WebCore/dom/Document.cpp
-@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
-     unsigned i = 0;
- 
-     UChar32 c;
--    U16_NEXT(characters, i, length, c)
-+    U16_NEXT(characters, i, length, c);
-     if (!isValidNameStart(c))
-         return false;
- 
-     while (i < length) {
--        U16_NEXT(characters, i, length, c)
-+        U16_NEXT(characters, i, length, c);
-         if (!isValidNamePart(c))
-             return false;
-     }
-@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S
- 
-     for (unsigned i = 0; i < length;) {
-         UChar32 c;
--        U16_NEXT(qualifiedName, i, length, c)
-+        U16_NEXT(qualifiedName, i, length, c);
-         if (c == ':') {
-             if (sawColon) {
-                 ec = NAMESPACE_ERR;
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 342794051c12..05f4bb98e37c 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
-		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag>
 		<flag name="hyphen">Enable hyphenation support via <pkg>dev-libs/hyphen</pkg></flag>
 		<flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
index 58d927f9baa1..8147c1457869 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
@@ -3,19 +3,26 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous snapshot
+if [[ ${PV} = *9999 ]]; then
+	EGIT_BRANCH="qtwebkit-5.212"
+	EGIT_REPO_URI="https://github.com/qtwebkit/qtwebkit.git"
+	inherit git-r3
+else
+	MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over previous snapshot
+	SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+PYTHON_COMPAT=( python3_{6,7,8} )
+USE_RUBY="ruby25 ruby26 ruby27"
 inherit check-reqs cmake 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="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz"
 
 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"
+IUSE="geolocation gles2-only +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
 
 REQUIRED_USE="
 	nsplugin? ( X )
@@ -24,7 +31,7 @@ REQUIRED_USE="
 "
 
 # Dependencies found at Source/cmake/OptionsQt.cmake
-QT_MIN_VER="5.9.1:5"
+QT_MIN_VER="5.12.3:5"
 BDEPEND="
 	${PYTHON_DEPS}
 	${RUBY_DEPS}
@@ -44,6 +51,7 @@ DEPEND="
 	>=dev-qt/qtnetwork-${QT_MIN_VER}
 	>=dev-qt/qtwidgets-${QT_MIN_VER}=
 	media-libs/libpng:0=
+	media-libs/woff2
 	virtual/jpeg:0
 	geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
 	gstreamer? (
@@ -55,8 +63,8 @@ DEPEND="
 	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=]
+		>=dev-qt/qtgui-${QT_MIN_VER}[gles2-only=]
+		>=dev-qt/qtopengl-${QT_MIN_VER}[gles2-only=]
 	)
 	orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
 	printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
@@ -73,12 +81,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 CHECKREQS_DISK_BUILD="16G" # bug 417307
 
-PATCHES=( "${FILESDIR}/${P}-icu-65.patch" )
-
 _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"
@@ -124,10 +128,8 @@ src_configure() {
 		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby27) )
 	elif 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) )
 	else
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) )
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
 	fi
 
 	cmake_src_configure