gentoo resync : 09.07.2022

3 files changed, 2 insertions, 77 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 7b61fb11815d..155479c5fb0e 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,8 +1,5 @@
 AUX qtmultimedia-5.15.2-no-qtopengl.patch 445 BLAKE2B 9224c90ef5a57b0da8c5ea5a51eb03d4702824fbb435101d5d9d559bdc4d30ece2de7457ed1bb80ca7f028a0b1a5abfa7436501d5d30c87680fb46707de17f53 SHA512 2f3dbb4dcbcedd01e3d911cf1f665e78dc08b383a5c8f2e17f96072330242e7463e6e403159f90f60b799110371ca923f502619548d5db3fd264af4298e4b587
-DIST qtmultimedia-5.15.4-gentoo-kde-1.tar.xz 1324 BLAKE2B 8080e8f35ae0dab394bac10b9e4db8ff1afdd98cd91cd0a513873bf78b675a69af908e7a6c1adc7a9f75176a3a1901d66c15ca56c7c631bcf69318c3ba0e235c SHA512 414874aedfeaa1abc2da4440c404cd26364de5de060b8c148d7883122abe82d47bc8c013ca5fcf9f6c0d8cd98d686ebcd100da6b945bcd530a5511c376cd2051
 DIST qtmultimedia-5.15.5-gentoo-kde-1.tar.xz 1324 BLAKE2B d29d8102e6fd55f2c2f6037e292a3c4039c7532fb63c34cc19fbedc8cf3f8082c6d75debd1617a5d29fcdf5b8c7a7fef35f103c9179f980986b646dae9ff867b SHA512 7b37f0db1de002f2cbaad6852edcf772dd0220f81d9dd836b3c1266df7eb49ec40d3eba6d3ccaf68f621c8e93b2812e2d882291fb2f07d0b80e4c9975a408cdc
-DIST qtmultimedia-everywhere-opensource-src-5.15.4.tar.xz 3833720 BLAKE2B bd381125280527eee7b5cec117c3d4c64ce2000b459effc1d912e5209d57bd88baf547967d61eefc94adf3f8aa85e3caf010b7ca9f7551b29182a90f483c5cfd SHA512 bb0ada7560093b89751b5b3c0e1a573de215a388d621d356bc3c0e1acfffc2d696230c67b7a7cef037b18c4da900c7eb3d315bd2e73ce12f9aedd0e340399117
 DIST qtmultimedia-everywhere-opensource-src-5.15.5.tar.xz 3832656 BLAKE2B 6098fe14344ed03dbfcbb2db429c431a47282bbbb89602742be2fe44ef063ceb98322bb576eeb559a649b24f142cd5e21b652fed8c96814b8e3b8b0a66b51fe9 SHA512 f798ffe0a32bc9f16f584b7a322c321dc2ef62c18395987ffce1f7f6cac10722c6f1166c64a1fda9877f3970a8e7b3ef8b7d9763af4c59ff313adc6081a7acfb
-EBUILD qtmultimedia-5.15.4-r1.ebuild 1577 BLAKE2B be0f10a67c8d5e0f39e57fd5f7a30e8d5a8a8dec4d94d9acd5a075029b9127ecf5ef9ad55ee9f94f3891f7d3a637d0fdfca6ba32c90f3f3fa5bf3d4d166d7376 SHA512 2ec8c3bb2a292d8db930568a24dfc4fca5ff8bc34672a647cfd9ef15f9f15b38c6edfdf11380ba59de27334e8bda689202d727b40fa53f72976bbc8ad4e4b879
-EBUILD qtmultimedia-5.15.5.ebuild 1590 BLAKE2B 5e6e6689fbc7c925fb56ad7aada609ea9b8feb19b69025dc079af010f80548c1c6f68fd224764d8209c686fb49fa65ccc7e9da02f2d2cc5ab20f11ddb7bcbbc5 SHA512 d28fa3db668122ce80ed5e1b74ff252ddf1e30f0c435f2945e4b534027d9fac1c19149ffe826a827acbca9e3b13be12a350c5f2b0797545a6f80db6eaa60fe8c
+EBUILD qtmultimedia-5.15.5.ebuild 1584 BLAKE2B 7c9c712c7884c5e90dcb1ead0303b86cae19c300f982d11c44c10d7bf8511613ad694af8c9e792693388390942751908ab29e387b5777388aa0444eb934368b9 SHA512 7f3cde3b314513d3c77f976f878e0c6bbdd70ef064afdc7a31e270c8f757fb2b89973676042cfebeff71e3f853bcfea08d0305ab816864a85b0cc246651aca38
 MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.4-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.4-r1.ebuild
deleted file mode 100644
index f8eadeea4dfd..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-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 ~riscv ~sparc x86"
-fi
-
-IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
-	=dev-qt/qtnetwork-${QT5_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-${QT5_PV}*
-		gles2-only? ( =dev-qt/qtgui-${QT5_PV}*[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
-		media-libs/libglvnd
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.15.2-no-qtopengl.patch" )
-
-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.5.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.5.ebuild
index 19cb65492dab..6e4796adca29 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.5.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.5.ebuild
@@ -9,7 +9,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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"