gentoo resync : 14.05.2020

5 files changed, 177 insertions, 165 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 584aef98af98..8620bd12cadb 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,10 +1,8 @@
-AUX qtwebengine-5.12.5-icu-65.patch 1394 BLAKE2B 223e449a1086c2f062e34752278ba83a828283aa577b92aa3ba28343fb06e18ed6b94990e46729076b099674e2a0936f08958aa72ac3b44f4cc7dd1602b13cfa SHA512 2b530a6a60e1ca71aba7c7d86f7e831799e8bec20ab6c97d79e753d337767c9f44938f19c00714706f2720bb4b0a3599a44046a69ed42372b21bac452b713b68
 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.13.2.tar.xz 255593964 BLAKE2B 458f718183aa53376e1aeeb6306b0b3960bd001aebf61e9650d30afd408af003183b7748a87aa0c6a1aa0b3a4be548b417609146b71dc6afa46db49c4b48919f SHA512 10ae5cca36230069ef117cae15b84e29124c43e4864dbfa7a1f99879764b871355281edcb1942e86ec3a4cac12bbfd2749577745c8c7e736eb6a9909876554d0
+AUX qtwebengine-5.14.2-icu67.patch 7348 BLAKE2B b1e4af1fa83c5168600f32c7a58e968dfcbc40016183a41e7df0340742504d441474a2b3f57a5128d32f1b74a2f02a2ee58d14ce34f731fecd19a1e8fef6e540 SHA512 cbcdf51a00c30717ab6aa5d76656138888dc436f278d352a838ac98338613aa0e915114d7a3a0657e2110faaed04af5334077de0c6bc02cea01016d8c2413de7
 DIST qtwebengine-everywhere-src-5.14.1.tar.xz 242438244 BLAKE2B d24210b2e04522b27409cc5ccfe722114f711c1c5e9aaff76882c178b0c455b475b90fd2acd5f7ba4f5dfba85c228c4baf2c231d3661eadf83e984d7e7b9e30f SHA512 fafa2fbc789941e837e35945857a6da00e73bd2abe512290674b9957719b998d8b8b95a35c709a171c9d0d111e6f418cec630dfcdbe47ecbae25a3b94e4c99f9
 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
+EBUILD qtwebengine-5.14.2.ebuild 4450 BLAKE2B 87ca6b364d131eed3c6372e5532d5c4029eaf131af7e519548aa2d5debf7e4d304eafd73d94a298dc19b7e824a09c59cf3d5698fa4773af3bf1ada1be0fc863b SHA512 c949bd8122e17a85473465fa45998da14e843d45e347ad2064725135979b28dc9bf84b3d657ac96af9335ab69717734e4723311a1d1eaa28fb7c26f34d2fdce9
 MISC metadata.xml 1102 BLAKE2B 7ba2157c180e35ea470d8296d157d73f2fa565cbc8319f41f5ae533b02dc981a4d4352efb1ad94f1e298047a3b56cea097aef3ff09a19d33cf861cfb64ee9119 SHA512 d96e13fa5eddde448bce28c9373022909035f9b63e75584e7f320510f853e1c89dc9417f4280d307e29c9a7f75c89c75b5cc00c19c2d6cd6360812719dd0acc8
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
deleted file mode 100644
index d7fdaebdb664..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 27947d92157b0987ceef9ae31fe0d3e7f8b653df Mon Sep 17 00:00:00 2001
-From: Kirill Burtsev <kirill.burtsev@qt.io>
-Date: Fri, 23 Aug 2019 15:09:25 +0200
-Subject: Fix compilation with system ICU
-
-ICU upstream now requires that ICU4C API macros are used with a
-trailing semicolon.
-
-- https://unicode-org.atlassian.net/browse/ICU-20601
-- https://github.com/unicode-org/icu/pull/759
-
-Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
-Fixes: QTBUG-78911
-Reviewed-by: Jimi Huotari <chiitoo@gentoo.org>
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- .../blink/renderer/core/dom/document.cc            |  2 +-
- chromium/third_party/icu/BUILD.gn                  | 28 +++++++++++++++-------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git a/chromium/third_party/blink/renderer/core/dom/document.cc b/chromium/third_party/blink/renderer/core/dom/document.cc
-index 920dab7c48d..43fd422393c 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
-@@ -6065,7 +6065,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
- 
-   for (unsigned i = 0; i < length;) {
-     UChar32 c;
--    U16_NEXT(characters, i, length, c)
-+    U16_NEXT(characters, i, length, c);
-     if (c == ':') {
-       if (saw_colon)
-         return ParseQualifiedNameResult(kQNMultipleColons);
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch
new file mode 100644
index 000000000000..42ee5e87da26
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch
@@ -0,0 +1,169 @@
+From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001
+From: Ujjwal Sharma <ryzokuken@disroot.org>
+Date: Wed, 22 Apr 2020 12:20:17 +0530
+Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba
+
+Original commit message:
+
+    [intl] Remove soon-to-be removed getAllFieldPositions
+
+    Needed to land ICU67.1 soon.
+
+    Bug: v8:10393
+    Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618
+    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489
+    Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
+    Commit-Queue: Frank Tang <ftang@chromium.org>
+    Cr-Commit-Position: refs/heads/master@{#67027}
+
+Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463
+---
+ common.gypi                             |  2 +-
+ src/3rdparty/chromium/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------
+ 2 files changed, 38 insertions(+), 36 deletions(-)
+
+diff --git a/deps/v8/src/objects/js-number-format.cc b/deps/v8/src/objects/js-number-format.cc
+index 92d3e2fb82e..ced408aa173 100644
+--- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
++++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
+@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
+ }
+ 
+ namespace {
+-Maybe<icu::UnicodeString> IcuFormatNumber(
++Maybe<bool> IcuFormatNumber(
+     Isolate* isolate,
+     const icu::number::LocalizedNumberFormatter& number_format,
+-    Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) {
++    Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) {
+   // If it is BigInt, handle it differently.
+   UErrorCode status = U_ZERO_ERROR;
+-  icu::number::FormattedNumber formatted;
+   if (numeric_obj->IsBigInt()) {
+     Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj);
+     Handle<String> big_int_string;
+     ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
+                                      BigInt::ToString(isolate, big_int),
+-                                     Nothing<icu::UnicodeString>());
+-    formatted = number_format.formatDecimal(
++                                     Nothing<bool>());
++    *formatted = number_format.formatDecimal(
+         {big_int_string->ToCString().get(), big_int_string->length()}, status);
+   } else {
+     double number = numeric_obj->Number();
+-    formatted = number_format.formatDouble(number, status);
++    *formatted = number_format.formatDouble(number, status);
+   }
+   if (U_FAILURE(status)) {
+     // This happen because of icu data trimming trim out "unit".
+     // See https://bugs.chromium.org/p/v8/issues/detail?id=8641
+-    THROW_NEW_ERROR_RETURN_VALUE(isolate,
+-                                 NewTypeError(MessageTemplate::kIcuError),
+-                                 Nothing<icu::UnicodeString>());
+-  }
+-  if (fp_iter) {
+-    formatted.getAllFieldPositions(*fp_iter, status);
++    THROW_NEW_ERROR_RETURN_VALUE(
++        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>());
+   }
+-  icu::UnicodeString result = formatted.toString(status);
+-  if (U_FAILURE(status)) {
+-    THROW_NEW_ERROR_RETURN_VALUE(isolate,
+-                                 NewTypeError(MessageTemplate::kIcuError),
+-                                 Nothing<icu::UnicodeString>());
+-  }
+-  return Just(result);
++  return Just(true);
+ }
+ 
+ }  // namespace
+@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric(
+     Handle<Object> numeric_obj) {
+   DCHECK(numeric_obj->IsNumeric());
+ 
+-  Maybe<icu::UnicodeString> maybe_format =
+-      IcuFormatNumber(isolate, number_format, numeric_obj, nullptr);
++  icu::number::FormattedNumber formatted;
++  Maybe<bool> maybe_format =
++      IcuFormatNumber(isolate, number_format, numeric_obj, &formatted);
+   MAYBE_RETURN(maybe_format, Handle<String>());
+-  return Intl::ToString(isolate, maybe_format.FromJust());
++  UErrorCode status = U_ZERO_ERROR;
++  icu::UnicodeString result = formatted.toString(status);
++  if (U_FAILURE(status)) {
++    THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String);
++  }
++  return Intl::ToString(isolate, result);
+ }
+ 
+ namespace {
+@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts(
+ }
+ 
+ namespace {
+-Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
+-                          icu::FieldPositionIterator* fp_iter,
++Maybe<int> ConstructParts(Isolate* isolate,
++                          icu::number::FormattedNumber* formatted,
+                           Handle<JSArray> result, int start_index,
+                           Handle<Object> numeric_obj, bool style_is_unit) {
++  UErrorCode status = U_ZERO_ERROR;
++  icu::UnicodeString formatted_text = formatted->toString(status);
++  if (U_FAILURE(status)) {
++    THROW_NEW_ERROR_RETURN_VALUE(
++        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>());
++  }
+   DCHECK(numeric_obj->IsNumeric());
+-  int32_t length = formatted.length();
++  int32_t length = formatted_text.length();
+   int index = start_index;
+   if (length == 0) return Just(index);
+ 
+@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
+   // other region covers some part of the formatted string. It's possible
+   // there's another field with exactly the same begin and end as this backdrop,
+   // in which case the backdrop's field_id of -1 will give it lower priority.
+-  regions.push_back(NumberFormatSpan(-1, 0, formatted.length()));
++  regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length()));
+ 
+   {
+-    icu::FieldPosition fp;
+-    while (fp_iter->next(fp)) {
+-      regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(),
+-                                         fp.getEndIndex()));
++    icu::ConstrainedFieldPosition cfp;
++    cfp.constrainCategory(UFIELD_CATEGORY_NUMBER);
++    while (formatted->nextPosition(cfp, status)) {
++      regions.push_back(
++          NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit()));
+     }
+   }
+ 
+@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
+     Handle<String> substring;
+     ASSIGN_RETURN_ON_EXCEPTION_VALUE(
+         isolate, substring,
+-        Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos),
++        Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos),
+         Nothing<int>());
+     Intl::AddElement(isolate, result, index, field_type_string, substring);
+     ++index;
+@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts(
+       number_format->icu_number_formatter().raw();
+   CHECK_NOT_NULL(fmt);
+ 
+-  icu::FieldPositionIterator fp_iter;
+-  Maybe<icu::UnicodeString> maybe_format =
+-      IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter);
++  icu::number::FormattedNumber formatted;
++  Maybe<bool> maybe_format =
++      IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted);
+   MAYBE_RETURN(maybe_format, Handle<JSArray>());
+ 
+   Handle<JSArray> result = factory->NewJSArray(0);
+   Maybe<int> maybe_format_to_parts = ConstructParts(
+-      isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj,
++      isolate, &formatted, result, 0, numeric_obj,
+       number_format->style() == JSNumberFormat::Style::UNIT);
+   MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>());
+ 
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
deleted file mode 100644
index 7e5b3e377e4d..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_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="arm"
-fi
-
-IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( 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/qtpositioning-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwebchannel-${PV}[qml]
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/re2:=
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc]
-	media-libs/libwebp:=
-	media-libs/mesa[egl,X(+)]
-	media-libs/opus
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/zlib[minizip]
-	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 )
-	designer? ( ~dev-qt/designer-${PV} )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( >=dev-libs/icu-60.2:= )
-	widgets? (
-		~dev-qt/qtdeclarative-${PV}[widgets]
-		~dev-qt/qtwidgets-${PV}
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=app-arch/gzip-1.7
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	sys-devel/bison
-"
-
-PATCHES+=( "${FILESDIR}/${PN}-5.12.5-icu-65.patch" )
-
-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
-	fi
-
-	# 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
-
-	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.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=(
-		--
-		-opus
-		-printing-and-pdf
-		-webp
-		$(usex alsa '-alsa' '')
-		$(usex bindist '' '-proprietary-codecs')
-		$(usex pulseaudio '-pulseaudio' '')
-		$(usex system-ffmpeg '-ffmpeg' '')
-		$(usex system-icu '-webengine-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
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
index 029e99a265a7..78e614ce1235 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
@@ -78,7 +78,10 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" ) # bug 695446
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" # bug 695446
+	"${FILESDIR}/${PN}-5.14.2-icu67.patch"
+)
 
 src_prepare() {
 	if ! use jumbo-build; then
@@ -91,7 +94,8 @@ src_prepare() {
 		-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
+	find "${S}" -type f -name "*.pr[fio]" | \
+		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
 
 	if use system-icu; then
 		# Sanity check to ensure that bundled copy of ICU is not used.