gentoo resync : 22.04.2018

3 files changed, 233 insertions, 0 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 617d3db584d2..adc3045afc62 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,4 @@
+AUX qtwebengine-5.11.0-update-shim-headers.patch 2030 BLAKE2B 53325012dc516ac1c6dc43bcb0e22e5e59e6f7c808f85b884183922053886816a9b7887211a4e607b39f52ab7f9fd97940e2fb009f72bd918790e76066f8c365 SHA512 88aca795e37ff45fbe35a0cdb4324573005dd4bfad1bfa82220d48e5b4adaff03ebe3897d7813a130b8d8786dd9ba9279c65ec25e0a66a6605e46b8a1834b683
 AUX qtwebengine-5.7.0-fix-system-ffmpeg.patch 953 BLAKE2B 39aa2013ec17b4f347db0224c8c441e6f4dafcd17e89a1718b18a5d17304a1136180d474a826efa30f4febcdb9de6181869bfa69403b093d85fc55f82d98d5bf SHA512 7fe43758f0f20ce1d4952d36773fede8def13c60dc4ac01186ef0d1b79055f02151a89e94c61b6dbe5e0a0560e53e3a27c2f40aaba181704b752b3618b3f3b9f
 AUX qtwebengine-5.7.0-icu58.patch 3126 BLAKE2B 263e6d3411b6dec2cd2f3151a43c062c85f8500771921e23716ae268e8aee66e27d11dc8fe62347accc151a9d7659caf118d7314bc637a49e3bd54d8677e99fc SHA512 573741564c85dfa8df1f8b89f075214067f4892d9cc4280d986709c4438823a82ab1eb752b39fdae4e0321a0ae30479fce2ecacb4d35f197bc3699ee24583d67
 AUX qtwebengine-5.7.0-undef-madv_free.patch 1132 BLAKE2B 26f441b8e06bd059476a640a79db73b789bb387d095f51d0b5a993204a6b76be5926fff45880559fba687c3b5baf8b6a564076d58a0ae720d383acf172fdad67 SHA512 1f581749438b07df03f8123957b31d2749a702c00dae06d5c4ab8bd9a4a3d9f14ee0457f5fa9221e7b1d0dc4eac8965990336140f09787df4e46757165b1e22e
@@ -8,9 +9,11 @@ AUX qtwebengine-5.9.3-paxmark-mksnapshot.patch 997 BLAKE2B e6fd8d6830ee2ca7b4e9c
 AUX qtwebengine-5.9.4-jpeg-9-1.patch 2782 BLAKE2B eb52d5ab51ca47603f3cdf684e0d34bdb0e6441aed99603608866d41fbfaeb812129199d28f7d01763bd9a86cf0a4e9b46199ab1b227d5e0a3add1ad7bc43329 SHA512 85f305333741e88461c792e5ab1e65f3efaa762d60c52f6afd56c6344375e3467b3268c478d51de0340d99ad2ce3ea2aa5fad83364dfeed2d665244dc84c36ab
 AUX qtwebengine-5.9.4-jpeg-9-2.patch 1295 BLAKE2B 93fdcc0a69fa39c85583dcacd3052b87897e4b8df045b81090524e84a90e259d7824521e71639eec5ef8cfd86c5823302846bd1a05dff3fb39d5b988544bf46b SHA512 57551a4859791431d921fc0f514332d408f43c05ead7919468727069e01b9cf3cfe70f5ca014af57b8842f8ba745d1abe5838fa271d354b775a520ef296bd6a5
 AUX qtwebengine-paxmark-mksnapshot.patch 1478 BLAKE2B 99f99e8264c0bd534e5efe0dce1d2bd58662f83e35f3426cf3daba0ea49d28689723c59c14ed2d357102d8eefbc4c7afcce298efa516f82710bcabe930a6e566 SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019
+DIST qtwebengine-everywhere-src-5.11.0-beta4.tar.xz 233777616 BLAKE2B 7d96784f26e7b7d9423c10d9377b2466812140573cdc12a4c6839b4308fdf6f9a525833f94d26aabfbe124e7bdd474705bcfa5d4f4db7f3cd9408a82ba151182 SHA512 f91406ac4a9eccd84a01abd1aa07a12ad61a73f2a8acdbe925687df75016f9c1bdf038e65fa5c962f1f681ba13bf2f1833574611a03cfdca9b6b292511c77294
 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.11.0_beta4.ebuild 3250 BLAKE2B b1fca651f4057173c4a5ce1123abef72b3a1b72cb3d34f1c6ce2b8d6814b08e6652b79b3df9924efa8081e020c7402fc0e712b2af0171fe52d9d97044ca4010a SHA512 5d64e83fba39557cdd2b437e297314a175469c9095e358c435eb710beb876271ca5fb9007239846eeda39e294febac37dc683371091c46cae04b934fa193dad3
 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
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch
new file mode 100644
index 000000000000..e5e3831236fe
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch
@@ -0,0 +1,102 @@
+--- a/src/3tdparty/chromium/third_party/icu/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/icu/BUILD.gn
+@@ -1153,6 +1153,8 @@
+     "measunit.h",
+     "measure.h",
+     "msgfmt.h",
++    "nounit.h",
++    "numberformatter.h",
+     "numfmt.h",
+     "numsys.h",
+     "plurfmt.h",
+@@ -1180,11 +1182,11 @@
+     "tzrule.h",
+     "tztrans.h",
+     "ucal.h",
+-    "ucoleitr.h",
+     "ucol.h",
++    "ucoleitr.h",
+     "ucsdet.h",
+-    "udateintervalformat.h",
+     "udat.h",
++    "udateintervalformat.h",
+     "udatpg.h",
+     "ufieldpositer.h",
+     "uformattable.h",
+@@ -1197,6 +1199,7 @@
+     "upluralrules.h",
+     "uregex.h",
+     "uregion.h",
++    "ureldatefmt.h",
+     "usearch.h",
+     "uspoof.h",
+     "utmscale.h",
+@@ -1216,13 +1219,16 @@
+     "appendable.h",
+     "brkiter.h",
+     "bytestream.h",
+-    "bytestriebuilder.h",
+     "bytestrie.h",
++    "bytestriebuilder.h",
+     "caniter.h",
++    "casemap.h",
++    "char16ptr.h",
+     "chariter.h",
+     "dbbi.h",
+     "docmain.h",
+     "dtintrv.h",
++    "edits.h",
+     "enumset.h",
+     "errorcode.h",
+     "filteredbrk.h",
+@@ -1245,23 +1251,26 @@
+     "rep.h",
+     "resbund.h",
+     "schriter.h",
++    "simpleformatter.h",
+     "std_string.h",
+     "strenum.h",
++    "stringoptions.h",
+     "stringpiece.h",
+     "stringtriebuilder.h",
+     "symtable.h",
+     "ubidi.h",
++    "ubiditransform.h",
+     "ubrk.h",
+     "ucasemap.h",
+     "ucat.h",
+     "uchar.h",
+-    "ucharstriebuilder.h",
+     "ucharstrie.h",
++    "ucharstriebuilder.h",
+     "uchriter.h",
+     "uclean.h",
++    "ucnv.h",
+     "ucnv_cb.h",
+     "ucnv_err.h",
+-    "ucnv.h",
+     "ucnvsel.h",
+     "uconfig.h",
+     "ucurr.h",
+@@ -1280,8 +1289,8 @@
+     "unimatch.h",
+     "uniset.h",
+     "unistr.h",
+-    "unorm2.h",
+     "unorm.h",
++    "unorm2.h",
+     "uobject.h",
+     "urename.h",
+     "urep.h",
+@@ -1294,10 +1303,10 @@
+     "ustring.h",
+     "ustringtrie.h",
+     "utext.h",
++    "utf.h",
+     "utf16.h",
+     "utf32.h",
+     "utf8.h",
+-    "utf.h",
+     "utf_old.h",
+     "utrace.h",
+     "utypes.h",
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_beta4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0_beta4.ebuild
new file mode 100644
index 000000000000..32064b192b08
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.0_beta4.ebuild
@@ -0,0 +1,128 @@
+# 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/libjpeg-turbo:=
+	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/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 )
+"
+
+src_prepare() {
+	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+	use system-icu && has_version ">=dev-libs/icu-59" && \
+		PATCHES+=( "${FILESDIR}/${PN}-5.11.0-update-shim-headers.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 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
+}