gentoo resync : 16.02.1018

7 files changed, 2 insertions, 330 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 132dc4b05602..d535debf4502 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,12 +1,6 @@
-AUX qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch 2517 BLAKE2B 8339355528656eee5a86866017173aac5036db853c92679d83fa8036561af49cd980022099912c58a7384cd9f3b95e26b8adeb22683fc7848d20cb4e4352f616 SHA512 f6fc127d80e9db6cbe971bcdfb3ddf7ec44c083b9f30fb415ec4e04cb263b3d3087e7dfbf984ad33782ae0ea769e4038acb3f2777a2f164d9d81bb9ac319ffc9
-AUX qtwebengine-5.11.1-ffmpeg4.patch 1261 BLAKE2B 1c076c83921f223b6001d2bd71039637ffe7cab8c2f88c3ba6aa78a4ec6f8cbfc6fcdba6a89e8c8cb2d6e8f38dc06bcd28e9012931632d7af2d0157bdaaa1579 SHA512 64c64db96b1270d157c08fe572cde7e559700ced28b5b350a46ce1f1f0007a871f165547ef8a2d26b2269bd592b92c3aa2655618917c4f3c2d4f02165eef2c91
-AUX qtwebengine-5.11.1-libxml2-disable-catalogs.patch 1609 BLAKE2B c3683d221556c6051874c7a7d9d36caaebd86a9689682a19ea8f16df68ff9403a5d182a33ae5bc9b5efbb485bbdd335e81757642f1a71f562fb3ae2533af5d67 SHA512 284fbee4559a38a64e7426be272f4d4362613d8a55c6aef2123c12ddfef3f5c2cfb534bd11ba4c698b6c2bf29bc58fb4c6a06eef7bdf7e766d99673c2434dcf5
 AUX qtwebengine-5.11.1-nouveau-disable-gpu.patch 3710 BLAKE2B 880d63b7552973cf91bb1411f92ab3ee2d88013f144bdfcc6b5e1eec1d886bf76ab2166bc7600212701031da63a69ed2f5e03a4bc15549834a9a770ed68f35ef SHA512 a0b9592201d950ae97b92d5d0161ccc5bc675a37fbf657fe15ea0fe12870a370cf3ce54f5f033c073af23defded5c4ad0b43993c5b559024b285c5341b4673a0
-AUX qtwebengine-5.11.1-paxmark-mksnapshot.patch 1007 BLAKE2B 3f7acf876b78caa945a72a797c08da9b24cb7e6363a904734265872c382789d5aec8e67e0ece7b0e50b6e7ccd9dc15f1e8aa7936736bed3ce14897c706d07938 SHA512 9a89eda73c08279d9bd6e871d138e670f8d6fb2e9efb191effe2c9063cf4eb007c6fbbd907005ebcc57f576a8faa5cb8a5ce996b9692aa226703765ddd939c06
 AUX qtwebengine-5.11.2-paxmark-mksnapshot.patch 888 BLAKE2B d44e8772dafd8962805abe412470d94ced2d11e47d3e7e25acbfafa54669677a1e072b435a06ed093f7c9ce27d8d98fab4b042cd49862350d77c944418a335b9 SHA512 893aef4801d1f2a3fad1f4d1ef2c2b122d4004b7966e76d8e1adeb8cc5b03ce8b0ddf30d20690ca6e0b15b76074aa386b46b00d0c828b7684c6fcacc33b2865f
 AUX qtwebengine-5.9.6-gcc8.patch 1184 BLAKE2B aea72fb7563517f6c1f0f1330bad21ae71bbadc7b74e13b5c9280074ba5ae642be1df6c6e3014464f4b9aa26dd5620b5c5ef5b7139256c6a48fe58ed911e54e0 SHA512 21e79c6fc1575728d658c31bc68da66a5b9840c6fee7c442218ec8ac6009d5df1436bea931aa56439965987ec1ccdac32afce2b0a246c3d7bb2d0b0536717be5
-DIST qtwebengine-everywhere-src-5.11.1.tar.xz 233633572 BLAKE2B 06fb9d490377ebb4af937e0fa1688cdfeb9bfdadf6c80afeef609d20a76bdb7c4fed6c1042405b762e59b11d7b16369990c66a395ec1b6b48bbb1ea5b8cd47f2 SHA512 3e17f88b690c06f6d28c30d8d43588eaad9b0b214434b219c3d8fe11969cca515a68c731d176cf640940fd3db12e95de8f723d3717555504c5b95d135fa4a596
 DIST qtwebengine-everywhere-src-5.11.3.tar.xz 233678844 BLAKE2B 451a2f8361b158835f7f565aea9e7e372ea5670f56a5eef918d0340857e1b336d7147c5f87417a21ea225c248cfda8248869c2023b2e359aa9216ec472dea4b9 SHA512 323179244187b075836101eec15fc96569e31dee7ca0b28d51833cf02a55439ca0ab8e3e14acf970eb0258e1f5187b6b33fc1a35bf9056e4941a2b20be9b0431
-EBUILD qtwebengine-5.11.1.ebuild 3535 BLAKE2B e806536baec3071808ff3c0a7f5f0d7f287b1c4489bd51f76fdc5d3eb5951c047199660c5daddec7f75dee50f1d7fdfbe2e6e6859d89979e1b28c8bdb79ad686 SHA512 9fb74dedea97963bd8363c6861e92395c0a4d9152dfe1ef26f8df7ad9e55ae4c6f60858c52fc6a9df90a3c96460230fbda099fd22dbb6c2eef7899963e7c1daa
-EBUILD qtwebengine-5.11.3.ebuild 3544 BLAKE2B 382c76fc2a7b2f43be68049375e4fd5683033991396469450a2863fa83bd7622645cd68fbfbe014dd06d68898936867d71321899afabfee713303e098ec41e8d SHA512 9b8b726e68eb159c1d9a460595a9234d0c172a6e3d0fcd8421edb9c8f1b57ebff310a07d6ba05dc3d3e039994daf57190de07e13c427d8ba22d7fd665aaaf618
+EBUILD qtwebengine-5.11.3.ebuild 3568 BLAKE2B b28e34024ea8fdddf8cff922ff4c653f0f4839c8e2248edb2e6982319429f5dda4e77feddbd4a15122ba6fe976821087930bf3e1792c6aa31217096a2b06eac9 SHA512 aa530bbaf18ad6f3430b4f3fecb28d49c640b5846ec372242acfe213bf8604267fafb1debf1f7e6cbf19ee32d686a100c3ee420038a1f542d929a99e182318db
 MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch
deleted file mode 100644
index 4b2676faa6a0..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a66d4cd82972996d76edff52d17464c150dec6a6 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Mon, 11 Jun 2018 16:16:55 +0300
-Subject: Add fallback lookup for eglGetProcAddress
-
-Use the GLContext to find address for eglGetProcAddress symbol, if it's
-not found with dlopen.
-
-Change-Id: I3f5330c21ecc9b66e5e376d50d3fc6965b227f85
-Reviewed-by: Michal Klocek <michal.klocek@qt.io>
----
- src/core/gl_context_qt.cpp | 11 +++++++++++
- src/core/gl_context_qt.h   |  1 +
- src/core/gl_surface_qt.cpp |  4 ++++
- 3 files changed, 16 insertions(+)
-
-diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp
-index 9ed1db8b..95491709 100644
---- a/src/core/gl_context_qt.cpp
-+++ b/src/core/gl_context_qt.cpp
-@@ -155,6 +155,17 @@ QFunctionPointer GLContextHelper::getGlXGetProcAddress()
-     return get_proc_address;
- }
- 
-+QFunctionPointer GLContextHelper::getEglGetProcAddress()
-+{
-+     QFunctionPointer get_proc_address = nullptr;
-+#ifndef QT_NO_OPENGL
-+    if (QOpenGLContext *context = qt_gl_global_share_context()) {
-+        get_proc_address = context->getProcAddress("eglGetProcAddress");
-+    }
-+#endif
-+    return get_proc_address;
-+}
-+
- QT_END_NAMESPACE
- 
- #if defined(USE_OZONE) || defined(OS_WIN)
-diff --git a/src/core/gl_context_qt.h b/src/core/gl_context_qt.h
-index 8ffdad58..cecceabc 100644
---- a/src/core/gl_context_qt.h
-+++ b/src/core/gl_context_qt.h
-@@ -63,6 +63,7 @@ public:
-     static void* getXDisplay();
-     static void* getNativeDisplay();
-     static QFunctionPointer getGlXGetProcAddress();
-+    static QFunctionPointer getEglGetProcAddress();
- private:
-     Q_INVOKABLE bool initializeContextOnBrowserThread(gl::GLContext* context, gl::GLSurface* surface, gl::GLContextAttribs attribs);
- 
-diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
-index 7e579246..4d38d7c2 100644
---- a/src/core/gl_surface_qt.cpp
-+++ b/src/core/gl_surface_qt.cpp
-@@ -227,6 +227,10 @@ bool InitializeStaticGLBindings(GLImplementation implementation) {
-               base::GetFunctionPointerFromNativeLibrary(library,
-                                                         "eglGetProcAddress"));
-       if (!get_proc_address) {
-+          QFunctionPointer address = GLContextHelper::getEglGetProcAddress();
-+          get_proc_address = reinterpret_cast<gl::GLGetProcAddressProc>(address);
-+      }
-+      if (!get_proc_address) {
-         LOG(ERROR) << "eglGetProcAddress not found.";
-         base::UnloadNativeLibrary(library);
-         return false;
--- 
-cgit v1.1-6-g87c4
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch
deleted file mode 100644
index e9ef452a8d95..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a568ded46a678eac8139cb06595819c5ae874177 Mon Sep 17 00:00:00 2001
-From: Xiaohan Wang <xhwang@chromium.org>
-Date: Mon, 29 Jan 2018 21:28:28 +0000
-Subject: [PATCH] media: Increase DecoderBuffer::kPaddingSize to 64
-
-AV_INPUT_BUFFER_PADDING_SIZE has been increased to 64 in FFmpeg:
-https://github.com/FFmpeg/FFmpeg/commit/6e80079a2840ee407c5d126030eb1066bcbfdfc5
-
-BUG=777484
-
-Change-Id: I1bd68d1c1b0c3131f28d6e07e1444b89800c09db
-Reviewed-on: https://chromium-review.googlesource.com/889686
-Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
-Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#532593}
----
- src/3rdparty/chromium/media/base/decoder_buffer.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/chromium/media/base/decoder_buffer.h b/src/3rdparty/chromium/media/base/decoder_buffer.h
-index 0341e5784f725..60ffba708b0e5 100644
---- a/src/3rdparty/chromium/media/base/decoder_buffer.h
-+++ b/src/3rdparty/chromium/media/base/decoder_buffer.h
-@@ -37,7 +37,7 @@ class MEDIA_EXPORT DecoderBuffer
-     : public base::RefCountedThreadSafe<DecoderBuffer> {
-  public:
-   enum {
--    kPaddingSize = 32,
-+    kPaddingSize = 64,
- #if defined(ARCH_CPU_ARM_FAMILY)
-     kAlignmentSize = 16
- #else
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
deleted file mode 100644
index 8ac5b90b72c8..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/config.tests/xml2/xml2.cpp
-+++ b/config.tests/xml2/xml2.cpp
-@@ -27,9 +27,6 @@
- ****************************************************************************/
- 
- #include <libxml/xmlversion.h>
--#if defined(LIBXML_CATALOG_ENABLED)
--#error "libxml catalog enabled"
--#endif
- #if !defined(LIBXML_ICU_ENABLED)
- #error "libxml icu not enabled"
- #endif
---- a/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
-@@ -28,6 +28,10 @@
- 
- #include <libxml/parser.h>
- #include <libxml/parserInternals.h>
-+#include <libxml/xmlversion.h>
-+#if defined(LIBXML_CATALOG_ENABLED)
-+#include <libxml/catalog.h>
-+#endif
- #include <libxslt/xslt.h>
- #include <memory>
- #include "core/css/StyleEngine.h"
-@@ -538,10 +542,6 @@
- static bool ShouldAllowExternalLoad(const KURL& url) {
-   String url_string = url.GetString();
- 
--  // libxml should not be configured with catalogs enabled, so it
--  // should not be asking to load default catalogs.
--  CHECK(!IsLibxmlDefaultCatalogFile(url));
--
-   // The most common DTD. There isn't much point in hammering www.w3c.org by
-   // requesting this URL for every XHTML document.
-   if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml"))
-@@ -646,6 +646,9 @@
-   if (did_init)
-     return;
- 
-+#if defined(LIBXML_CATALOG_ENABLED)
-+  xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
-+#endif
-   xmlInitParser();
-   xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc);
-   xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch
deleted file mode 100644
index 352deefb22ac..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Bug: https://bugs.gentoo.org/634220
-
---- a/src/3rdparty/chromium/v8/BUILD.gn
-+++ b/src/3rdparty/chromium/v8/BUILD.gn
-@@ -661,6 +661,7 @@ action("run_mksnapshot") {
- 
-     deps = [
-       ":mksnapshot($v8_snapshot_toolchain)",
-+      ":run_paxmark",
-     ]
- 
-     script = "tools/run.py"
-@@ -706,6 +707,28 @@ action("run_mksnapshot") {
-     args += [ rebase_path(v8_embed_script, root_build_dir) ]
-   }
- }
-+action("run_paxmark") {
-+  visibility = [ ":*" ]  # Only targets in this file can depend on this.
-+
-+  deps = [
-+    ":mksnapshot($v8_snapshot_toolchain)",
-+  ]
-+
-+  script = "/usr/sbin/pypaxctl"
-+
-+  sources = []
-+
-+  outputs = [
-+     "$target_out_dir/mksnapshot",
-+  ]
-+
-+  args = [
-+    "-sm",
-+    "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
-+                                      "root_out_dir") + "/mksnapshot",
-+                       root_build_dir),
-+  ]
-+}
- 
- action("run_mkpeephole") {
-   visibility = [ ":*" ]  # Only targets in this file can depend on this.
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
deleted file mode 100644
index 72de09bfac98..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 designer geolocation pax_kernel 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/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/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc]
-	media-libs/libwebp:=
-	media-libs/mesa[egl]
-	media-libs/opus
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/libcap
-	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} )
-	geolocation? ( ~dev-qt/qtpositioning-${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
-	pax_kernel? ( sys-apps/elfix )
-"
-
-PATCHES+=(
-	"${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
-	"${FILESDIR}/${P}-libxml2-disable-catalogs.patch" # bug 653078
-	"${FILESDIR}/${P}-ffmpeg4.patch"
-	"${FILESDIR}/${P}-eglGetProcAddress-fallback-lookup.patch" # 5.11 branch
-	"${FILESDIR}/${P}-nouveau-disable-gpu.patch" # bug 609752
-)
-
-src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${P}-paxmark-mksnapshot.patch" )
-
-	# 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 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
-}
-
-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
-
-	pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
index d61f504ee127..9b56288c1289 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	>=media-libs/libvpx-1.5:=[svc]
+	<media-libs/libvpx-1.8
 	media-libs/libwebp:=
 	media-libs/mesa[egl]
 	media-libs/opus