gentoo resync : 14.04.2018

2 files changed, 128 insertions, 0 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index be2017945316..617d3db584d2 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -10,6 +10,8 @@ AUX qtwebengine-5.9.4-jpeg-9-2.patch 1295 BLAKE2B 93fdcc0a69fa39c85583dcacd3052b
 AUX qtwebengine-paxmark-mksnapshot.patch 1478 BLAKE2B 99f99e8264c0bd534e5efe0dce1d2bd58662f83e35f3426cf3daba0ea49d28689723c59c14ed2d357102d8eefbc4c7afcce298efa516f82710bcabe930a6e566 SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019
 DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 BLAKE2B 624df9c61b887ed393d8021db4e7bd058544abab3a13341fd0bb76fa3c00cf2692c4e08c2058e1576dfe5c62f9e9bc9ac8a1b5a4a640a204e74ba88516fb4ffd SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a
 DIST qtwebengine-opensource-src-5.9.4.tar.xz 217337248 BLAKE2B 8a8c55dc08b06b07822fd53c780c1b7898516c8a7d021711f4ad5409630a131a90b1916c21d4e83e43dac773c4c73b4a1045baf96ed3c1d39f2d3d4c35c4a8c0 SHA512 c576e81cd9d202a4614c3eedd008bc41bd6212cd4d06e639469b843726be427f9e7a9551b3e604cbfee90f8dde22afb5bcd4905818ca65234e198078971d6ac9
+DIST qtwebengine-opensource-src-5.9.5.tar.xz 216767300 BLAKE2B 9c05c808d18ed27833b48deaab1c0a6d12a7fa17288a522a8aa04c9b06746e9d69ba06467297369353979844e94efad354a124e28dae94d3128e853a8218e6d7 SHA512 74aa2a36ba5a56d0870f5269f93b54c036fccabf60d906b5b0f0db38afb8582d8794be4025ecea28e4c5b8c4c9beda345e3c2b2155e77bbedfe688308009de2a
 EBUILD qtwebengine-5.7.1-r2.ebuild 3109 BLAKE2B 5ecfaf15205fb4d3ea2a2a688c1fedf312efcfb44140de281738ae45f16ec38f4a81bf37fd963c6847c94d64b7b013580056feea224d40cfe56dc1a10ca3cf0c SHA512 618c00c7d5edc4d9fcae5b25e61f957ada6555afe53a2e52164eb7cf22c05a6a015041b2ead744624fd8eeb9c35edbd951786337cb2d3ebd4a1747af339bd730
 EBUILD qtwebengine-5.9.4.ebuild 3223 BLAKE2B ef411c3f0e15c72b2592cd04ef8f04b57cedd089c4b83005b575ef4db264dfadccf711f8598309fbabed6c2a141dcd983eca53f3e8506ea7517eb62301b9caec SHA512 8002221d79b292097d23cae4f6423d28ede730564ba09b164f9494ca08b84f46d9cade2247622739f41dfea37939891795ec1b12421a02d53f349de0c9851faf
+EBUILD qtwebengine-5.9.5.ebuild 3195 BLAKE2B 8165a853d4a02ea34babf6ce46f897cec10b7597fcadf1df9c2b0089d8ecde55ba1d482b7d4622870c55cc630148181805e30959bd9c9d6772b955cbd3b7f45c SHA512 ec0540064675ca249271a812b1f632b9f0cc1d0879f8099cf3949bb7413d812d52a18d7a90bf915c8b0f1d0dfe2f11bd41df9f8c44675dda823735deda0e46ab
 MISC metadata.xml 948 BLAKE2B c3f99b9a59aeb8ad3754b0caafdd7132ee60142f41d992b0fecdb3ed0f396ec7903fb68bc2e734e127f4f722c4f0c6c8398f94685925296037684912ace05764 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.5.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.5.ebuild
new file mode 100644
index 000000000000..02106ae49d70
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.5.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 geolocation pax_kernel pulseaudio +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/qtprintsupport-${PV}
+	~dev-qt/qtwebchannel-${PV}[qml]
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/protobuf:=
+	dev-libs/re2:=
+	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
+	net-libs/libsrtp:0=
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-libs/libcap
+	sys-libs/zlib[minizip]
+	virtual/jpeg:0
+	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 )
+	geolocation? ( ~dev-qt/qtpositioning-${PV} )
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( media-video/ffmpeg:0= )
+	system-icu? ( dev-libs/icu:= )
+	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.3-icu-60.1.patch"
+	"${FILESDIR}/${PN}-5.9.4-jpeg-9-1.patch"
+	"${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch"
+)
+
+src_prepare() {
+	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-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 alsa src/core/config/linux.pri
+	qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
+
+	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=(
+		$(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
+
+	# 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
+}