gentoo auto-resync : 05:09:2024 - 12:28:40

4 files changed, 1 insertions, 98 deletions

diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index d40aa689a532..3ffcdd01cb61 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,7 +1,4 @@
-AUX phonon-4.11.1-clang-16.patch 1356 BLAKE2B 2adbe00797db0efab8a065c455b8122bea99ffdca9317939c85e54c65cf9292f1de7531bff89fbed227cdab035547680291c6d20d02a374bfe7e28ef9ec9706d SHA512 5ef9e3bcefd607036e47cd6578be5bb98a384bb4cd4820aab90cd7adf1eb0ae54ad001550909a93513e1d622ef4101f95fce733e3fa7a95d5df8454290ef92aa
 AUX phonon-4.12.0-cmake.patch 2642 BLAKE2B 0e1b71a2c8916ebd230ad38822eb1cb62b4ac4fc4239459e822c9b91d69e20ec5ebb96ebbbd1cc3a9af5eb71577797d1f12dc9121843f1b44ff9667a66198467 SHA512 8fb555e3f0da0a33a922dd82792ee59f7da842e2369112aa155d4f68bf20b34ed84cb3210100552458f0dd76c61c08e479b3af42b5b4900ffde7d8fdcd1b6c69
-DIST phonon-4.11.1.tar.xz 314732 BLAKE2B 9be341f8df643b352392a208c7f24d799edcc94146b71c73d93974a7ef02cc75b5baa1e2ddd037e7e2d3afeb52347d96caaa8b3a2319631802261735a3a751df SHA512 858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74
 DIST phonon-4.12.0.tar.xz 408996 BLAKE2B 568af4aec5247759e49db2137978b9f1828256f817bcb321f02e69d597d78e97c9ce437e89cd63b5a8b15c312f74ccee11b34270e74be2dc24c2af9ee97490f0 SHA512 0dbd88464985051f4c43e64a4d0b7e2d65e7f6b54fd2bae4ec1790fbdf9f79348aa91d4839c72a4f66297d5a9c7b379cc34923b99b97130a5443e5b2c0cc8a9a
-EBUILD phonon-4.11.1-r2.ebuild 1307 BLAKE2B 69c75e346c77710c52591a8debe93bb09c34217584a520622dbfcfb2b4442b3039f1705ee5550f4b35edef1fc65a33286517deb24373264adceef2d365679ebd SHA512 daae7f938573ea831c299c0ef584ae4526570e64e3cb0790cfc7dae34b364fb4bb72ac0f312d0733fb17de6bcc3f74e3dbd9a08247c5d43e2776bae5deb8ec3b
 EBUILD phonon-4.12.0-r4.ebuild 2357 BLAKE2B 89276f8d310c9b482f9f94a26508718efa0799a9fb74b0f727cf945aedca3454077b9d022ef31bc89c497704fb465608cb70e2c6c5dd0841857f0119b261cd6d SHA512 62a1ded9aca0d08eedb9a33f9b6b7ea958eba310abab2f732af262e81f27c80cc37770ff32b20dce03f7823bb3a10bc211cb6623f52229a8dccc165b2185b024
-MISC metadata.xml 463 BLAKE2B 856a539bfa489dac4d6550f9fb4104b419dc6dd12a5d6ec67ac7d9f743fa31d96c3323937558704b7941a914c1ca342b5a6030e9f16b7d84f2339f93d2a1fb9f SHA512 c6aa1e0f8f11e813c228619f9c857bfa3e15d3278a1b5af3910f8f789a7d93f889a9adb9121f19b4b52abbfa0b4a67d89a037679ae0eab00b0db04ed5e16526e
+MISC metadata.xml 410 BLAKE2B 020afc6014d4aedfde1a848e60d18650cb574a5d039275652f00ac0ad00dfc4dee4e67080375f43d5c404c4e6c203e7064fe2014a96156293eecd919b0a21999 SHA512 a5c3d2c3c4ce95b38893ae67a8f974c646064e33d97c56c65d65dec857067479af58e6aef87d9a06ddc50bd150e687dba46eb1eb65f0c6423f700f85204df098
diff --git a/media-libs/phonon/files/phonon-4.11.1-clang-16.patch b/media-libs/phonon/files/phonon-4.11.1-clang-16.patch
deleted file mode 100644
index a3fe704bba0d..000000000000
--- a/media-libs/phonon/files/phonon-4.11.1-clang-16.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 069d5a3eb81bcbc730e44c27a0d060a85cf9213d Mon Sep 17 00:00:00 2001
-From: Dimitry Andric <dimitry@andric.com>
-Date: Sun, 16 Jul 2023 15:17:39 +0200
-Subject: [PATCH] Future-proof build fix for clang > 16
-
-Clang is intending to remove the `-Wno-enum-constexpr-conversion` flag
-in the future, because it can invoke undefined behavior.
-
-To avoid the "integer value NNNN is outside the valid range of values
-[0, 7] for the enumeration type 'ObjectDescriptionType'" warnings,
-explicitly specify that the `ObjectDescriptionType` enum uses `unsigned`
-as the underlying type.
-
-This also allows to remove the CMake patch that added the
-`-Wno-enum-constexpr-conversion` flag.
-
-* asturm 2023-08-20: Drop adding of -Wno-enum-constexpr-conversion in
-  commit f685bdfdf30deeea2d1db01c1edf0c60cbda652e in the first place.
-
----
- phonon/objectdescription.h         | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/phonon/objectdescription.h b/phonon/objectdescription.h
-index 97fec2e79..6ce92de54 100644
---- a/phonon/objectdescription.h
-+++ b/phonon/objectdescription.h
-@@ -43,7 +43,7 @@ namespace Phonon
-      *
-      * \ingroup Backend
-      */
--    enum ObjectDescriptionType
-+    enum ObjectDescriptionType : unsigned
-     {
-         /**
-          * Audio output devices. This can be soundcards (with different drivers), soundservers or
--- 
-GitLab
diff --git a/media-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml
index e90f046a5550..7cf9bf61194f 100644
--- a/media-libs/phonon/metadata.xml
+++ b/media-libs/phonon/metadata.xml
@@ -10,6 +10,5 @@
 	</upstream>
 	<use>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
-		<flag name="vlc">Install VLC Phonon backend</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/phonon/phonon-4.11.1-r2.ebuild b/media-libs/phonon/phonon-4.11.1-r2.ebuild
deleted file mode 100644
index cfad75fb1aed..000000000000
--- a/media-libs/phonon/phonon-4.11.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop ecm kde.org
-
-DESCRIPTION="KDE multimedia abstraction library"
-HOMEPAGE="https://community.kde.org/Phonon"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )"
-SLOT="0"
-IUSE="debug designer gstreamer pulseaudio +vlc"
-
-DEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libpulse[glib]
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-PDEPEND="
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.60 )
-	vlc? ( >=media-libs/phonon-vlc-0.9.60[qt5(+)] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-clang-16.patch" ) # bug 894346
-
-src_configure() {
-	local mycmakeargs=(
-		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
-		-DPHONON_BUILD_SETTINGS=ON
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	make_desktop_entry "${PN}settings" \
-		"Phonon Audio and Video" preferences-desktop-sound
-}