gentoo resync : 24.12.2018

4 files changed, 5 insertions, 75 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index a7b6c9f4db36..13bce144acdc 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,7 +1,5 @@
 DIST qtmultimedia-everywhere-src-5.11.1.tar.xz 3711548 BLAKE2B 93d282725293c0750803e4cf00dfd4fdd2ceb23b5105eb339c60416cddcca2e39a51277ff60ad524b6225cfb6c2177fd52015bb7d10521a04973a4d24188fe0f SHA512 cfce510f5f5825ce12207070ce34bbc97e5433b5174bbdd562befcd383c74459436dfce23e5fd8ee5c5a4c28573b85374383d17ca3d0c61daa51b50c915b324c
-DIST qtmultimedia-everywhere-src-5.11.2.tar.xz 3701832 BLAKE2B 5a2cff609a46d8962de5d32dd3e63c235d7230d414410435385b51ef9c74af8efd617910af6c760ff042275ba5ba8f44761df0a319067ec355f5a02f56545de2 SHA512 f83c57ad35b713118d1d0ba27f78687aefa8f1ccd850be9b78a9c3477e0e9bb5f9a66bf39c2505f81987f0ca7d07dbc3f471d5efb4b9e4c21e41b308fc83040f
-DIST qtmultimedia-opensource-src-5.9.6.tar.xz 3585964 BLAKE2B fdd18b1abcfbc8a1f81c9a99e75748dd68112ae4fd534e038d73d1f8fa33b76119824ade231e7b1c283ff109ee2473774d08c67bffa04383e7328437539aadbf SHA512 2d5f1341ef1f2d7e99ced28945f70b283630ce4ed9ac968c34ffc7d215c59a9b895681ee519aca64fe8a41ae574577ce834e486281db7e1f337245f9b6506207
-EBUILD qtmultimedia-5.11.1.ebuild 1445 BLAKE2B 7fe2f8608d8a064624c708c2d7b4cc59f9b1686443aebac7e949d648247ba5371be73d68c62cddb1329bd76ca690159dd3afd7e59870c51fa251df4cb85b2f04 SHA512 484a1214e69cdd519553eb90a6bcf1d0b520b97db01eaa7af8c7a535804f5e70c26368c8a97dba31848e62fd7e28b4ebc4dee3ededaf390cc5cb996b0e25cf86
-EBUILD qtmultimedia-5.11.2.ebuild 1447 BLAKE2B c33d9c5e9bb66baaaee43bebd325bb3c2bcacc1c809e8ce49584f284fee2f5a48a1c5ef4f0073fc4824fffdc8d26f38b1439d3c50c231343db4fff59298d65db SHA512 9aecd484432af6fdc650c3c82e1ca58e87555e6a7b4591eac54d207141c258dc65873ae0156fe0d02d9f45cfa9cc182fb8d44fe10254dadc27a59238a34720f2
-EBUILD qtmultimedia-5.9.6.ebuild 1453 BLAKE2B 27dd7746bfb2175d1836a4b95ee4b5f557116414f2d9cf30cfbe72bd155f5e15f0d6277cff3829bd780c221a225acec999267e2037896565d729810da8ad47a7 SHA512 945f56093cba63af3a044c642f1c80e293b170d895ec6a1ef2dec5937b8461b44b42a1862732337ad2eb082366e7478b09985dd7ab44729668133b33d2b0acc4
+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 1454 BLAKE2B c47b367d595b0ae14e242b3486ec9f565c75281113cf95fdb744430af7364e31b1a1ed204fd08b17817b8c02638f52da54f265b9e2d3eda8b16c1adbfe0f62e1 SHA512 8abfc47068c92c057e8fc2d54875b40329ce12f433e1483a4d1b4d2795fa163aeb8053ef4d924612533b319157dd196cd1036d31eb25fc34bacc81fc066ed621
 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
index 86ff0caa1ee7..30a3a2c588ad 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.1.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 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.3.ebuild
index acfab89749c7..aaac7463ffcd 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.2.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild
deleted file mode 100644
index 7a5ab59350b9..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.6.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 ~sparc 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
-}