gentoo resync : 11.05.2018

3 files changed, 2 insertions, 72 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index a1888b7e3e0e..1de71fff1716 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,13 +1,11 @@
 AUX qtmultimedia-4.8.0-alsa.patch 2155 BLAKE2B 23b713531f7e4c63f568fd284d74586506acee583afe897bb40b53f2eb5e2a0178b353107e64f8d85d1fdd2c2f04a7eb0dbdcdfa648bfa6d2d4769c05275c36d SHA512 725dc78b861c82393ecd97ce293f9c165067ca940332fab22ecc252880e1c08aae301d54ddcdf38df9d32907c57bc70d772891a6dc9fdacf740de32b363f4aa4
 AUX qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch 6852 BLAKE2B fb9507a5ee7793c20e435896e553df808860f0ba1a1a9495325b8ecd06b06b0070f03bcec9313c509cad0cef8dc844ff48e00073d8c5b320b980ff8d9b694fef SHA512 ff513b5c68a02179e0a36803367b4dfe9f8c351fb76296570a2b382d2a1dd43fcb99033ab7844c52253c95124e2246cb81d68aa8e64e16c89d37bccaffcd9dea
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtmultimedia-everywhere-src-5.11.0-beta4.tar.xz 3680544 BLAKE2B 24475dbfa9593dc1639ad0d0c79c07bdee710ade983ecc9b73640650eb5416e067466672488eb12f240a43f6cf8f642ff6863250c7e8673ba32b2105fc2d8f3b SHA512 ab858172f1350a32933780cf6c988aebf62828bf7b282f85cbbf45167ba1caa90efe11d00a8bd9441af09c7a7eb82e86b5f82d9bce3321fd2768a08d564cbf5a
-DIST qtmultimedia-opensource-src-5.7.1.tar.xz 3563676 BLAKE2B 51ff5ef507ae82eda236143326b2c553038ee01d77f70c3bd756160ce30851509e989244ca19edbfc18a9cdbe20189c8c84715c3ed79b76604e9c82144b51f92 SHA512 1415a4c29416ead2528ddb040a3c69480408509c6ba573f44295513bfe2aa62b8e8bb97cbd33713e605f094e1c1e1337507904d2b0c6480ddf9cf75393d8e97f
+DIST qtmultimedia-everywhere-src-5.11.0-rc.tar.xz 3676792 BLAKE2B 637c08d03a632228f63db7099965d43c97320159addd2254be862f7177d9ed0fac5dde38580b7930a97cba058d5248a4ff10b8dd0e669aef59de3f0bb484486b SHA512 7270d5902ab4c63221683c1a5a2dba52dbb4d57af4f1c9e14d6d449be34322288e9624df0ceb41df167fb8042589c37bfdc6663d0f706c5fc5bfd1b38621f587
 DIST qtmultimedia-opensource-src-5.9.4.tar.xz 3608792 BLAKE2B ac377b3cf33d727fa129fe623cc9ba9ea75555b2af7f70cf07524598d4044a94617b3627f7fd3a915596e51ac53040b9d72a5fcaa2faf316150a2c1ead220def SHA512 7a60434736f655900d00e70a68e5781f336446938f4f2b617e1d93205b7319bf01be987c001a9e6838ba5fd9e3afe3f20137597b6c27f6f77ee55486e283d425
 DIST qtmultimedia-opensource-src-5.9.5.tar.xz 3585644 BLAKE2B 38815c4668c70294f27fb7a6522ee4c3443636eb52d9beec3a640fce5a78b4be511ed5d632b5ae1346040554ccec961aab733f57fe314639a227e957fd5e117d SHA512 4e320c4f8a55b7801aac36f87e16a0284e0d0e6d7812318b56a1f82970e14794cf431bfdf19d24606d985a4d98e670baf2cd812edf8ced92d85b72aae4749a56
 EBUILD qtmultimedia-4.8.7.ebuild 1298 BLAKE2B 2e78e5f2f0dfbf43aaabd1abcf06fb05a3612029bb9ed2f1007cda90ed32665cea64b2f56e7b64b879400a3a66ba4907fbacefa5bd431fce1a08b0db3c61c8cc SHA512 d7a6fb8aa9927fadfd23e59a695818b8e066ccba71877848669358fa640064a6dee16c38ba988e2501e3350939fddc13c6ec90791c1b7c670f1e654b6a5fe6d0
-EBUILD qtmultimedia-5.11.0_beta4.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61
-EBUILD qtmultimedia-5.7.1.ebuild 1500 BLAKE2B b7f6cb555da958ce36372c8f9e1ce586ae2442b58b06732ed60f4a6eb827fe9540fa6bd4a3de330696e5c1297fd6419fd6faa957058f7a04eec6c014fbca60ab SHA512 f01033996921f46760e8ad7c3028fa51b4a95da3756f855a36c6e47220110858f7c861e1f01ab2213b6203ba4896ec51e5c93c9fabc8f4798156c5c5f89e8959
+EBUILD qtmultimedia-5.11.0_rc.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61
 EBUILD qtmultimedia-5.9.4-r1.ebuild 1460 BLAKE2B e845058b50a99d2744c32adc8044b0144988bfe898770e9f5f7a316eee2e5ed17974a36ad1e9ddef786ae8f789b16221534d56eea9d84ca713b7960e8810a764 SHA512 f5f1131f8915e62c8978663187f3a02b4f19fcb8285b4557f809fa1bef9c4277d7b2fe8b4c6fe92b3f55333bea1e4244f94e5af52539968aa15b98b810d55c5a
 EBUILD qtmultimedia-5.9.4.ebuild 1351 BLAKE2B 6ffd46d9ac8586ccd662757ba2119fd40f6788c9930436eeeaf8639d1f44c2c62c3251719e4752a8781a9cd422d3b52322eea88462f9f00f84156065cba22dc5 SHA512 40b7d32b7f77d1cb9e84be35ea9580b36c8aca9701a206616ffef299255b1fd67ac153ccb55e555ca779c5be82d657141e5fccf64f737912673b66cf9103bf21
 EBUILD qtmultimedia-5.9.5.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.0_rc.ebuild
index 04cc34da1d15..04cc34da1d15 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.0_rc.ebuild
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild
deleted file mode 100644
index 5c2c8c280424..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtnetwork-${PV}
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}
-		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2=]
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	# do not rely on qtbase configuration
-	sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
-		qtmultimedia.pro || die
-
-	qt_use_compile_test alsa
-	qt_use_compile_test gstreamer
-	qt_use_compile_test openal
-	qt_use_compile_test pulseaudio
-
-	qt_use_disable_mod qml quick \
-		src/src.pro \
-		src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/gsttools/gsttools.pro \
-		src/plugins/gstreamer/common.pri
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		$(usex gstreamer 'GST_VERSION=1.0' '')
-	)
-	qt5-build_src_configure
-}