gentoo resync : 16.02.1018

3 files changed, 2 insertions, 72 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 298f600a82ae..8af4a3862f3b 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,3 @@
-DIST qtmultimedia-everywhere-src-5.11.1.tar.xz 3711548 BLAKE2B 93d282725293c0750803e4cf00dfd4fdd2ceb23b5105eb339c60416cddcca2e39a51277ff60ad524b6225cfb6c2177fd52015bb7d10521a04973a4d24188fe0f SHA512 cfce510f5f5825ce12207070ce34bbc97e5433b5174bbdd562befcd383c74459436dfce23e5fd8ee5c5a4c28573b85374383d17ca3d0c61daa51b50c915b324c
 DIST qtmultimedia-everywhere-src-5.11.3.tar.xz 3710012 BLAKE2B b1757e80914a41913846dcb890fd56706b402aa0498cfa3e58277e8ab50e95c597df1b32dae11f146283d42c874ec03d8d33374447fc71f529c30d0e465c14cc SHA512 1c9b8f3392ac0c7e63a05d57fb74473a89edc9f2e482d8df97761ca20efd13bca2c1c68907ab4b4af71a109a783a641c2faaf72e7df90fcbed6bcd6e13350567
-EBUILD qtmultimedia-5.11.1.ebuild 1443 BLAKE2B ddb6f0ec27097e57174187a1cce1fdc007a3c7a81ea0a74cdff3d126ae8ae2af69b8ffec9815ac50332ef6b6020a37af9c6b6b7b2f48f67525740a52366f89cc SHA512 c812b0a72e508b4548b1d0addd13143d5e149aacdab73068c37f4d9be7dd3afdaca30e8553940924a75a7c02ea45ac06daac0ac0b4edd751ec3de3308e7bffb2
-EBUILD qtmultimedia-5.11.3.ebuild 1451 BLAKE2B daf9c6029f91bdd7a654034c7d7d19dc4827de26507d2d4331709d398c9c5cfc74d0cf13af56edc9ea968a17d73ba6c8269e1b1cedba7cfd66f52abf703c7cac SHA512 ba3f754e1c95b3dcd773a464c96bdb2eb7930184e5227446e3eaf324619e0a9487c67b0a5e859d46810822c857bf842d68843dd73fbccca684aefd9bfd1934ed
+EBUILD qtmultimedia-5.11.3.ebuild 1450 BLAKE2B 4c0e7773c5d567e64332db5c2d743c1e8701701a291367bf87fb6c7d10e258e1ccb7a47fc0c82bfb1c01909b8def86077f4ba6c1b04fefe9a30e0216876d506d SHA512 d09dc048fe5c44f41abef3c27a57467ad1cc5e102f3d486fc36331a55735875fce8e638747f297d789db80e3fcb0e894e255b7fbd57e06d43d4ccb391a2b2cc4
 MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild
deleted file mode 100644
index 30a3a2c588ad..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 ~amd64-fbsd"
-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() {
-	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
-		src/multimedia/multimedia.pro || die
-
-	qt_use_disable_config openal openal \
-		src/imports/imports.pro
-
-	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=(
-		--
-		$(qt_use alsa)
-		$(qt_use gstreamer)
-		$(qt_use pulseaudio)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.3.ebuild
index 3baf64bca048..15657ad568a7 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.3.ebuild
@@ -7,7 +7,7 @@ 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 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"