gentoo resync : 22.01.2021

3 files changed, 3 insertions, 73 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index b25ed1967388..54a0792c7c31 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,3 @@
-DIST qtmultimedia-everywhere-src-5.15.1.tar.xz 3825940 BLAKE2B 8a86e77b37c7af0226420025f23bcea6aaffcf885f7c56945faa8606bdaf003b29013b452ee2cd44cb1abe7adf260af06f099b7af23664110a97a0dab0574a36 SHA512 9c063dc481c91a94ba151fa96166d04a83e1cdcdb66c5fa80c038bd973c87b928c3d90d1c8add7c3ec29c4dc7dceff9e8cf288ce980f95d199f37e90593104d9
 DIST qtmultimedia-everywhere-src-5.15.2.tar.xz 3828172 BLAKE2B 6d492abdd563788e601eba8183197863f5ddf0697c8f72939f8d6de8043d0575333bc6effd17182a2b5e2e0a93d6f431054282ad34f4ea0f0a0a67e1502a948d SHA512 be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd
-EBUILD qtmultimedia-5.15.1.ebuild 1462 BLAKE2B 9036ccdd8a1690afdf2a8fb07a38aed37365cc7a9059a192120c8a2136caff7ab592f9eb76308a85f285a50af4f074a4785c4340403bde2da72d49855a99982e SHA512 b4a2434eb36eddb127ee7f0d73c3af7c0c55950fe350dea2bdf7544bd9c91a3c30edb0ddb7548fc866f70c0068a60838aea8f5349fee7be8749ff14a35f4d00d
-EBUILD qtmultimedia-5.15.2.ebuild 1468 BLAKE2B c0b9361755a7a2c37196ff417c2875c498a61e3e5a3c775a06cebbac9948242a960802bfb3b97cd21ae564763e71562563b550bf69151bcbfcb4d7e09e9cc1ec SHA512 f152a6f0fdec63bd1f699e15a79802d3a2b347e2dba7362a4d56dc8f0c22c70fecc30ee5d68ff1421226c04810496c1456dd39a2a66d5f781443d1927ea8b47a
+EBUILD qtmultimedia-5.15.2.ebuild 1462 BLAKE2B de757e1e51479fec6f4d6ff04bb0cde1631320f49fe71598909a4accda1eee4f3c3842e1f7b2ee8b0666d6f05b37baae8fe46da9af073b91f96cd0ac09496442 SHA512 ff75e0e8a532579f0add4acba769fc09c129a2d20c1890fdde8df9871434984a8702bb9e2630885abba3690594be3b38f87feb3bddf913cc785a5c9c6ec0329b
 MISC metadata.xml 717 BLAKE2B 66c4caae8c3c2d342dda85c4fd88d7dc3ddd8415e5b1e14a6278b324df257212b128b75468581609959b774fd9ba67a01d1294e539bf1c1cbc393aaf1a0bbbdd SHA512 d3d69ed7c2f42dbbf33aa360ef34dc2a0687be44a795ce2ee6c4b34603a7767b4e66c652e500ae3beed47cb1d6e73be5ffa13cf4bb1d33e3fc3f0154f950bee5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild
deleted file mode 100644
index 33eb59e9fbe4..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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"
-fi
-
-IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~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[glib] )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}
-		gles2-only? ( ~dev-qt/qtgui-${PV}[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2-only=]
-	)
-"
-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.15.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.2.ebuild
index f8b9dfe3d426..e8a14eae07ec 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"