gentoo resync : 15.12.2017

4 files changed, 5 insertions, 167 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 1650ed5362fb..252a7fa2a0af 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,14 +3,11 @@ AUX qtwebengine-5.7.0-icu58.patch 3126 BLAKE2B 263e6d3411b6dec2cd2f3151a43c062c8
 AUX qtwebengine-5.7.0-undef-madv_free.patch 1132 BLAKE2B 26f441b8e06bd059476a640a79db73b789bb387d095f51d0b5a993204a6b76be5926fff45880559fba687c3b5baf8b6a564076d58a0ae720d383acf172fdad67 SHA512 1f581749438b07df03f8123957b31d2749a702c00dae06d5c4ab8bd9a4a3d9f14ee0457f5fa9221e7b1d0dc4eac8965990336140f09787df4e46757165b1e22e
 AUX qtwebengine-5.7.1-fix-audio-detection.patch 802 BLAKE2B 0567ca41667c62c794c9c782df07aac966849101b23a8979352d83a990636935aabe7d7d7e945b286714121e963e43509fd6b6115376a883ccf4ec8777747b14 SHA512 d461dc066eda63d9cc7131852d12f2a0ed0abdaf849f9d7ec0e1da20098e031877c07ae37ebd3ba47af1ef1d7cf4d909ef594bcb4682f9e4f69d7deeaeb01f2c
 AUX qtwebengine-5.7.1-gcc-7.patch 5612 BLAKE2B 2ee8a7411dcdd397e9dfd17af0b0081fd16b16da4598ba976e94b3b14d4e1a3fbfc7abed83204e472d5f9a8aea60bc402ca98c3d355f653117556a6047a1393f SHA512 a2824a8ea4b2499fb6f5b583349c3b3428a3a99e5f534d624e00c7820f7a70c824ffc90fc9abd0f981fd707e5361b1d466de1094f65d5c1c8d62db9dc118be0a
-AUX qtwebengine-5.9.0-paxmark-mksnapshot.patch 1299 BLAKE2B 61ed2846bad8e7c82ec3a948197a16cc01ab0a9488045add6f5c27fe202e6c0daaf71e9915d62755e341461c43e263362291f8cce1dc61209aed8cf3c4301fd2 SHA512 80fce43f244d5ac7519eb27415bc9bbee9012cd1416abaed815e835d3057f64b0d766f8d7c0e4d58ec2ceab04fc3090223eb9a461e64235a6113bef31dd7d47b
 AUX qtwebengine-5.9.3-icu-60.1.patch 664 BLAKE2B eb36ee21a907677d6599dfd7fa3960619492ca0616cace73e475ceba64b1f43631d6f81b303801d934dc6e4a71bf7dc4c4b43fc73d3d048ca51bd7ceea13bc68 SHA512 9652916b675ae2d94f761ebd1e13effbb7545d14bda130a61122d082ea7e826da1be1d22d9063f5e3a4a3b2bb3bc51edb7a98a51869ec8bb9db9089e4c31dd5b
 AUX qtwebengine-5.9.3-paxmark-mksnapshot.patch 997 BLAKE2B e6fd8d6830ee2ca7b4e9c5586e52ce0ce577ddf6839d1de33a125606bc94bd483e4bef3008196f60e6c622074d23166a01b560dacfc5cec86e82dd360376627d SHA512 4a93fa1bdc7c4bbf22c68af4eff9473c4c9e39bc9cdc725441d5bdaec0521fd54db2b25f6900d4dc5d41a8cbeb04d5b420a85f334e3c18348d2e9dd1d9700dc3
 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.2.tar.xz 217353592 BLAKE2B 978a13f11adcc09486764d08da53a38386b6f9b57a57a4e574c916c614a681b14f4a44b03ac4a728673688e4ee607d512215661363909729e8736e896804ec0e SHA512 9139533b8b384519cb49a909ed678344c94cdeeed40048d0cf8482506defaea0ea8f06396576fae9f51e4b073a04ee63d1b1b42b8cd82a6d4592bc0db983c715
 DIST qtwebengine-opensource-src-5.9.3.tar.xz 217344496 BLAKE2B 51701dfa8a804ad7723d296fb8ba11df821041c60e4c96459b7851b3ba1ca683e83207c3020a5a54e401779186daf46049a1167649b930cc04151b6d0474aaeb SHA512 0db532b4d54540da1ca63de1cc4d561d72f052211535f75f60b99c1858ec0819ab0f831a3326d58da6350066748634000fe7ad0719ca545e12f3ed249a6eb90a
 EBUILD qtwebengine-5.7.1-r2.ebuild 3106 BLAKE2B e3ce8d5155c0a82d413a9d61bbf29e66f44bff39e3287446045eb9af78860ca478687330e4dbe069bc38aa70a7712dc49d559c04ba06877c4251c1d9ffe53d24 SHA512 40e425233d99bf82a0595d4248597177516f4fccc7dcba1a607e4940c828b5e35de7c3b1a5ebc700d1d05e436ff885f445b1428dd6bc9f7d9395b088ada04b20
-EBUILD qtwebengine-5.9.2.ebuild 2993 BLAKE2B 97a45338fd7dfb72df8a3d6d23a8a699b43bcc5f121fb1521e3c23fcfa4d4149839fe0d725c18babefdf844f41163f14042be517be1fe69f4f5d33f48403deb8 SHA512 6400356d54109aead2a3766a939d2f31938eaee5df7025dccd8bf47a6e66bfcd0667e4ee5262ebabf4f3c11524b8d2511ce3df518874ba5ada2340ede4a78f65
-EBUILD qtwebengine-5.9.3.ebuild 3040 BLAKE2B 1eb1aaf2498846b4d661b70bc0152fb8d7bf79d3e15de3ee755050655a775eeefd744f199fb85dfc55ad3133581f5618e0c3df94893ccb1cda41e0444d06fe94 SHA512 475e39a5c35b23967f3140558de3c4ef7ffd7ba811465d67128ab9c7fd87f4fd0e7b88db032d096ca8affb47188559f9a9bfdaa59c626049e3ed0c9252d14901
+EBUILD qtwebengine-5.9.3.ebuild 3082 BLAKE2B 576c68d162f0c95f3773d9340275742fb5c4ad55065596678a8d95111ea3b84fddb103fe65bcb63caf2ba5cfbf59077f1b5e6894acf0d96eef36c0065838968b SHA512 351fd93bb6b5f1c9faa3cf22f413a2134d2957c8bf9c27752eceece20f71cbe37d2360b40c4c007342b4a9bef9db67e722eece49d406b3eec7ef3562f6213608
 MISC metadata.xml 948 BLAKE2B c3f99b9a59aeb8ad3754b0caafdd7132ee60142f41d992b0fecdb3ed0f396ec7903fb68bc2e734e127f4f722c4f0c6c8398f94685925296037684912ace05764 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch
deleted file mode 100644
index 5eb8ce12cff3..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/src/3rdparty/chromium/v8/src/v8.gyp
-+++ b/src/3rdparty/chromium/v8/src/v8.gyp
-@@ -36,6 +36,7 @@
-     'v8_experimental_extra_library_files%': [],
-     'v8_enable_inspector%': 0,
-     'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
-+    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
-     'mkpeephole_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkpeephole<(EXECUTABLE_SUFFIX)',
-     'v8_os_page_size%': 0,
-   },
-@@ -2432,7 +2433,7 @@
-         ]
-     },
-     {
--      'target_name': 'mksnapshot',
-+      'target_name': 'mksnapshot_u',
-       'type': 'executable',
-       'dependencies': [
-         'v8_base',
-@@ -2485,5 +2486,26 @@
-         }],
-       ],
-     },
-+    {
-+      'target_name': 'mksnapshot',
-+      'type': 'executable',
-+      'dependencies': ['mksnapshot_u'],
-+      'actions': [
-+        {
-+          'action_name': 'paxmark_m_mksnapshot',
-+          'inputs': [
-+            '<(mksnapshot_u_exec)',
-+          ],
-+          'outputs': [
-+            '<(mksnapshot_exec)',
-+          ],
-+          'action': [
-+            'sh',
-+            '-c',
-+            'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)',
-+          ],
-+        },
-+      ],
-+    },
-   ],
- }
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild
deleted file mode 100644
index 2c0bd6388d55..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 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
-	dev-libs/libxslt
-	dev-libs/protobuf:=
-	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/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.0-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
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
index b0e35e0db275..dce0a939886c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
@@ -61,7 +61,10 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio:= )
 	system-ffmpeg? ( media-video/ffmpeg:0= )
 	system-icu? ( dev-libs/icu:= )
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
+	widgets? (
+		~dev-qt/qtdeclarative-${PV}[widgets]
+		~dev-qt/qtwidgets-${PV}
+	)
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}