dev-qt/qtwebengine: sync up with the tree

Package-Manager: Portage-2.3.8, Repoman-2.3.3

5 files changed, 0 insertions, 225 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 733cd01c..91c8baa3 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,8 +1,5 @@
 AUX qtwebengine-5.6.0-musl-execinfo.patch 3083 SHA256 a91a0e002ac79559b1ded87044f530408d0ab662c61ccea8aa971a25504fa260 SHA512 3a0c5db26b748b5a2218dbc0a153a4da1806e5752b50d3114e7cb1897101ceb3cc785ff453e906056b7e1ff7498b5735d8db9bebbbf43fa8a489f5fb19042377 WHIRLPOOL a7ddfd98c2e36c21a10408a51ef6a4d5797636e4ba74ed2477a763319c3b9d01ae3b4731dedba3cb72d80c6b0a1956703a472a579c4a1286b285ac15a8db7521
-AUX qtwebengine-5.6.0-musl-mallinfo.patch 1343 SHA256 b3168887df02c15f91d4d827f98adc77b4d8ebaf1eeee6c75308f65a2b465f62 SHA512 631a554e0c2aee47768cea0627b0f918f293df231a70dcf26caa93c87a46d61960dab4dffe42351a3e010810ab0f273fe02710bc4f2c71e9f595c9e5ea109c05 WHIRLPOOL b51c35d6526066a85aca5111d1f77acecb0a3e5ba3f8a743bb5c1639346d428ed48e91e1968bd53636b1be087daa56032571ba640211b2e5997caaa609ff0587
 AUX qtwebengine-5.6.0-musl-off_t.patch 627 SHA256 328d193b7994bd4d80d1cad08e24fa5c44405e374a23570c5f217a078e6b59d1 SHA512 82dd29bdf97a8ed18773cc503b0426e4ca57129adb04a34ce3eb069862df7b838e75941600cc5c4f69456d1f04a8ccca81533a05762e9cd16c84d0c941ee89a6 WHIRLPOOL 9475f2276ab2ad4d4d09924254ef27b490993af1f63cdc01e3cdce48f76876d0a37fe8cce7694c2e0aff8f07cf9fa9ea886fa3f79a926ddffb4040ffecb1d431
-AUX qtwebengine-5.6.0-musl-resolver.patch 2575 SHA256 7a1f86eebf8f0c949a051a3569ff27e344bbafe515b6fc4965bdbf63e978b263 SHA512 752af1be984255c9124ca71f180939c77a10fc461a1d2c78d185e4b94e72daffd7046f02fd78086ef1b33db17c9bc978b5fb1db6753a6853450b7b3d77c63562 WHIRLPOOL c85ef6e5e45566114a7caa1ef05d4fb21d173a3b5939db1234b3bbf36ab89beb4f753830a5d414916574500742157b3094ecf5b2e92bb1e8a103df11ae144a64
-AUX qtwebengine-5.6.0-musl-sandbox.patch 843 SHA256 632177e9e36713ef528165229b363f5ed9495c6c64effd42c799a9d4d1811040 SHA512 c8ee9ae67394d971f82f33cc6cbeba85598ad079caf014d7bba268283084fb0022bb0a4f2d254a6ba13478ad2cc4181d540ed696017ad19402de7bfdd3baafe8 WHIRLPOOL ec9b327f55c9c17e6f969515ddcdbe1d3e817303d775dcfc21b5687b355806237c311f46ac65173d99f7d65cc3f9c7f2f2cb84c654f157bcac100725e50947d4
 AUX qtwebengine-5.6.0-musl-siginfo.patch 666 SHA256 42c3119595738e1e4757bee83d9774982d6265f14cb216dcd5100319339ba8c6 SHA512 2fead16e7d7379b622da0e3172905444d9d72d1a53ff080327a3d59f60541c5c076d9b58f110b039da8c9ebc3b5efec53af118e1172efd01886ff9ac2b730d5f WHIRLPOOL 52bb6af4faec65b6d50a810266a814ddcc996eca0a69668fca320d9e1c998ce11f7479de301f3f3957baba0e8d8e799d4b8c60810c37db2419f8e911066075bd
 AUX qtwebengine-5.6.0-musl-stack.patch 1469 SHA256 b2a66152c5f2c72aed97bd0358ee888d410a17c6048cfebc3a6867294e94c291 SHA512 50fd27962fdd2193b45ec334462535008d565a681bd6171d9c8e986e246ec42025e54eecdd8b8cbdaa118d4f6b0d88b73ad6add7c4d59cffc55899264c5b1bfd WHIRLPOOL 604f319f5229f02271e3f12166f5c50d8c2c25d78aebb93917ab333ce15adeded4cbd061afc0af0c1ea9c8bdf3411400c37a15827a31d29420f1787cfe49b97d
 AUX qtwebengine-5.6.0-musl-sysctl.patch 692 SHA256 a66b527eb717a5ad662c8c088540341a206c3c208c7f2fe5a20b71a17f7aacd4 SHA512 22b2380fdb1bec46c8f38d98d55c7fb72dca85859c6ae822f4b7aa441ea996dee12e11653c6f156575a1779437690d64b6101052ef12716e2dfbe046d0962b9a WHIRLPOOL d63e725ed25ffd8a219d97d1790ecf8bf44417c224ace98a5af743b84314914f50e8208fa5358fe31818fe865b01cb55e8841d879438a29bed30ff099b6e0e90
@@ -15,8 +12,6 @@ AUX qtwebengine-5.7.0-musl-sandbox.patch 3185 SHA256 b4e616a6159a237e4ee0455e45e
 AUX qtwebengine-5.7.1-fix-audio-detection.patch 802 SHA256 3cc298a3fdeecf4a339bad39ac9bc63201c02b87fceb32e4c06e3004a6197103 SHA512 d461dc066eda63d9cc7131852d12f2a0ed0abdaf849f9d7ec0e1da20098e031877c07ae37ebd3ba47af1ef1d7cf4d909ef594bcb4682f9e4f69d7deeaeb01f2c WHIRLPOOL 41dd2c3b574939d2a3b25f1758502cb473dd29f3046360c4ff38098246c959f95d6628ab832b318874d7cbe3a088ca119e2c03cd1dd04009fab75ec3bb1f51c0
 AUX qtwebengine-5.7.1-gcc-7.patch 5612 SHA256 2afa904ea3c349e4721073a4d8325a4be69ddbf39ae18a7d4456abe09920f36f SHA512 a2824a8ea4b2499fb6f5b583349c3b3428a3a99e5f534d624e00c7820f7a70c824ffc90fc9abd0f981fd707e5361b1d466de1094f65d5c1c8d62db9dc118be0a WHIRLPOOL 015dadbcfad837710a674ebf0fd6014878f27206262c4c61fe9c054a830555e771d5e7414bc5486b1de6409bec23a4f8f4ad6b29dd4c9e8a3acfd4d6e1d3500e
 AUX qtwebengine-paxmark-mksnapshot.patch 1478 SHA256 540ab83071df14d5fc6881dcf6fc28a2daaa46584e9b0c3ad45b584c612f16af SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019 WHIRLPOOL d70127c7ef2e2262557b62aa0fd8709c90aed5e0143e43c8c53dd817378dd7accefe2dccdc9b90a740fa3d49f40a3438a4a1438f51995da86bdfba816aa319bb
-DIST qtwebengine-opensource-src-5.6.2.tar.xz 143752452 SHA256 2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740 SHA512 c30a270bfb254a18d4b89af8ae28789912d6157cd58010b6838461c332c32c667c15b683d290fd14615b9f0be20aca9957bd8657c4abaa8d77c28278c58f7282 WHIRLPOOL 94e627c369cfa18a7c878f75007698839aa1cd1b10df4de8e42b2f393dcd2dedec33930c1fa41c50bfa39e63089d66c7c5d0861ea7093356b1cc2e93a605893e
 DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 SHA256 2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a WHIRLPOOL cebf17fc3e5c75406789c36e12dd32b0b6e6111dad6bf8f48bb07fd5d8ea76d78cd2cc5c3ad3021c8de9b91974afd7688ea384626d7e308dedd67664f1eec104
-EBUILD qtwebengine-5.6.2-r1.ebuild 2771 SHA256 cb31b7f0d2c16ecbc5071966b8816e778b0cbc0a05bc5a51e1cae94f34ea9898 SHA512 79bb304b684773e396f8466abcbe8f25b6a88ebb21ea6228e6c2bfb36ee742e2ade592951904277aac64aace45194b82096593405d5876cf98853f49fed03240 WHIRLPOOL 4090f2720258577264fe5d8122c40f522cd52cd4a0124d1bca64d3ba47d614d8a94eb1ae52e2f6d2b39e8be00a7302d8cc3478a154f2fcc8c51c50f510f2dd50
 EBUILD qtwebengine-5.7.1-r2.ebuild 3489 SHA256 476ee0af565e67830c0648e44fb94c46dfb6031e4d408b183968237097947c7f SHA512 ef2ba3bd658ab30dc37316fe674f08640f4f6131bec3aba3dfd6f89cb3b2d0257b9a2dc7f94630934dc937ef66d453baa9bdb5ba857cbb070abf663f90a6ec2f WHIRLPOOL d5858458636ea08f6d696a25ecc317279597213e45b8ea32c4b97259dcee2397e42742e04433e9fafc92f66f52d99e057d14aed7dbf2f56ffb58b6d6a1b7cf55
 MISC metadata.xml 948 SHA256 4890ca8aaf167f11623fa965dfc11f031ea777a16ce92282caa9e83a2c2f1fa4 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85 WHIRLPOOL 73f94a6f3ffc150b65a7fd3f68aaf82a536e25eeb3fde1be7f28fe601fea6674fe9b394bcd2136897fcb9cdca265280d4d085b86387714c7bd9daabde3f21e19
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-mallinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-mallinfo.patch
deleted file mode 100644
index 170064b4..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-mallinfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-In musl libc there is no struct mallinfo and no function mallinf()
-
---- qtwebengine/src/3rdparty/chromium/content/child/content_child_helpers.cc	2015-06-05 04:52:18.502230985 +0200
-+++ qtwebengine/src/3rdparty/chromium/content/child/content_child_helpers.cc	2015-06-05 04:52:06.712231020 +0200
-@@ -15,7 +15,7 @@
-
- namespace content {
-
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID)
- size_t GetMemoryUsageKB() {
-   struct mallinfo minfo = mallinfo();
-   uint64_t mem_usage =
---- qtwebengine/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc	2016-03-03 15:48:36.000000000 +0100
-+++ qtwebengine/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc	2016-03-17 05:09:41.409425897 +0100
-@@ -29,6 +29,7 @@
- // Called at trace dump point time. Creates a snapshot the memory counters for
- // the current process.
- bool MallocDumpProvider::OnMemoryDump(ProcessMemoryDump* pmd) {
-+#if defined(__GLIBC__)
-   struct mallinfo info = mallinfo();
-   DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
- 
-@@ -46,7 +47,7 @@
-   MemoryAllocatorDump* inner_dump = pmd->CreateAllocatorDump(kAllocatedObjects);
-   inner_dump->AddScalar(MemoryAllocatorDump::kNameSize,
-                         MemoryAllocatorDump::kUnitsBytes, info.uordblks);
--
-+#endif
-   return true;
- }
- 
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-resolver.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-resolver.patch
deleted file mode 100644
index 8e171bbf..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-resolver.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/base/dns_reloader.cc qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/base/dns_reloader.cc
---- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/base/dns_reloader.cc	2016-07-28 17:16:00.113559841 -0700
-+++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/base/dns_reloader.cc	2016-07-28 17:41:45.640212588 -0700
-@@ -8,6 +8,9 @@
-     !defined(OS_ANDROID)
- 
- #include <resolv.h>
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+#include "net/dns/resolv_compat.h"
-+#endif
- 
- #include "base/basictypes.h"
- #include "base/lazy_instance.h"
-diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
---- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc	2016-07-28 17:16:00.187560625 -0700
-+++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc	2016-07-28 17:41:45.640212588 -0700
-@@ -25,6 +25,10 @@
- #include "net/dns/notify_watcher_mac.h"
- #include "net/dns/serial_worker.h"
- 
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+#include "net/dns/resolv_compat.h"
-+#endif
-+
- #if defined(OS_MACOSX) && !defined(OS_IOS)
- #include "net/dns/dns_config_watcher_mac.h"
- #endif
-diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/dns/resolv_compat.h qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/dns/resolv_compat.h
---- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/dns/resolv_compat.h	1969-12-31 16:00:00.000000000 -0800
-+++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/dns/resolv_compat.h	2016-07-28 17:43:07.714089231 -0700
-@@ -0,0 +1,29 @@
-+#if !defined(__GLIBC__)
-+/***************************************************************************
-+ * resolv_compat.h
-+ *
-+ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc
-+ * Note: res_init() is actually deprecated according to
-+ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html
-+ **************************************************************************/
-+#include <string.h>
-+
-+static inline int res_ninit(res_state statp)
-+{
-+	int rc = res_init();
-+	if (statp != &_res) {
-+		memcpy(statp, &_res, sizeof(*statp));
-+	}
-+	return rc;
-+}
-+
-+static inline int res_nclose(res_state statp)
-+{
-+	if (!statp)
-+		return -1;
-+	if (statp != &_res) {
-+		memset(statp, 0, sizeof(*statp));
-+	}
-+	return 0;
-+}
-+#endif
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sandbox.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sandbox.patch
deleted file mode 100644
index 1de8a2da..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sandbox.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
---- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h	2016-07-28 17:15:59.433552637 -0700
-+++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h	2016-07-28 17:17:39.275610371 -0700
-@@ -5,7 +5,7 @@
- #ifndef SANDBOX_LINUX_BPF_DSL_SECCOMP_MACROS_H_
- #define SANDBOX_LINUX_BPF_DSL_SECCOMP_MACROS_H_
- 
--#include <sys/cdefs.h>
-+#include <sys/types.h>
- // Old Bionic versions do not have sys/user.h.  The if can be removed once we no
- // longer need to support these old Bionic versions.
- // All x86_64 builds use a new enough bionic to have sys/user.h.
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild
deleted file mode 100644
index 3a1a505b..00000000
--- a/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit 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 x86"
-fi
-
-IUSE="bindist geolocation pax_kernel +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/jsoncpp:=
-	dev-libs/libevent:=
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/alsa-lib
-	media-libs/flac
-	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
-	media-libs/speex
-	net-libs/libsrtp:0=
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/libcap
-	sys-libs/zlib[minizip]
-	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
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( dev-libs/icu:= )
-	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.6.0-musl-execinfo.patch"
-	"${FILESDIR}/${PN}-5.6.0-musl-mallinfo.patch"
-	"${FILESDIR}/${PN}-5.6.0-musl-off_t.patch"
-	"${FILESDIR}/${PN}-5.6.0-musl-resolver.patch"
-	"${FILESDIR}/${PN}-5.6.0-musl-sandbox.patch"
-	"${FILESDIR}/${PN}-5.6.0-musl-siginfo.patch"
-	"${FILESDIR}/${PN}-5.6.0-musl-stack.patch"
-	"${FILESDIR}/${PN}-5.6.0-musl-sysctl.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
-
-	local myqmakeargs=(
-		$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
-		$(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
-
-	pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
-}