gentoo auto-resync : 03:03:2024 - 17:42:46

17 files changed, 193 insertions, 243 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e14f27d8049d..fec7bb77ddc3 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libdisplay-info/Manifest b/media-libs/libdisplay-info/Manifest
index c021a5b7b6ed..a13f4d8e7e7d 100644
--- a/media-libs/libdisplay-info/Manifest
+++ b/media-libs/libdisplay-info/Manifest
@@ -1,3 +1,3 @@
 DIST libdisplay-info-0.1.1.tar.xz 76864 BLAKE2B 262f275a61efefaa57ec48558c4b9f9dd9cb6d8012e50a9873e10a593e1b03e2cc37c2d690be392f26ded171be9dcc8a7e80139129d2b4d85ebc7f9ef0eedaf9 SHA512 95c199211504af96816d92ec8e531bea993dd5d4a2935f1977f1e665b924b1628df25b81cd20da29543d008a8e6d757bdbceb09c74e031c0c213d60be9a10d7a
-EBUILD libdisplay-info-0.1.1.ebuild 652 BLAKE2B 4db592b4185d8671fec7f00084758397e8dd26881e5e948cb3002cd913d7b161a4cf9ca05f0bcd9bd64cea6d76bebc0c7070a8c83f246be37bb2dbe993a9e233 SHA512 16da28d639cd1292606a12d2014b9af9abf82da24d7cbd1aef3aa6f458470b1b78311324de951af2355366912eb81f8c399f599850fbf021ed04e42428d9521a
+EBUILD libdisplay-info-0.1.1.ebuild 636 BLAKE2B a5a1a6fa3d9aa86aed2c74055f25f63c06afc4ef21230bf932b76f80a55850190b05b675e2523b467be42c72a6441f4922eeb7033f7a24c26b741d0b5592a819 SHA512 2d84954d2f7c90e6e807d7dd0961365b97db75d679512024b41713cab838caecefc92dd086ef2fcb8ee8950b9be47609c85f9c5c83144de8bad74b24b4e9f713
 MISC metadata.xml 349 BLAKE2B 0a82833d63b02c6572b7ee005a433ab4768fc3b6b4f6af5ef1bcbb2651d48bf8638cb32994c12370347302f0b8fb66e17b85b188177e1df8bb98e0a2bc65f920 SHA512 e5c06e09ec11cf204a2cf82176778d0fac91c658813d20e7da4e6dbb80ba6b2e27eb4a12b1daa244dceee894c24e9617c313a2d07732f5ca8ee2aa79cc162cf5
diff --git a/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild b/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild
index fed0aff9333a..4d86d742c195 100644
--- a/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild
+++ b/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..11} )
 
 inherit meson python-any-r1
 
-DESCRIPTION="Simple framework for writing Vulkan layers"
+DESCRIPTION="EDID and DisplayID library"
 HOMEPAGE="https://gitlab.freedesktop.org/emersion/libdisplay-info"
 SRC_URI="https://gitlab.freedesktop.org/emersion/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
 KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
diff --git a/media-libs/libsvgtiny-pixbuf/Manifest b/media-libs/libsvgtiny-pixbuf/Manifest
index 9cdec0180ea4..00b9f501e1af 100644
--- a/media-libs/libsvgtiny-pixbuf/Manifest
+++ b/media-libs/libsvgtiny-pixbuf/Manifest
@@ -1,3 +1,3 @@
 DIST libsvgtiny-pixbuf-0.0.2.tar.xz 263100 BLAKE2B 1afebcfaf77dbd765ee6c6b4dae1decab2f5458bd7ccfcae8a4b5b02e71c53999d130f698b9d5619fff40ecb96a98f7d63f984e182a525720c3c9df9fc5dc227 SHA512 bf657fd341cab1f9b7ff81f9d517096176e6b82d14c2d6be12e0b6a8420e787bd8c9d7324ecccad8c0a01c839b9de0ecf6f998996571dcba8e9b6c22c28bbe56
-EBUILD libsvgtiny-pixbuf-0.0.2.ebuild 676 BLAKE2B 3da9b1dea732532e01f07137ee09433c177e1bcdaf10cdb80c22037e090f406ef29d10faeb6f3ae956f72228d1f5cf52b9702700259466dc41edaf70808a6e7a SHA512 d272d9db5fb7aa033a74773502029e1e5fa60b20c091cf26516de3797f917a6121a107f6685be734ff0660c1ab90ac1f9af8197e55a5da06be31db505f28b87d
+EBUILD libsvgtiny-pixbuf-0.0.2.ebuild 667 BLAKE2B 0291ac41f65092a59b2f00a9a81e74237a2b4f5e8853efc47a63d88faa1da718b8af1a115787d317c40bcfeb90d67ec959c808073abfde932f12087d17ad76bb SHA512 1a3cdcfbb8d26a03cbb801e2644ad4253cd60695bf8f6894707c082a5df7bafbe45430861830b29403b43a3f872346b8d0bae674ff275491b5f3d1a3ad2d8658
 MISC metadata.xml 410 BLAKE2B 477e5b88250e37a88df946d5cf13995c80986d3a6e14916a8f94f74a3c0a08f026923a0aa0aa6e7c1952022671e54a5727e4d7dc42135ff48d875bd5c3e1720b SHA512 e3431d0ef28a06ec69371eb190be35f21b3b0e52b981496b1e5294ec592663c2bd58241a771189e2b06e7a9f102ca406851bfd277adb75f4f1c994a42dfd0dbd
diff --git a/media-libs/libsvgtiny-pixbuf/libsvgtiny-pixbuf-0.0.2.ebuild b/media-libs/libsvgtiny-pixbuf/libsvgtiny-pixbuf-0.0.2.ebuild
index b573b0ae84af..8f8ea2a0abab 100644
--- a/media-libs/libsvgtiny-pixbuf/libsvgtiny-pixbuf-0.0.2.ebuild
+++ b/media-libs/libsvgtiny-pixbuf/libsvgtiny-pixbuf-0.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,8 +8,7 @@ HOMEPAGE="https://michael.orlitzky.com/code/libsvgtiny-pixbuf.xhtml"
 SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.xz"
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
+KEYWORDS="amd64"
 
 RDEPEND="dev-libs/libxml2:=
 	media-libs/libsvgtiny:=
diff --git a/media-libs/libsvgtiny/Manifest b/media-libs/libsvgtiny/Manifest
index 0357162e201e..048748916e30 100644
--- a/media-libs/libsvgtiny/Manifest
+++ b/media-libs/libsvgtiny/Manifest
@@ -1,4 +1,4 @@
 DIST libsvgtiny-0.1.8-src.tar.gz 764959 BLAKE2B 846ff04efe2f1a696ae43826233ee8ff9a348e3e816792294aab865db70f72b122e5da71ffe88eae3282483f3d932305970d305d7740826bb8f692584cbeb30b SHA512 86015bf5b662950ca25351303c6e2f31d197166757a96aa1163234dffc06328028ceba8d927ac701da3f9ebdb7c74d89c3865b1decbdc26dc3d83290c6628ea2
-EBUILD libsvgtiny-0.1.8.ebuild 742 BLAKE2B fcab35c3205875f86f63fe6288d7fbc4e020432a37a815c2a2d0cd087b597de995f9eb7401e8d94b38d54d5661a0b092f8b303cb9b8a42b96728a467ca301888 SHA512 26b5dc96ace37104a74cc6cb6ab316de4451eeca6a7a612fcf8d8bca423e11e9f48dbe03be6203a49a95ffe668d0a79da0e312fee3d85e314682f46e420d6358
+EBUILD libsvgtiny-0.1.8.ebuild 741 BLAKE2B 6979064163e0661a519291241826b03a9c2b275cb48234207fd3aceba7bd682e17ab7f8f738e82083dbc6820b0d36cee67d37814a7ae53e4209d2cf25c995591 SHA512 087202901a16f2e703102fac8887677904cc1aac8f1473bcf902f45d99e4330b5918cc483774815faea974311e338a1bdd911fd46728b381d382778091cb762f
 EBUILD libsvgtiny-9999.ebuild 721 BLAKE2B 2f00910177430a5ad177ebaacdb9b716b59aa39897391c8b05456e1c26bae4b1004f287bd964ee0a132b994b1ff7171e036e95c840174adf2abbba75970144a6 SHA512 89df8561087e8f88371d282aae1e0039032fadff0be14731c6c3d70cfaee72ef1c5c848488246c24f50722fe5ffeb5909896d79e242d2057baeb77ce35c89def
 MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.8.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.8.ebuild
index b2fd0472c935..da983003623a 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.8.ebuild
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	net-libs/libdom[xml]
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index da55608c8b08..680a239cb761 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,5 +1,5 @@
 DIST phonon-backend-vlc-0.11.3.tar.xz 67196 BLAKE2B 597ead8300bfcd4dd1a94ee1733e77ea15436eea01924093ba6655d08de7b2334cd39c10e61655adcbf12e5ca1afb239c0ee0bd05fefe2e294cc1cb1ef5c7799 SHA512 11593d15874734d92922bcfd8e038a2a4f528d9145d525d6654aad7bb9d7edb911f31f564d83217341dff3be973c8cf00d91f03b66a90305f4f7ed97c2d57033
 DIST phonon-backend-vlc-0.12.0.tar.xz 71664 BLAKE2B 9ace1020d8e9a9e97243706ff81703d3f22bf892f402e44451147a24547d09bcf12f5745377c01d65b4d1fb03cd975b323b2cab62f8136880d1d9c004cca7d7b SHA512 78f5ead829d5025c7cb9e01b33819514d795651d1d932c03bd8cc2ad5d427e5aaaeeb6016820d5a7bb9907f6df1142a0fbc097830d7c63b01f77d2167a0c9264
 EBUILD phonon-vlc-0.11.3-r1.ebuild 736 BLAKE2B 68e053bf42c51ecbbad2f94e76cb8b1d982d706320cd4913aa9954cff08b7f4f6332d1f8739bf664c6dda930dbec3ec88177dd6a530c95a36caf6ec59467fa6a SHA512 f5c1296f63b6d71265c4d77b224b38bbc2ccc3b70349bd07db9432643796407f4661d3da97b8a75a556bc50e560a3290c47e4a264a3303c92d060e6fc1b4039e
-EBUILD phonon-vlc-0.12.0.ebuild 1012 BLAKE2B 7136746914bcee3a5b95744639ce852709f425004d8fcf3de69ae728236cc299a746c70b2b745dc762f8b2ef715b6f70fab40aa10d898a91e6316b3ae181998a SHA512 0dbd0c0497afa81012ce9af5ed952c211a78a0da0c636be08931007d0698d4572e06d2cd636d8849bd504ab7ef4600beca89d009ccc438195145d379c3e50f11
+EBUILD phonon-vlc-0.12.0-r1.ebuild 1786 BLAKE2B 4189ecf5eb77de0b1eb4b48862dec2f4562fa4bb23fe2457cbde82650954023c3b31ab15c8fb051be95a2fa2b6e3ef55d66bcd964ba90fb264e1cfd3d792ba89 SHA512 ddfe137f75c78c7309eda5eb9cf1e49320b2e2266ef98237d349305f6c5c772d01d04b2b4255d9358f91fad7d925e42a7e0720e9b667ff6599d1881aa709e92a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild
new file mode 100644
index 000000000000..bae71d282ec3
--- /dev/null
+++ b/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic kde.org multibuild
+
+DESCRIPTION="VLC backend for the Phonon multimedia library"
+HOMEPAGE="https://community.kde.org/Phonon"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz"
+	S="${WORKDIR}"/phonon-backend-vlc-${PV}
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="debug +qt5 qt6"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+DEPEND="
+	>=media-libs/phonon-4.12.0[qt5=,qt6=]
+	media-video/vlc:=[dbus,ogg,vorbis(+)]
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/libpcre2:*
+	virtual/pkgconfig
+	qt5? (
+		dev-qt/linguist-tools:5
+		>=kde-frameworks/extra-cmake-modules-5.115.0:*
+	)
+	qt6? (
+		dev-qt/qttools:6[linguist]
+		>=kde-frameworks/extra-cmake-modules-6.0.0:*
+	)
+"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	use debug || append-cppflags -DQT_NO_DEBUG
+
+	myconfigure() {
+		local mycmakeargs=(
+			-DQT_MAJOR_VERSION=${MULTIBUILD_VARIANT/qt/}
+			-DPHONON_BUILD_${MULTIBUILD_VARIANT^^}=ON
+			-DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass
+			-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
+			mycmakeargs+=( -DPHONON_BUILD_QT5=OFF )
+		else
+			mycmakeargs+=( -DPHONON_BUILD_QT6=OFF )
+		fi
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild
deleted file mode 100644
index 62401f9834d8..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit ecm kde.org
-
-DESCRIPTION="VLC backend for the Phonon multimedia library"
-HOMEPAGE="https://community.kde.org/Phonon"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz"
-	S="${WORKDIR}"/phonon-backend-vlc-${PV}
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="+qt5 qt6"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-DEPEND="
-	>=media-libs/phonon-4.12.0[qt5=,qt6=]
-	media-video/vlc:=[dbus,ogg,vorbis(+)]
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	qt5? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPHONON_BUILD_QT5=$(usex qt5)
-		-DPHONON_BUILD_QT6=$(usex qt6)
-	)
-	ecm_src_configure
-}
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 3f348fca130f..8aa70fc045c4 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -2,5 +2,5 @@ AUX phonon-4.11.1-clang-16.patch 1356 BLAKE2B 2adbe00797db0efab8a065c455b8122bea
 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.ebuild 1456 BLAKE2B 01b08b2a71cc3a00e9d17d6cb5c495da19812cce2b5be202f4a3dc3f619f3745902c41963949189e8bc0e4abcd1adbd467a817c42372e783510653704abdeab0 SHA512 e1239d965243c5cfb48ac4e05b82bfaef57aab0c01003d67a6fbd3bcff3291d6e6fea5ec59c8e39283e9a8225855b94cd1d0eaeffe84c47074bba96d93df4466
+EBUILD phonon-4.12.0-r1.ebuild 2328 BLAKE2B 115e00846beaffee89aea5a68885fc006fb463cea10e1bf97d7f7d7e65ecd43b196e250ea9f865307363e1124d0b6da41f5fbfd1afe261cc24a3081034d73b27 SHA512 b973515a50ed308451de8bd910a8926396afa3b0ee2bcdf4e30922effec089111b7309206e3a955dae0ac85115768df5a72a052f4886f92702e84a1c1fbbd675
 MISC metadata.xml 463 BLAKE2B 856a539bfa489dac4d6550f9fb4104b419dc6dd12a5d6ec67ac7d9f743fa31d96c3323937558704b7941a914c1ca342b5a6030e9f16b7d84f2339f93d2a1fb9f SHA512 c6aa1e0f8f11e813c228619f9c857bfa3e15d3278a1b5af3910f8f789a7d93f889a9adb9121f19b4b52abbfa0b4a67d89a037679ae0eab00b0db04ed5e16526e
diff --git a/media-libs/phonon/phonon-4.12.0-r1.ebuild b/media-libs/phonon/phonon-4.12.0-r1.ebuild
new file mode 100644
index 000000000000..9efc34081dc0
--- /dev/null
+++ b/media-libs/phonon/phonon-4.12.0-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop flag-o-matic kde.org multibuild
+
+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 pulseaudio +qt5 qt6 +vlc"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+DEPEND="
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libpulse[glib]
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		designer? ( dev-qt/designer:5 )
+	)
+	qt6? (
+		dev-qt/qt5compat:6
+		dev-qt/qtbase:6[gui,widgets]
+		designer? ( dev-qt/qttools:6[designer] )
+	)
+"
+RDEPEND="${DEPEND}
+	|| (
+		kde-frameworks/breeze-icons:*
+		kde-frameworks/oxygen-icons:*
+	)
+"
+BDEPEND="
+	dev-libs/libpcre2:*
+	virtual/pkgconfig
+	qt5? (
+		dev-qt/linguist-tools:5
+		>=kde-frameworks/extra-cmake-modules-5.115.0:*
+	)
+	qt6? (
+		dev-qt/qttools:6[linguist]
+		>=kde-frameworks/extra-cmake-modules-6.0.0:*
+	)
+"
+PDEPEND="
+	vlc? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] )
+"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	use debug || append-cppflags -DQT_NO_DEBUG
+
+	myconfigure() {
+		local mycmakeargs=(
+			-DQT_MAJOR_VERSION=${MULTIBUILD_VARIANT/qt/}
+			-DPHONON_BUILD_${MULTIBUILD_VARIANT^^}=ON
+			-DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass
+			-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass
+			-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
+			-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
+			-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
+			mycmakeargs+=(
+				-DPHONON_BUILD_QT5=OFF
+				-DPHONON_BUILD_SETTINGS=ON
+			)
+		else
+			mycmakeargs+=(
+				-DPHONON_BUILD_QT6=OFF
+				-DPHONON_BUILD_SETTINGS=$(usex !qt6)
+			)
+		fi
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+	make_desktop_entry "${PN}settings" \
+		"Phonon Audio and Video" preferences-desktop-sound
+}
diff --git a/media-libs/phonon/phonon-4.12.0.ebuild b/media-libs/phonon/phonon-4.12.0.ebuild
deleted file mode 100644
index 63d504edbc32..000000000000
--- a/media-libs/phonon/phonon-4.12.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 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="designer pulseaudio +qt5 qt6 +vlc"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-DEPEND="
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libpulse[glib]
-	)
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		designer? ( dev-qt/designer:5 )
-	)
-	qt6? (
-		dev-qt/qt5compat:6
-		dev-qt/qtbase:6[gui,widgets]
-		designer? ( dev-qt/qttools:6[designer] )
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	qt5? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-	virtual/pkgconfig
-"
-PDEPEND="
-	vlc? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] )
-"
-
-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_QT5=$(usex qt5)
-		-DPHONON_BUILD_QT6=$(usex qt6)
-		-DPHONON_BUILD_SETTINGS=ON
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	make_desktop_entry "${PN}settings" \
-		"Phonon Audio and Video" preferences-desktop-sound
-}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 56a3d9e37ac1..4501ef4116e6 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,7 +1,5 @@
 AUX vulkan-layers-1.3.250-Build-shared-libs.patch 333 BLAKE2B 557bfc8dc1639f31b873ec950dc9d99f4632d953b7c3d104d0b69b68985a0d214a4d5eb42a64d28aeed41a889515305f47f8a1b3646501d36f99d67c79f24789 SHA512 ddd30ac012cfa0e1ea7cbc84c11d4398272c9f2314bb8f0d3a3758f89162239feaff0e1044284a730a8288754dd1b6cab99b98e28199457a81137a7a22601413
-DIST vulkan-layers-1.3.268.tar.gz 5004147 BLAKE2B 228a146e436f3c91df85d853d9fb5f58fe244a3dbbd66ffdaff2fcd27734969b041c1fe8df7cc2142857ac5742c14465cbc6f86a6401c75736e712222c1d2123 SHA512 74282cede73f67ee39ab78b99cd53f78ac0427ec6ca897ec41eb28b0e2d1106006d688bfbfdb2f0924b84149d516d42b1abe3680cdc6019c66457451f19b44dd
 DIST vulkan-layers-1.3.275.tar.gz 5280585 BLAKE2B a9707dc18c4802b1f6fd851ec7b16201035c1809c7e42fcd2d3f08dd7de162a18ee240f9269e233a67c93b49bd69f3babda73265bb9ac343e2924b19fa6288dd SHA512 755bdde7e7129b7a3ed06a4bebdaf11212288802119e0dc224aab63491de30c9b1c25972bdafd4fedbfea43bf6c29cdbc409374e57fbf0331798530a8ae94a70
-EBUILD vulkan-layers-1.3.268.ebuild 1677 BLAKE2B d27d66c2adbf7be1075fec40b950805512e252b3f47789c06f5182f8f4a4b6d36ea62f4dce138c0a2ee9390a9a983ef6ab18e2e489372756f1291d1810cc4d46 SHA512 c6635e5ac32357a4347ad1ffa4c0eed38a5dec96e4d88065051c6ac43708e574c8f155650cbbfd7d7b9c700bbda2e35d9b13d0e43201c17ff1835b2e4f639515
 EBUILD vulkan-layers-1.3.275.ebuild 1644 BLAKE2B 5d03caef5de18f10040bbe5fcfa23526c51684ef95fd9953efdfaa1b217cf11d5e6561ffeb14390c62ab32ea6bd38fcd002120b3a4b0fed80d386ffde9d9f08b SHA512 bd2e9eced89d8161eca83c07d27342abb68e147d60094285437c83aeb9089ff30eef038ff8d70679f24a71eb18f772532df5d91b1223306a02107e9c75dee537
 EBUILD vulkan-layers-9999.ebuild 1642 BLAKE2B 4f3b7567bb5a183f3d3a1929531349a67c732c2dfe9fe2375c4516513f1af16675a622c566b8f47df1a3cc4b575601e1a25acf87c790c2a971d1adfdb5b69bf5 SHA512 7ca20decc9501fc86cddb8b14bab9ec1945d7e2f2a3c6634f02c35b95823be376a875da1941b354d5c76901e29b97b5a470657aea92c9fe0eab875f311ab789e
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.268.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.268.ebuild
deleted file mode 100644
index 3dba3a5951c4..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.268.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-ValidationLayers
-PYTHON_COMPAT=( python3_{9..12} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-cpp/robin-hood-hashing-3.11.5
-	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/spirv-headers-${PV}
-	~dev-util/vulkan-headers-${PV}
-	~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-PATCHES="${FILESDIR}/${PN}-1.3.250-Build-shared-libs.patch"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WERROR=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name \*.a -delete || die
-}
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 6e6d35543cbb..3257220d4f01 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-loader-1.3.268.tar.gz 1689273 BLAKE2B 6d7c1bfe82f594a68f3298d884efb61556b6d408357eb0360db2103af17bd47f981916dcc7584f8380c2530a88f05d59faa0754993975219e1955941dd3d32d8 SHA512 01e5f281efd5702b9930cecf3148aad9a79812c54e780a5a8ff2df2326ae10511001f1b6e3ebde19e47de229a9c97f6195b6b1e9fb7b3b4c88a4d1b6746f7aea
 DIST vulkan-loader-1.3.275.tar.gz 1701415 BLAKE2B c92cc2d3ff3c90eaaa820f0f857030ab6f957d0691f7cbaf53985bd4d4c6f0f2b4222623740bd2c433c2e0116545af37b8ac9959b554b800ca95a978fd1b14b5 SHA512 7af0110083ab827e4ea8b4ea3e3ce00d9387f27f5725cefd426fa4dee4b80bc83210248c2968577a90bb82de8efb1a68691a1bdb93769f2f04600c5a3d3eff91
-EBUILD vulkan-loader-1.3.268.ebuild 1568 BLAKE2B 153b080da25011f793dbe68054820ee26b7068d42fead991a002f56cf36920ae4da07c9c99896a954b09d4b7b6f346d791d6d793fbc18946d2dff75225752657 SHA512 6e05bfd8d3ea9a12148724fb2737d4dd1c21420cc4f1c862c181c392e5ab78aacc1902e5f1174ab8db9681bb3cdc4e3586ace00f30dc844161e31e95258ac145
 EBUILD vulkan-loader-1.3.275.ebuild 1546 BLAKE2B 7d3b40829acc8939a7d592fe6db0d9cda8419aa342879c4ee99de6c8c65518e1b95bc58776f259dec45403c418c7d2662b58865832a9b683bfe686d8b427f911 SHA512 5a49910f2e06cc373dc101fbfbff0415a8c65d20ec46f21e4fdd19735b08138cedc7aba7594e88cca591b512d1ecab23a64acea2b4e37c6efc94da98944bbc69
 EBUILD vulkan-loader-9999.ebuild 1562 BLAKE2B 19ca31786af5a26cc88d508374efebd1bb3f2bd7929ad0236b4a1bd70fbd5c54e44b149e8de23bb51ec8448a7bdc8573dca7adc4de45517b157f98b87ddfac2f SHA512 89f8b81fa6b47fa6a94abd3fa15e9b52b184de225b2e0a5df4cf833f9db804b7dd087c73fa12167ffc4d06414cdd50487f4ea462f78127810f0d23eadd3e8d1b
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.268.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.268.ebuild
deleted file mode 100644
index a28952b5780a..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.3.268.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-Loader
-inherit flag-o-matic cmake-multilib toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-DEPEND="
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-		-DENABLE_WERROR=OFF
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}