gentoo resync : 05.02.2020

4 files changed, 5 insertions, 142 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 11cedb1f9aa5..67c9e3f4df8f 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,11 +3,9 @@ AUX qtwebengine-5.12.0-nouveau-disable-gpu.patch 3740 BLAKE2B fc2745ba0e3ac264d2
 AUX qtwebengine-5.12.5-icu-65.patch 1394 BLAKE2B 223e449a1086c2f062e34752278ba83a828283aa577b92aa3ba28343fb06e18ed6b94990e46729076b099674e2a0936f08958aa72ac3b44f4cc7dd1602b13cfa SHA512 2b530a6a60e1ca71aba7c7d86f7e831799e8bec20ab6c97d79e753d337767c9f44938f19c00714706f2720bb4b0a3599a44046a69ed42372b21bac452b713b68
 AUX qtwebengine-5.12.5-pulseaudio-13.patch 5034 BLAKE2B 12bce7933a58472dfad4581fa8e949d3326c32f307af73bcac054a94759cd5163d97c5ceb326ea1924d086022b9d316d45a4fbed81483eddcfe1c7ba91d708f3 SHA512 7160583ba150812d6e860550a0b7b9f53ae157679025e41aca6e1b0e5186549ecd49d70724ef84ff9d58abf65b598df44f3c54a456ffb1698d96159db2778811
 DIST qtwebengine-everywhere-src-5.12.3.tar.xz 249275648 BLAKE2B 7d2404084a510c62b638dd09736130eeb40e494f9594339afc7df6628878aafed778a2785f6848702d51b3a4ef1dc8b333d5e5eeeeb8f930b4da839eb70bc175 SHA512 5b500ec6653aa6ed70e7826fe394f95c7932eaea5b1b48f6342a6f18294f75e4f954959fa2f42de0685097679389245d2bc80454e8eea202fa18a326d6d5a9a5
-DIST qtwebengine-everywhere-src-5.12.5.tar.xz 249295448 BLAKE2B 3bbb9ea44ed58127a251b0dc5bd2681b9efbe4709b0c493940c85cedcbf668fe58ae2440c4afbb1e579cd69e504aa7efedd44519823ffed40444d8b3382362e8 SHA512 b485d37dca14f1cf4adf01bd8b1ae52c1d4916d7acf6ed210bc9feaece8efc2aa6cee8a3ef9174b50b767e373379c6a18d14db4426ac53a8c27d2d7b222826df
 DIST qtwebengine-everywhere-src-5.13.2.tar.xz 255593964 BLAKE2B 458f718183aa53376e1aeeb6306b0b3960bd001aebf61e9650d30afd408af003183b7748a87aa0c6a1aa0b3a4be548b417609146b71dc6afa46db49c4b48919f SHA512 10ae5cca36230069ef117cae15b84e29124c43e4864dbfa7a1f99879764b871355281edcb1942e86ec3a4cac12bbfd2749577745c8c7e736eb6a9909876554d0
-DIST qtwebengine-everywhere-src-5.14.0.tar.xz 241565016 BLAKE2B 6d04ae911aa0e2e64567b2b89d3e51b61adbd2455e172b63beec53102da6f91ff79e57f20b80fbffc5e269454db879ae196f0d6b1af4222e5f786218b8c6a4d7 SHA512 323e26a90258532500c0c5a58a46a4fa0177dd642640aa7da1873a1726c6b460f893af49aa3f3b9d84beaf48d8ed90d7c6f9092a2b24ff542f7d7d0eb2a6f574
-EBUILD qtwebengine-5.12.3.ebuild 3652 BLAKE2B 4d5fe507eea0bc15ecb4bf6041e9f48aa187c429924cab0e031d1ceeee13fb5dc8aa1aff0021bda2eed165c1e6cf0ae36f25f585eb776d0ab15c66f297a74b5c SHA512 b0310db4c34d2db2cec043421396fd5dc3853583221f306525132d12b791eb433d796636195b5ba336add5de6a42d3c310844bbaf805b08179b5e6ff391b94eb
-EBUILD qtwebengine-5.12.5.ebuild 3393 BLAKE2B 7b9386553c0aea4160b37ec5091e92fd0de2b85087c0d679cca4956ccca0761773fe2f7e946901b2fe17a7b2635e89fd5590e2ac93eabe1f98582fcf83e28cb4 SHA512 e279184031f2edff1ba9d8c4d112f48f9d83a879289ba609edf10aed9b8a0192c80a11bc72c029a1d156018c2d43af3e8d96196852854a1c6e1f117c4caedae9
+DIST qtwebengine-everywhere-src-5.14.1.tar.xz 242438244 BLAKE2B d24210b2e04522b27409cc5ccfe722114f711c1c5e9aaff76882c178b0c455b475b90fd2acd5f7ba4f5dfba85c228c4baf2c231d3661eadf83e984d7e7b9e30f SHA512 fafa2fbc789941e837e35945857a6da00e73bd2abe512290674b9957719b998d8b8b95a35c709a171c9d0d111e6f418cec630dfcdbe47ecbae25a3b94e4c99f9
+EBUILD qtwebengine-5.12.3.ebuild 3640 BLAKE2B 475a098f209fee144ad01041e34380b731f4b53b8adef546e32ada8856faab12bb0ad1488f2142e8918ce40e692c03ab5103050069fe37b994c41501cae08e21 SHA512 991b4dd5ec9713d5b4fca2a6a7d068bc7dded5e135e6a7211e7765d81baa24987959b08bd41d1cfe11e82428a133ccb766c3fa375189e4e9e117879c3fc785d5
 EBUILD qtwebengine-5.13.2.ebuild 3280 BLAKE2B 4ecfdaec53a6cb6677b0d85a08f076d1c6ac95d032602561b677722b3d7a4bc92364fe3d6185361a01b88a85edc2f91ed679ea97df6dd9b2e1b04e22341e8e20 SHA512 bd7fcdfb2869de701a7970555ad0ffc5df51ce40c52acde7922a9aee787633ee9f0c0489d516b5a5f9336f33f53076034248a812e979a9f7187aead325b9f693
-EBUILD qtwebengine-5.14.0.ebuild 3246 BLAKE2B 6ded624bb2194dfedb9a5e3fbd773fc3bc30a2cd986d2a24bb523ccc63038ff9c72109bc889314ef22944984885de4d3643c14f8717e6e32e091d2762371d327 SHA512 9701078c5f2a44c0c488eebb3fb18fdfc4fb2157dea46de05c1af93791c4d6f45a178f35f078e4ddf6ffd30517c766bce303cc59e6b8863b15d9a37dec03a4d7
+EBUILD qtwebengine-5.14.1.ebuild 3246 BLAKE2B 3c27add6e8ec42de2a73b7bce7219a9ba4823505fbb719b4e34f52ff9f756457eaa3108e704b4b11ed39d8f34b2dc5bb2f4a4191fc91ff7f47e8236d4b5aec45 SHA512 d08064aa4e706c264117e26775a3de06edb832f7b80e029e51ebcafa70eddc0faba8b3f8b7abea44828605a4de436dccc57d630782f4fe56795d6f57580c2574
 MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index f79b87843158..fbd7648f6f0a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -8,7 +8,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"
+	KEYWORDS="arm x86"
 fi
 
 IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
deleted file mode 100644
index f1ee561f3441..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 jumbo-build 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/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
-	pax_kernel? ( sys-apps/elfix )
-"
-
-PATCHES+=(
-	"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
-	"${FILESDIR}/${P}-pulseaudio-13.patch" # bug 694960
-	"${FILESDIR}/${P}-icu-65.patch"
-)
-
-src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
-
-	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
-
-	pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
index 13940d0b4d14..db4d9855990d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7