gentoo auto-resync : 15:11:2023 - 22:37:24

3 files changed, 2 insertions, 90 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index f04f75d6e222..703424b6a98d 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,11 +1,9 @@
 DIST qtmultimedia-5.15.11-gentoo-kde-1.tar.xz 1496 BLAKE2B 148c854ec7dc518143b39f83d061a566936fd4a041df84353373b5eb28a8453625f2fd7f5b57be86b4476f572844d1afa56f5a7f3a324e7a985e0c5d05f332f5 SHA512 05989f3689ecb9ce43db7c252be3dd1db518d3a615bc3bef6cbe24aea89d5ed50a8ed48573f9ef4b95bc8a20b0fe612f10a732ce0b364bee5e27ee06a635f3de
 DIST qtmultimedia-everywhere-opensource-src-5.15.11.tar.xz 3849160 BLAKE2B d652a49a47c2a2c525e214287f7e083178b31f123dc5f08c7ff864d91e6b2f1dcac99a5f038a66b78a120fdb7cb197156f3aa57bdf41cbf95e878e11f99e2423 SHA512 1d72f79fe83cc955037ec6c5348058369697889a9a40b9fbaee9f3ad0cb74fe5f97062e026254e3512f0861e67cca8a36eaa19c1b3ffbea32d6b3cde2163b484
-DIST qtmultimedia-everywhere-src-6.5.2.tar.xz 6415576 BLAKE2B c0032c405315e6884de6bb851de3aed0b60827a932c15b1022dca70ebfaa5dffb258b2b22f9ab40f57586490db6ec50ea862152fca8429e600f9c6bffe2f42a2 SHA512 e12a2406e78eda8f3f4674b8fe01b06bc2c7b8fcbe5342e25e28340e13c0ab0db44a78c91a8a1f268664e5bb11c3bc7116248700f0c67faa618e058af0dfb1e0
 DIST qtmultimedia-everywhere-src-6.5.3.tar.xz 6560208 BLAKE2B eb838783c042a6416cea85311c5cfafea20c30c3dc1ea9ad172293c1ac92b492973012f4b4b0f0e7ef6cb3d0bcfb5d852ce3d904a4172ac66a2964a5cc8b3e18 SHA512 6b32e79f1fac21dba6a1ca9f82cfde8acdf9b33d1a65439d4a972f98ea23c919ecbd26ee4c08ecdb7d2743cab346437f27a701e45426e47fa89e55d913fe50bf
 DIST qtmultimedia-everywhere-src-6.6.0.tar.xz 6575240 BLAKE2B b3c76515a80d2eb8126be1f78450855f0f21910ab219ae8d1cfbe83987dcf886d88e93c09024bba6930bff46f51bc626e5330f6b3e900964bed48805a8282c69 SHA512 ccfdd1aaed76dfb06692e212405d9b2804aa3da924c903febf5ee3fde057f4543f76284a543c808f600d61b5eadfbfe2437932f5ff4a7d19941c9ab3eae2d8a0
 EBUILD qtmultimedia-5.15.11.ebuild 1511 BLAKE2B f773c6effa7a370b2e48a3af434486ab29251e2f50d71a56862ffa35e2eeaf13f63314980464bd59489ae862122435ffa453e8c29b0010b51c970dfd97ad3d8a SHA512 f9a8ba144b8ec74364cb9b5dc0dad015c01c9e24f2217d01a331c7456bf8cc4128d91f4c3e5c81ff07003760126499c2edfafc127ca2ec1f0ce590934f240a21
-EBUILD qtmultimedia-6.5.2-r1.ebuild 1996 BLAKE2B aaeafccd740aa263e6fdb7cb1ecfa62251f40a0cf7045bb0b03b90c75ab9a1861fd29972a00f00c49974efede1a56a7c231e938d6f12d7ee076dabdd3438c08b SHA512 1d8d76a0c1e63dca123bb7d9e95752ff2a1f32f6b3192247ff0795160ee5a1e6f47a191cf0b0ed41ea42b40becd0eccb5b083f0965c8b766666ee02d5c00bd4e
-EBUILD qtmultimedia-6.5.3.ebuild 1970 BLAKE2B 508c83cfe024185ff49861bfda52575bc3c7ada33465c983af49bcf3a324e9a815ac59d754341b298f9fe0d2ec4d462a8b4e82d186d88eda4cb89ffdd37b9d4c SHA512 822053421a4e1ef7d0a46fef4476d63edfab5231634a9d6a0cd11279289d66b30c252d6fc3a207c77a60455b664804bfa09208d81bfc62607daf4a27e3e809b7
+EBUILD qtmultimedia-6.5.3.ebuild 1969 BLAKE2B 43aa08f028bd2b2e9a724d3bd7855684dfdc6848e261679d6380be557bf634ff357c3ce12a91039e9ec5cdf0492258a6582255db3d7435cf160261d9685dbb75 SHA512 892a0f175494f9f804bdb7e24ee39a25c650b3776f111e02bdad2debb60218da9ee5a63c11816fabd7843d22c74826d6aeee4e665bc77cfeb937999f858fdc4d
 EBUILD qtmultimedia-6.6.0.ebuild 2031 BLAKE2B dba5f93bef4e9da68603d27547c8bdd48acb1fa73ee9c7699bc3c581c72d58b9c7238bc8fb84f6f3ea302fba944f07c988be17a415eb00b7f174dbf91d70e9b7 SHA512 94d9a75e1a91e7bf2735d773d85f1ad875f72e673230a36c0f1b14d0b7c32d84453ad4f4a8286323e120756c4a7ba10c25cd2a1ae9819d6a996deccd64d1d2b1
 EBUILD qtmultimedia-6.6.9999.ebuild 2031 BLAKE2B dba5f93bef4e9da68603d27547c8bdd48acb1fa73ee9c7699bc3c581c72d58b9c7238bc8fb84f6f3ea302fba944f07c988be17a415eb00b7f174dbf91d70e9b7 SHA512 94d9a75e1a91e7bf2735d773d85f1ad875f72e673230a36c0f1b14d0b7c32d84453ad4f4a8286323e120756c4a7ba10c25cd2a1ae9819d6a996deccd64d1d2b1
 EBUILD qtmultimedia-6.9999.ebuild 2031 BLAKE2B dba5f93bef4e9da68603d27547c8bdd48acb1fa73ee9c7699bc3c581c72d58b9c7238bc8fb84f6f3ea302fba944f07c988be17a415eb00b7f174dbf91d70e9b7 SHA512 94d9a75e1a91e7bf2735d773d85f1ad875f72e673230a36c0f1b14d0b7c32d84453ad4f4a8286323e120756c4a7ba10c25cd2a1ae9819d6a996deccd64d1d2b1
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.2-r1.ebuild
deleted file mode 100644
index bb75fd7f3f30..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.5.2-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64"
-fi
-
-IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
-# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
-REQUIRED_USE="
-	|| ( ffmpeg gstreamer )
-	vaapi? ( ffmpeg )
-	test? ( qml )
-"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? (
-		~dev-qt/qtbase-${PV}:6[X=]
-		media-video/ffmpeg:=[vaapi?]
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrandr
-		)
-		vaapi? (
-			media-libs/libglvnd
-			media-libs/libva:=
-		)
-	)
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0[X=,opengl?]
-		media-libs/gstreamer:1.0
-		opengl? ( media-libs/libglvnd )
-	)
-	pulseaudio? ( media-libs/libpulse )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}:6
-		~dev-qt/qtquick3d-${PV}:6
-	)
-"
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	v4l? ( sys-kernel/linux-headers )
-"
-BDEPEND="~dev-qt/qtshadertools-${PV}:6"
-
-CMAKE_SKIP_TESTS=(
-	# tries to use real alsa or pulseaudio and fails in sandbox
-	tst_qaudiosink
-	tst_qaudiosource
-	tst_qmediacapturesession
-	tst_qmediaplayerbackend
-	tst_qsoundeffect
-	# may try to use v4l2 or hardware acceleration depending on availability
-	tst_qscreencapture_integration
-	tst_qscreencapturebackend
-)
-
-src_configure() {
-	# normally passed by the build system, but needed for 32-on-64 chroots
-	use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
-
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature alsa)
-		$(qt_feature ffmpeg)
-		$(qt_feature gstreamer)
-		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
-		$(qt_feature pulseaudio)
-		$(qt_feature v4l linux_v4l)
-		$(qt_feature vaapi)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.3.ebuild
index d2ceca20f2b0..879ee28160c2 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.5.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.3.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"