gentoo auto-resync : 10:03:2025 - 01:49:12

27 files changed, 131 insertions, 870 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index a2663d62b3b5..b340c0ba5926 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index 6e788be8120d..00aa532b30b1 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -4,5 +4,7 @@ AUX aqualung-1.2-mac-dec.patch 5038 BLAKE2B 0b27d435d530e3c71bf85350b85073b04cfe
 AUX aqualung-1.2-mac-endianness.patch 2441 BLAKE2B bf2009142e01824e24c819c49a2b32f3dbd96a52268834dabf6ba61ddf97b56f547f3508081cbea96f098fecb41e19f7bb0c543fdadd2208f11a216a00dfe626 SHA512 a664e112e058adbe817aee5f5d376f6720ecc6592d543b4a49634150207e8c3a248b3c9e18cfbc1c313818b6d6c435859aca515f7932379dd178d1fea012181a
 AUX aqualung-1.2-mac-glib.patch 605 BLAKE2B 8b61a45446488a19cef5a721e855935624ece57e8378ff8ea0236f970523a5178123885d4dde35d5a32802395969a4c8d574f9caaacbb5353f9f9f4d1c380207 SHA512 8ce3dfaa6ebbe5254fdb69dfbf81e27d6d91e15c9da22a77e9fcfb00c13cf3d817f6bcf49f976c7a71dbab2ede90772c173334ca5ab8a6ec4d66e6b606dfbe23
 DIST aqualung-1.2.tar.gz 1974910 BLAKE2B 4956865a5897cf92d3ebb65cb30f27164e7717fadbbff8e275b25d5fa9c60382846877f644d3a8393935df82f9b92d282fe41befe27cd86accc3f6885650063f SHA512 0e11f307344c8ada7f3869d953e6fb8b088a8af345d51f3e93af18b4b57ea6f35bbc47eefea40956114d56882e4a0d66c1496a7b9a14dfd82e6a95cfc0ef52c5
+DIST aqualung-2.0.tar.gz 1657433 BLAKE2B 6523643aedeee5e5ca6c551d48620f56ed956f3664ec0c39f61ca9bd2e510c084d00b45535a6bf666a51d03563b9b8de0c07708a64bfef5e8edbb8434e672b50 SHA512 a0a3e128574853ee0c3f59c575f6fd1bd3651ad40ccfa68b14f4f52c2b3c52c2f1ef19a5234b40036a170cb3502126fe724d9dc6f3689d8fd804d5b735806188
 EBUILD aqualung-1.2-r3.ebuild 2796 BLAKE2B 51f7985bba2cf3008601f8b7689500f2ad0304e6927ac70eedef132d9d34f475e7322a76f684466f78c1fedcdb34611cd6052b9607a50e679b9f20c5d56fdbc2 SHA512 10527e97abd4adb5ac6b2e24054e8897add7eaec23c383c3f63165c95989c7c1f25cb133886fb1d07f340467eead73378a75f955fa03923830ac76e5141d7358
+EBUILD aqualung-2.0.ebuild 2669 BLAKE2B 946efb8328117fa78e821cf063c6bb3e3cd6a11a13d172d59b143d7c2a21256b639bc00ce14e8741ffe9eb06132724c3707018f5a2dcc72c640662d407f3469e SHA512 5e075f6e27bc623a6d58ef365b301dad8e7f9f35ecdcd3f1726d736708663c2340b417940a03dfccd367694088ef05bace0170b2aa7aa94662ab90417e3bf6bc
 MISC metadata.xml 919 BLAKE2B 66ad98450937b883d555b01bb05777de0bd00fba596231586d064bed7502f391b13235cb4a55366fc9146278047b177f895feddf94c59597bca5c5e92001ccd3 SHA512 1ccc8d585cf46e8d7c09f6bd8182e6941442b7045ab5243598b2c18b946c93ee8aa2fd257ba54af6db6af2689e33676967e266149fce2dc79e650afa480f828c
diff --git a/media-sound/aqualung/aqualung-2.0.ebuild b/media-sound/aqualung/aqualung-2.0.ebuild
new file mode 100644
index 000000000000..2c08c8571c3e
--- /dev/null
+++ b/media-sound/aqualung/aqualung-2.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit autotools desktop lua-single xdg
+
+DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
+HOMEPAGE="https://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
+SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
+	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
+	vorbis wavpack"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/libxml2
+	sys-libs/zlib
+	x11-libs/gtk+:3
+	alsa? ( media-libs/alsa-lib )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac:= )
+	ifp? ( media-libs/libifp )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lame? ( media-sound/lame )
+	libsamplerate? ( media-libs/libsamplerate )
+	lua? ( ${LUA_DEPS} )
+	mac? ( >=media-sound/mac-10.24:= )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	pulseaudio? ( media-libs/libpulse )
+	sndfile? ( media-libs/libsndfile )
+	speex? (
+		media-libs/speex
+		media-libs/liboggz
+		media-libs/libogg
+	)
+	vorbis? (
+		media-libs/libvorbis
+		media-libs/libogg
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1-configure-lua-version.patch"
+	"${FILESDIR}/${PN}-2.0-configure.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		--enable-loop \
+		--enable-nls \
+		--enable-transcoding \
+		$(use_enable debug) \
+		$(use_enable podcast) \
+		$(use_enable systray) \
+		$(use_enable jack jack-mgmt) \
+		$(use_with alsa) \
+		$(use_with cdda) \
+		$(use_with cddb) \
+		$(use_with ffmpeg lavc) \
+		$(use_with flac) \
+		$(use_with ifp) \
+		$(use_with jack) \
+		$(use_with ladspa) \
+		$(use_with lame) \
+		$(use_with libsamplerate src) \
+		$(use_with lua) \
+		$(use_with mac MAC) \
+		$(use_with modplug mod) \
+		$(use_with mp3 mpeg) \
+		$(use_with musepack mpc) \
+		$(use_with oss) \
+		$(use_with pulseaudio pulse) \
+		$(use_with sndfile) \
+		$(use_with speex) \
+		$(use_with vorbis vorbis) \
+		$(use_with vorbis vorbisenc) \
+		$(use_with wavpack)
+}
+
+src_install() {
+	default
+
+	newicon src/img/icon_64.png aqualung.png
+	make_desktop_entry aqualung Aqualung
+}
diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest
index 2e7e70704e84..2798330e93a0 100644
--- a/media-sound/audex/Manifest
+++ b/media-sound/audex/Manifest
@@ -1,7 +1,5 @@
-DIST audex-24.08.3.tar.xz 711860 BLAKE2B c93255a6be4e76f565d32e2c9b638983b619aa3962a2ac9ca60cf7ee48fa9856a12283c97409c8e11f96084e8ff891dc7d958bfd5e7326dcbd74c0300c393686 SHA512 0779e8c82f6c92a51ef772171bbc51c309280f1b85d7e2c003efa841eb656d8bc3ad50e1ff0fa51b4f6117655aff10252b9aa8df6b90fddc6b556f2bc10946a6
 DIST audex-24.12.2.tar.xz 724608 BLAKE2B 00fecb14a390696d7b201dd7d579cad8060275a31eaf83539c23dc88fe3fb595773fa3d8d71908fd998754de41eef40e66c15261b65fd2f975afc712fba322e3 SHA512 fb7dab5d1969a1eb14cc9ce38968a192b1b59c0a0ceed08354fd38e1a6df3d43251b53c46008272ad416a1180329ba24bf4d1949db31cdc07165d61338f3ea95
 DIST audex-24.12.3.tar.xz 724704 BLAKE2B 116600d5200dd5faccf23b1598b6b96c06d198e5b8f711c8bd23c7a76cf437bdce4af5361721a9f52e043ef3755b6cbac5a1c0c00c8565a119a7118cac5941a5 SHA512 04d02eb635705d6a5b2a5194dffbddaa7a7406327f480c81cb613a161da67439ffcdbd124872d2508319134c9ded5a2a1a2b6b0d32ce4aa3a436366799d7af83
-EBUILD audex-24.08.3.ebuild 1093 BLAKE2B db66a15006f0146c997fdc3cefe2ff6542f02e9f67f428da7b2978a2f09b5f15bb75c3a2fd73c9f823e9a558f585bede9151587ed97635f53ff86573e08f4ab3 SHA512 1059ff6e5d75fe4be3d1fd8e5ab1a565cffe7b32c187706536d0e1f51d2752783755537462c2a459ef5f33f51439df1b2ac7eed097aa21b8fcf4d95e54cb1c54
 EBUILD audex-24.12.2.ebuild 1093 BLAKE2B fd07c9a898b07a4eec6be72ce44cdbf244f47b55058329e7d40c34542784c44b72cec1f605a76faff61cde525da1aadd46b5eccfbbccf1aae75865ee66e3b73c SHA512 1dffd66026290c4b801ae7c383012b1e11fdff48d6bebe37c43a7ee8025361e004ff9f3f5f6b2f3f32b6afb96f92f7f2f8f37fb1250a92577960d6b834833857
 EBUILD audex-24.12.3.ebuild 1095 BLAKE2B 6e7a1988195a5d29787b93c1d02a1a377bfeefad1173f39d9291333a6a972afd98ce8d11e621112484777037eb4e5468b5e4913796a392371709742b66de9056 SHA512 b622e6898df6ebb8b06016973de89c493cc7c4f9e68d1daefd447017b879a8783311f76e7cd4e8f030ec6d248a9bc0971282621110c6749cdcb77b8b2d353520
 MISC metadata.xml 378 BLAKE2B 3364d201ed8d0e27a85b8ff1db8dff1f76d3d44933ced0a1ffe14921f7fe8ef37f2d94c0e9fffb81a0a6181770f411c6bf061175200b92e686d061276b7751b5 SHA512 704ad11b3e7156c5a83c2a6e439a6c718acf9f520a17e8718b90ea3bb21e185b364d12998ed1929b90ba84c4f599e06ff02d27980176aeeea1dd8f3252b27385
diff --git a/media-sound/audex/audex-24.08.3.ebuild b/media-sound/audex/audex-24.08.3.ebuild
deleted file mode 100644
index 1b8e713b9f99..000000000000
--- a/media-sound/audex/audex-24.08.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Tool for ripping compact discs"
-HOMEPAGE="https://apps.kde.org/audex/ https://userbase.kde.org/Audex"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-apps/libkcddb-${PVCUT}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	dev-libs/libcdio:=
-	dev-libs/libcdio-paranoia:=
-"
-RDEPEND="${DEPEND}"
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 6fdb31991b64..6a8d496f2bd8 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,7 +1,5 @@
-DIST elisa-24.08.3.tar.xz 1909116 BLAKE2B 1f1fd6f767bc7da4a0ba9ef5d6472138cc8a4107211fb061a7d6fba0304ba79fa6ac4bee0ee631b26c4743e9a44ac5ea7e96767762c346f27b7fee649ba1eb30 SHA512 a81950f2f2248e8590ad32c056b56532c0ba847e885abf0aed8109746d3db69a96293f66c91e7670f9b5bfd45a61d91c97d3ef78a95ea217f33ad8f8b18b43cc
 DIST elisa-24.12.2.tar.xz 1924736 BLAKE2B c000d9a887d2b2ea161e2e22aa3af86ff7f30eda8d5972e09755336c1324afc63b729173a9227d6fee581ed612384de64ecb984a7401354d31d2ffe653a7cb48 SHA512 d765f929ae6c707c1d25def095b420877f82071fbb46072c35b9f46fb71bbd61ed382804df261f445046150598972cc0681f2d6e376acd2ff32a8aa672fcdbec
 DIST elisa-24.12.3.tar.xz 1483796 BLAKE2B 60cd0d82989ef227eb2c6baf808b4ff985b64ae80a7f9fe8b91507be2f1fae2b83189b0e51faaed15de748544e190c72b4b98c864e33554c7b4da3fe7cef9044 SHA512 523897c8f6f008b29e46527a4ea05b8859690934f690511de3b29730bcb5c605a8cd89226340d076d0af2f6cbfaeb83a93090cd53232698689e40be2dd749882
-EBUILD elisa-24.08.3.ebuild 1383 BLAKE2B 72dc75aef9df06948894bdfacdaa0ffc28180f29aed23b186dd0be501c17c6df06beb16776b69d81766168074e79d832ab0c9a901afa64b2bd13257d0ad673aa SHA512 6277a71fa6426f47047f055d9e24d62042918039af23acacfdd5e8480d5d7238e224ad1f198ada2ba5f0a8bb3483ff6c28a8a788d8dfb7681a31b17089230be9
 EBUILD elisa-24.12.2.ebuild 1420 BLAKE2B 7d79e1d1336424ec9786853e190727a2748c9ff3585f828ba0401fc0f9d0ad066dfde77f192b4b7d4e9e5ce69d14e695594f7cad24b78a6bf4fc293880f88a28 SHA512 a484080d92638d2107758acb26dab6f8bcb49328f107d326a44fb76f166f3a7fb6e486393eab251a795f0e4e8f83a5d6e93c8cdb7fde9b3a605864e25b8c018e
 EBUILD elisa-24.12.3.ebuild 1422 BLAKE2B 1bf305d8f61e213c5b888a60614c5b32c9ca845bab9e43349b5d9140de220e9fb87886750c1c5579b25c2a0052a4d968e0836bdc34543e576f08ee053e52099d SHA512 bb20598425baccbabc8e94f776febb22c498d037e487f4dfc5c7c123717bbe97648821c171ad9e7354e98e6b87bf9508fda7533e5dbdc4936a1a4590bba1a08f
 MISC metadata.xml 493 BLAKE2B 34b3c8c5f95ef87ae3246bc61003e44b2e7c72e1a98f0fc38e9c8f51934066b4c375e403da5e5c1525d88c33aecc1e91b0e1c7a537d89411678f4e6e26da6586 SHA512 e59ac559e2ef11d5f3550b95fac490059b1f6be76ad5781d0be5e45bb860c0709992cb928fbc1e2584d1ad71359c9c65e2d53cbf124f411d1b6b016ab583e751
diff --git a/media-sound/elisa/elisa-24.08.3.ebuild b/media-sound/elisa/elisa-24.08.3.ebuild
deleted file mode 100644
index 8f597d70e589..000000000000
--- a/media-sound/elisa/elisa-24.08.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://apps.kde.org/elisa/"
-
-LICENSE="LGPL-3+"
-SLOT="6"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
-IUSE="+mpris vlc"
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-libs/kirigami-addons-0.11.76:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,sql,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kfilemetadata-${KFMIN}:6[taglib]
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
-	mpris? (
-		>=dev-qt/qtbase-${QTMIN}:6[dbus]
-		>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	)
-	vlc? ( media-video/vlc:= )
-	!vlc? ( >=dev-qt/qtmultimedia-${QTMIN}:6 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qt5compat-${QTMIN}:6[qml]
-"
-BDEPEND="sys-devel/gettext"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package mpris KF6DBusAddons)
-		$(cmake_use_find_package vlc LIBVLC)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-sound/gogglesmm/Manifest b/media-sound/gogglesmm/Manifest
index eb0c0f277047..442494e3d93c 100644
--- a/media-sound/gogglesmm/Manifest
+++ b/media-sound/gogglesmm/Manifest
@@ -1,9 +1,4 @@
-AUX gogglesmm-1.2.1-fix-build-taglib2.patch 11093 BLAKE2B db9efa55420f3594d78f66de4e212e4a2b77f7d2f4fea8b2f91df413ba13fb568ff8657aa3f150d47334662b5c3d8cdd7ab444edd59c7e0c14d23137dbda1e6a SHA512 898d26784cd35e100f7f3f465ac26ae46e4a33f03919a7728d75ea8c05f07435f854a45e7c53d308eeab1fea2cf9d2c11ceb592d38d4ea03c61b45163ed83277
-AUX gogglesmm-1.2.1-use-fox-1.7.67.patch 3708 BLAKE2B 6a19c7ca433f726b1fb06bb24c892571215760479d35f46905c0235940e47cbc7b55945ff01dbc73a0bd7aef836871a807a7eff93410e538da7a596a9b1c6848 SHA512 55c97f9cb3126bb641c4ef38cb27adaeb8d0711646374c4aa797230df7d50d692f2299db3f2123fac6595f163c75811d4f5b71be349701f0befb921897dc2288
 AUX gogglesmm-1.2.5-libsamplerate.patch 1924 BLAKE2B eeab6cd92b37ec8c3456b96f02cf14ec35e953c01ce32c59db171bd5e4c98ab083049e74c343b3b93afe3005a75b010a9a8240db8c5fff5c8f9197bf4fd53bf4 SHA512 6d8889119eed26c285f1b01952ee513998024a621316803ca1f455c15891dedad1177730666859f6d0d892d5c72d1461ab375a5e0c62c69e1279a9cff97f0089
-DIST gogglesmm-1.2.1.tar.gz 3015072 BLAKE2B 6a33ba6b678bc23e449898e4f492064301ca9c37239d713fa5ccb857d51bb4c4cf5dc1d4576f2f6dc745eaff607f4400e5600f45c4cbdde8c43cee5ca1fc34f4 SHA512 c165ddde463afcf863b74f00dfa1566077007f51617fa00a95dfcdeeab49da9ee87406f6bdc7779c597002d1e587886c7992e9e892ce4988f3bb14f015336547
 DIST gogglesmm-1.2.5.tar.gz 3174015 BLAKE2B d3d47f51d69a911989c17edd77763d43cee3354837b56b166881d34a3d8367feca5a7219922392e3ec2570e8df10ebdc277fdcd527694ccd29c5038a345558f7 SHA512 2e05695ac7e4a776cd7a4fb14cb096e3543f73bba60c8c820803358e0342002d760d1acc77efc959459968313aaec23d446d2b14e0435f88f4f9a2d0e56e7c3a
-EBUILD gogglesmm-1.2.1-r2.ebuild 1127 BLAKE2B 078c99b843a7225edac9512709b02c8bb93ebfbbc409071cd442fdd68996790a829ddb4b00b695a5d6da7ad2f77a3ade61279025d612c20b152151966657a415 SHA512 c23eb70c6261da550b3c55b322893d55b73c23fe462c0e72335e9c416e00fda6d8cd311f1476bf28da4d68e46a24b9e400cc609ff69eaacf825a3e1d67da040e
-EBUILD gogglesmm-1.2.1-r3.ebuild 1129 BLAKE2B b833535418246484e4725a6d77fcfe3b2ad9012cdce3cfff0cc8aacb31ee4b38446649cf452055a518f6f3b0c26f231687be4ec6155e40b3aef981ea202a81c2 SHA512 88d3eef3fb1cc88495f382791f0d1a661e68421c1fbc4c6e13aca08ef3265de38d4090dc1bd4b7335a06bc28deeebf98e9bc5862dc0dece52a1e2a4f0ce78010
-EBUILD gogglesmm-1.2.5.ebuild 2356 BLAKE2B 3774bd43ae576ce3466e9f9bc2e6024c59d7ade27e1eec88424192450ff1727cff6e611b5df339e8faeb0b07497c9590378b5c6c156ccfa075aea2a8cb73db03 SHA512 c2e8722747cce74198f97535577e7bd8ff7c2192db6cb974fde1cea67e80e8ad6d0edd8a736aedd56d7267c2f3eefc8e338e612f070641214a84913bcf76d6f0
+EBUILD gogglesmm-1.2.5.ebuild 2354 BLAKE2B 1765b676fb964a29d25102dcd19e67633d7757e163f1cf6a3122ba3f0117f621685d72f6c7b490a89d14c08eb77274b95396054cd45a96fc9dac76951e73a059 SHA512 7389a6414134ecd8d3ecc9bc67cb9c1410b241ace984d85955213921338a65e057ec6cc5de274cc43ff09386ad8eaa86962789754b98e54dbd4bd1ffaf416d0e
 MISC metadata.xml 821 BLAKE2B b3a1e128888362f3a56069e5929cf9f35e53a1092e3ed0c723cae275b0a29053061b1a43326fa8fb8741021df7d1f787e3a1b9f508f83029216dce5218895b5e SHA512 98d759b05be1f6e4133152a1d5a462afa9bf1ce5b28ad5e00a3383a2bfb4224930b196fb6fed7c16dcaf470bb465087767a45a3c0060f7a7f3b9b2d25f73b685
diff --git a/media-sound/gogglesmm/files/gogglesmm-1.2.1-fix-build-taglib2.patch b/media-sound/gogglesmm/files/gogglesmm-1.2.1-fix-build-taglib2.patch
deleted file mode 100644
index fd53ea74c4f1..000000000000
--- a/media-sound/gogglesmm/files/gogglesmm-1.2.1-fix-build-taglib2.patch
+++ /dev/null
@@ -1,357 +0,0 @@
-https://github.com/gogglesmm/gogglesmm/commit/abd6ec6b8270feb1841a97f9be5364541f4a939c.patch
-https://github.com/gogglesmm/gogglesmm/commit/9f7110b0950a2862016e18163b9c2737a2a935d6.patch
-
-diff --git a/src/GMAbout.cpp b/src/GMAbout.cpp
-index eb2c565..0b625cb 100644
---- a/src/GMAbout.cpp
-+++ b/src/GMAbout.cpp
-@@ -27,7 +27,6 @@
- #endif
- #include <FXPNGIcon.h>
- #include <sqlite3.h>
--#include <tag.h>
- 
- #define UTF8_COPYRIGHT_SIGN "\xc2\xa9"
- 
-diff --git a/src/GMTag.cpp b/src/GMTag.cpp
-index 2add466..a32ce46 100644
---- a/src/GMTag.cpp
-+++ b/src/GMTag.cpp
-@@ -26,9 +26,9 @@
- #include "GMTag.h"
- #include "GMAudioPlayer.h"
- 
--/// TagLib
--
- 
-+// taglib Variant enum Type { Bool } conflicts with Xlib
-+#undef Bool
- #include <fileref.h>
- #include <tstring.h>
- #include <id3v1tag.h>
-@@ -339,6 +339,7 @@ static void gm_strip_tags(TagLib::File * file,FXuint opts) {
- /******************************************************************************/
- 
- GMFileTag::GMFileTag() :
-+    fileref(nullptr),
-     file(nullptr),
-     tag(nullptr),
-     mp4(nullptr),
-@@ -349,20 +350,35 @@ GMFileTag::GMFileTag() :
-   }
- 
- GMFileTag::~GMFileTag() {
-+#if TAGLIB_VERSION >= TAGVERSION(2,0,0)
-+  if (fileref) delete fileref;
-+#else
-   if (file) delete file;
-+#endif
-   }
- 
- 
- FXbool GMFileTag::open(const FXString & filename,FXuint opts) {
--
--  file = TagLib::FileRef::create(filename.text(),(opts&FILETAG_AUDIOPROPERTIES));
--  if (file==nullptr || !file->isValid() || file->tag()==nullptr) {
--    if (file) {
--      delete file;
--      file=nullptr;
-+#if TAGLIB_VERSION >= TAGVERSION(2,0,0)
-+    fileref = new TagLib::FileRef(filename.text(),(opts&FILETAG_AUDIOPROPERTIES));
-+    file = fileref->file();
-+    if (file==nullptr || !file->isValid() || file->tag()==nullptr) {
-+      if (fileref) {
-+        delete fileref;
-+        fileref=nullptr;
-+        }
-+      return false;
-       }
--    return false;
--    }
-+#else
-+    file = TagLib::FileRef::create(filename.text(),(opts&FILETAG_AUDIOPROPERTIES));
-+    if (file==nullptr || !file->isValid() || file->tag()==nullptr) {
-+      if (file) {
-+        delete file;
-+        file=nullptr;
-+        }
-+      return false;
-+      }
-+#endif
- 
-   TagLib::MPEG::File        * mpgfile   = nullptr;
-   TagLib::Ogg::Vorbis::File * oggfile   = nullptr;
-@@ -521,7 +537,11 @@ FXbool GMFileTag::ape_get_field(const FXchar * field,FXStringList & list)  const
-   FXASSERT(field);
-   FXASSERT(ape);
-   if (ape->itemListMap().contains(field)) {
-+#if TAGLIB_VERSION >= TAGVERSION(2,0,0)
-+    const TagLib::StringList fieldlist = ape->itemListMap()[field].values();
-+#else
-     const TagLib::StringList fieldlist = ape->itemListMap()[field].toStringList();
-+#endif
-     list.no(fieldlist.size());
-     FXint item=0;
-     for(TagLib::StringList::ConstIterator it = fieldlist.begin(); it != fieldlist.end(); it++) {
-@@ -635,16 +655,35 @@ FXbool  GMFileTag::id3v2_get_field(const FXchar * field,FXStringList & list) con
- void GMFileTag::mp4_update_field(const FXchar * field,const FXString & value) {
-   FXASSERT(field);
-   FXASSERT(mp4);
-+#if TAGLIB_VERSION >= TAGVERSION(1,12,0)
-+  if (!value.empty())
-+    mp4->setItem(field,TagLib::StringList(TagLib::String(value.text(),TagLib::String::UTF8)));
-+  else
-+    mp4->removeItem(field);
-+#else
-   if (!value.empty())
-     mp4->itemListMap().insert(field,TagLib::StringList(TagLib::String(value.text(),TagLib::String::UTF8)));
-   else
-     mp4->itemListMap().erase(field);
-+#endif
-   }
- 
- 
- void GMFileTag::mp4_update_field(const FXchar * field,const FXStringList & list) {
-   FXASSERT(field);
-   FXASSERT(mp4);
-+#if TAGLIB_VERSION >= TAGVERSION(1,12,0)
-+  if (list.no()==0) {
-+    mp4->removeItem(field);
-+    }
-+  else {
-+    TagLib::StringList values;
-+    for (FXint i=0;i<list.no();i++) {
-+      values.append(TagLib::String(list[i].text(),TagLib::String::UTF8));
-+      }
-+    mp4->setItem(field,values);
-+    }
-+#else
-   if (list.no()==0) {
-     mp4->itemListMap().erase(field);
-     }
-@@ -655,12 +694,24 @@ void GMFileTag::mp4_update_field(const FXchar * field,const FXStringList & list)
-       }
-     mp4->itemListMap().insert(field,values);
-     }
-+#endif
-   }
- 
- 
- FXbool GMFileTag::mp4_get_field(const FXchar * field,FXString & value) const {
-   FXASSERT(field);
-   FXASSERT(mp4);
-+#if TAGLIB_VERSION >= TAGVERSION(1,12,0)
-+  if (mp4->contains(field)) {
-+    value=mp4->item(field).toStringList().toString(", ").toCString(true);
-+    value.trim();
-+    return !value.empty();
-+    }
-+  else {
-+    value.clear();
-+    return false;
-+    }
-+#else
-   if (mp4->itemListMap().contains(field)) {
-     value=mp4->itemListMap()[field].toStringList().toString(", ").toCString(true);
-     value.trim();
-@@ -670,14 +721,20 @@ FXbool GMFileTag::mp4_get_field(const FXchar * field,FXString & value) const {
-     value.clear();
-     return false;
-     }
-+#endif
-   }
- 
- 
- FXbool GMFileTag::mp4_get_field(const FXchar * field,FXStringList & list) const{
-   FXASSERT(field);
-   FXASSERT(mp4);
-+#if TAGLIB_VERSION >= TAGVERSION(1,12,0)
-+  if (mp4->contains(field)) {
-+    const TagLib::StringList fieldlist = mp4->item(field).toStringList();
-+#else
-   if (mp4->itemListMap().contains(field)) {
-     const TagLib::StringList fieldlist = mp4->itemListMap()[field].toStringList();
-+#endif
-     list.no(fieldlist.size());
-     FXint item=0;
-     for(TagLib::StringList::ConstIterator it = fieldlist.begin(); it != fieldlist.end(); it++) {
-@@ -936,12 +993,21 @@ void GMFileTag::setDiscNumber(FXushort disc) {
-     else
-       id3v2_update_field("TPOS",FXString::null);
-     }
-+#if TAGLIB_VERSION >= TAGVERSION(1,12,0)
-+  if (mp4) {
-+    if (disc>0)
-+      mp4->setItem("disk",TagLib::MP4::Item(disc,0));
-+    else
-+      mp4->removeItem("disk");
-+    }
-+#else
-   if (mp4) {
-     if (disc>0)
-       mp4->itemListMap().insert("disk",TagLib::MP4::Item(disc,0));
-     else
-       mp4->itemListMap().erase("disk");
-     }
-+#endif
-   }
- 
- 
-@@ -959,9 +1025,15 @@ FXushort GMFileTag::getDiscNumber() const{
-   else if (id3v2 && id3v2_get_field("TPOS",disc)) {
-     return string_to_disc_number(disc);
-     }
-+#if TAGLIB_VERSION >= TAGVERSION(1,12,0)
-+  else if (mp4 && mp4->contains("disk")) {
-+    return FXMIN(mp4->item("disk").toIntPair().first,0xFFFF);
-+    }
-+#else
-   else if (mp4 && mp4->itemListMap().contains("disk")) {
-     return FXMIN(mp4->itemListMap()["disk"].toIntPair().first,0xFFFF);
-     }
-+#endif
-   return 0;
-   }
- 
-@@ -969,7 +1041,11 @@ FXint GMFileTag::getTime() const{
-   FXASSERT(file);
-   TagLib::AudioProperties * properties = file->audioProperties();
-   if (properties)
-+#if TAGLIB_VERSION >= TAGVERSION(2,0,0)
-+    return properties->lengthInSeconds();
-+#else
-     return properties->length();
-+#endif
-   else
-     return 0;
-   }
-@@ -1007,7 +1083,11 @@ FXint GMFileTag::getSampleSize() const{
-   FXASSERT(file);
-   TagLib::FLAC::File * flacfile = dynamic_cast<TagLib::FLAC::File*>(file);
-   if (flacfile && flacfile->audioProperties()) {
-+#if TAGLIB_VERSION >= TAGVERSION(1,12,0)
-+    return flacfile->audioProperties()->bitsPerSample();
-+#else
-     return flacfile->audioProperties()->sampleWidth();
-+#endif
-     }
-   else
-     return 0;
-@@ -1081,6 +1161,16 @@ GMCover * GMFileTag::getFrontCover() const {
- #endif
-     }
-   else if (mp4) { /// MP4
-+#if TAGLIB_VERSION >= TAGVERSION(1,12,0)
-+    if (mp4->contains("covr")) {
-+      TagLib::MP4::CoverArtList coverlist = mp4->item("covr").toCoverArtList();
-+      for(TagLib::MP4::CoverArtList::Iterator it = coverlist.begin(); it != coverlist.end(); it++) {
-+        if (it->data().size())
-+          return new GMCover(it->data().data(),it->data().size());
-+        }
-+      }
-+    }
-+#else
-     if (mp4->itemListMap().contains("covr")) {
-       TagLib::MP4::CoverArtList coverlist = mp4->itemListMap()["covr"].toCoverArtList();
-       for(TagLib::MP4::CoverArtList::Iterator it = coverlist.begin(); it != coverlist.end(); it++) {
-@@ -1089,6 +1179,7 @@ GMCover * GMFileTag::getFrontCover() const {
-         }
-       }
-     }
-+#endif
-   return nullptr;
-   }
- 
-@@ -1134,6 +1225,15 @@ FXint GMFileTag::getCovers(GMCoverList & covers) const {
-       }
-     }
-   else if (mp4) {
-+#if TAGLIB_VERSION >= TAGVERSION(1,12,0)
-+    if (mp4->contains("covr")) {
-+      TagLib::MP4::CoverArtList coverlist = mp4->item("covr").toCoverArtList();
-+      for(TagLib::MP4::CoverArtList::Iterator it = coverlist.begin(); it != coverlist.end(); it++) {
-+        if (it->data().size())
-+          covers.append(new GMCover(it->data().data(),it->data().size(),0));
-+        }
-+      }
-+#else
-     if (mp4->itemListMap().contains("covr")) {
-       TagLib::MP4::CoverArtList coverlist = mp4->itemListMap()["covr"].toCoverArtList();
-       for(TagLib::MP4::CoverArtList::Iterator it = coverlist.begin(); it != coverlist.end(); it++) {
-@@ -1141,6 +1241,7 @@ FXint GMFileTag::getCovers(GMCoverList & covers) const {
-           covers.append(new GMCover(it->data().data(),it->data().size(),0));
-         }
-       }
-+#endif
-     }
-   return covers.no();
-   }
-@@ -1191,7 +1292,7 @@ void GMFileTag::replaceCover(GMCover*cover,FXuint mode){
-       }
-     else if (mp4) {
-       // mp4 has no type information so we erase all
--      mp4->itemListMap().erase("covr");
-+      clearCovers();
-       }
-     }
-   else { // COVER_REPLACE_ALL
-@@ -1216,7 +1317,11 @@ void GMFileTag::clearCovers() {
- #endif
-     }
-   else if (mp4) {
--    mp4->itemListMap().erase("covr");
-+#if TAGLIB_VERSION >= TAGVERSION(1,12,0)
-+      mp4->removeItem("covr");
-+#else
-+      mp4->itemListMap().erase("covr");
-+#endif
-     }
-   }
- 
-@@ -1303,6 +1408,18 @@ void GMFileTag::appendCover(GMCover* cover){
-       case FILETYPE_GIF: format = TagLib::MP4::CoverArt::GIF; break;
-       default: return; break;
-       }
-+#if TAGLIB_VERSION >= TAGVERSION(1,12,0)
-+    if (!mp4->contains("covr")) {
-+      TagLib::MP4::CoverArtList list;
-+      list.append(TagLib::MP4::CoverArt(format,TagLib::ByteVector((const FXchar*)cover->data,cover->size)));
-+      mp4->setItem("covr",list);
-+      }
-+    else {
-+      TagLib::MP4::CoverArtList list = mp4->item("covr").toCoverArtList();
-+      list.append(TagLib::MP4::CoverArt(format,TagLib::ByteVector((const FXchar*)cover->data,cover->size)));
-+      mp4->setItem("covr",list);
-+      }
-+#else
-     if (!mp4->itemListMap().contains("covr")) {
-       TagLib::MP4::CoverArtList list;
-       list.append(TagLib::MP4::CoverArt(format,TagLib::ByteVector((const FXchar*)cover->data,cover->size)));
-@@ -1313,6 +1430,7 @@ void GMFileTag::appendCover(GMCover* cover){
-       list.append(TagLib::MP4::CoverArt(format,TagLib::ByteVector((const FXchar*)cover->data,cover->size)));
-       mp4->itemListMap().insert("covr",list);
-       }
-+#endif
-     }
- }
- 
-diff --git a/src/GMTag.h b/src/GMTag.h
-index 26b76f2..1c5fd77 100644
---- a/src/GMTag.h
-+++ b/src/GMTag.h
-@@ -21,6 +21,7 @@
- 
- 
- namespace TagLib {
-+  class FileRef;
-   class File;
-   class Tag;
-   namespace MP4 {
-@@ -54,6 +55,7 @@ typedef FXArray<GMCover*> GMCoverList;
- 
- class GMFileTag {
- protected:
-+  TagLib::FileRef           * fileref;
-   TagLib::File              * file;
-   TagLib::Tag               * tag;
-   TagLib::MP4::Tag          * mp4;
diff --git a/media-sound/gogglesmm/files/gogglesmm-1.2.1-use-fox-1.7.67.patch b/media-sound/gogglesmm/files/gogglesmm-1.2.1-use-fox-1.7.67.patch
deleted file mode 100644
index bf487b207909..000000000000
--- a/media-sound/gogglesmm/files/gogglesmm-1.2.1-use-fox-1.7.67.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/gap/ap_http_response.cpp
-+++ b/gap/ap_http_response.cpp
-@@ -341,7 +341,7 @@
-         break;
- 
-       parameters.insert(str.mid(ks,kp-ks),
--                        unescape(str.mid(s,p-s),'\"','\"'));
-+                        FX::FXString::unescape(str.mid(s,p-s),'\"','\"'));
-       p++;
-       }
-     else {
---- a/src/GMDBus.cpp
-+++ b/src/GMDBus.cpp
-@@ -60,7 +60,7 @@
-   void setuphooks() {
-     for (FXint i=0;i<connections.no();i++) {
-       if (!connections.empty(i)) {
--        static_cast<GMDBus*>(connections.value(i))->setup_event_loop();
-+        static_cast<GMDBus*>(connections.data(i))->setup_event_loop();
-         }
-       }
-     }
-@@ -532,7 +532,7 @@
-   /// remove any pending proxy replies;
-   for (FXint i=0;i<serial.no();i++) {
-     if (!serial.empty(i)) {
--      GMDBusProxyReply * reply = static_cast<GMDBusProxyReply*>(serial.value(i));
-+      GMDBusProxyReply * reply = static_cast<GMDBusProxyReply*>(serial.data(i));
-       delete reply;
-       }
-     }
---- a/src/GMFilename.cpp
-+++ b/src/GMFilename.cpp
-@@ -167,7 +167,7 @@
-     else if (Unicode::isPrint(src.wc(i))) {
-       if (codec->wc2mb(&c,1,src.wc(i))==1) {
-         if (c==undefined_character) {
--          FXString dcm = decompose(src.mid(i,src.extent(i)),false);
-+          FXString dcm = FX::FXString::decompose(src.mid(i,src.extent(i)),false);
-           for (FXint j=0;j<dcm.length();j+=dcm.inc(j)) {
-             if (Unicode::isPrint(dcm.wc(j)) && codec->wc2mb(&c,1,dcm.wc(j)) && c!=0x1a) {
-               n++;
-@@ -190,7 +190,7 @@
-         if (c==undefined_character) {
-           /* If codec didn't contain a mapping to the required character,
-              do a compatibility decomposition and try mapping those */
--          FXString dcm = decompose(src.mid(i,src.extent(i)),false);
-+          FXString dcm = FX::FXString::decompose(src.mid(i,src.extent(i)),false);
-           for (FXint j=0;j<dcm.length();j+=dcm.inc(j)) {
-             if (Unicode::isPrint(dcm.wc(j)) && codec->wc2mb(&c,1,dcm.wc(j)) && c!=undefined_character) {
-               dst[n++]=c;
-@@ -208,7 +208,7 @@
- 
- 
- FXString TextConverter::convert_to_ascii(const FXString & input) const {
--  FXString src = decompose(input,false);
-+  FXString src = FX::FXString::decompose(input,false);
-   FXString dst;
-   FXint i,n=0;
- 
---- a/src/GMTrackDatabase.cpp
-+++ b/src/GMTrackDatabase.cpp
-@@ -1372,8 +1372,8 @@
- void GMTrackDatabase::clear_path_lookup() {
-   DEBUG_DB_GET();
-   for (FXint i=0;i<pathdict.no();i++) {
--    if (!pathdict.empty(i) && pathdict.value(i)!=nullptr) {
--      free(pathdict.value(i));
-+    if (!pathdict.empty(i) && pathdict.data(i)!=nullptr) {
-+      free(pathdict.data(i));
-       }
-     }
-   pathdict.clear();
-@@ -1424,8 +1424,8 @@
- void GMTrackDatabase::clear_artist_lookup() {
-   DEBUG_DB_GET();
-   for (FXint i=0;i<artistdict.no();i++) {
--    if (!artistdict.empty(i) && artistdict.value(i)!=nullptr) {
--      FXString * a = (FXString*)artistdict.value(i);
-+    if (!artistdict.empty(i) && artistdict.data(i)!=nullptr) {
-+      FXString * a = (FXString*)artistdict.data(i);
-       delete a;
-       }
-     }
---- a/src/gmutils.h
-+++ b/src/gmutils.h
-@@ -26,7 +26,7 @@
-   FXint remove(FXint name) {  return (FXint)(FXival)FXHash::remove((void*)(FXival)name); }
-   //FXint find(FXint name) const { return (FXint)(FXival)FXHash::find((void*)(FXival)name); }
-   FXint at(FXint name) const { return (FXint)(FXival)FXHash::at((void*)(FXival)name); }
--  FXint key(FXuint pos) const { return (FXint)(FXival)table[pos].name; }
-+  FXint key(FXuint pos) const { return (FXint)(FXival)table[pos].key; }
-   FXint value(FXuint pos) const { return (FXint)(FXival)table[pos].data; }
-   void adopt(FXIntMap &);
-   void load(FXStream & store);
diff --git a/media-sound/gogglesmm/gogglesmm-1.2.1-r2.ebuild b/media-sound/gogglesmm/gogglesmm-1.2.1-r2.ebuild
deleted file mode 100644
index a7082b3d01f7..000000000000
--- a/media-sound/gogglesmm/gogglesmm-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Fast and light music player"
-HOMEPAGE="https://gogglesmm.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+dbus +flac +mad +vorbis +ogg +opus +aac +pulseaudio +opengl nls"
-
-RDEPEND="x11-libs/fox:1.7
-	x11-libs/libSM
-	x11-libs/libICE
-	dev-db/sqlite
-	media-libs/taglib
-	dev-libs/expat
-	dev-libs/libgcrypt:=
-	dbus? ( sys-apps/dbus )
-	flac? ( media-libs/flac:= )
-	mad? ( media-libs/libmad )
-	vorbis? ( media-libs/libvorbis )
-	ogg? ( media-libs/libogg )
-	opus? ( media-libs/opus )
-	aac? ( media-libs/faad2 )
-	pulseaudio? ( media-sound/pulseaudio )
-	opengl? ( media-libs/libepoxy virtual/glu )"
-DEPEND="dev-build/cmake ${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/"${P}"-use-fox-1.7.67.patch )
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_DBUS="$(usex dbus)"
-		-DWITH_OPENGL="$(usex opengl)"
-		-DWITH_NLS="$(usex nls)"
-		-DWITH_CFOX=OFF
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/gogglesmm/gogglesmm-1.2.1-r3.ebuild b/media-sound/gogglesmm/gogglesmm-1.2.1-r3.ebuild
deleted file mode 100644
index 37c4e7576662..000000000000
--- a/media-sound/gogglesmm/gogglesmm-1.2.1-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Fast and light music player"
-HOMEPAGE="https://gogglesmm.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+aac +dbus +flac +mad nls +ogg +opengl +opus +pulseaudio +vorbis"
-
-RDEPEND="
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/libgcrypt:=
-	media-libs/taglib:=
-	x11-libs/fox:1.7
-	x11-libs/libICE
-	x11-libs/libSM
-	aac? ( media-libs/faad2 )
-	dbus? ( sys-apps/dbus )
-	flac? ( media-libs/flac:= )
-	mad? ( media-libs/libmad )
-	ogg? ( media-libs/libogg )
-	opengl? (
-		media-libs/libepoxy
-		virtual/glu
-	)
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-libs/libpulse )
-	vorbis? ( media-libs/libvorbis )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/"${P}"-use-fox-1.7.67.patch
-	"${FILESDIR}"/"${P}"-fix-build-taglib2.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_DBUS="$(usex dbus)"
-		-DWITH_NLS="$(usex nls)"
-		-DWITH_OPENGL="$(usex opengl)"
-		-DWITH_CFOX=OFF
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/gogglesmm/gogglesmm-1.2.5.ebuild b/media-sound/gogglesmm/gogglesmm-1.2.5.ebuild
index 4be7cff28f34..8f3b4cb9ce52 100644
--- a/media-sound/gogglesmm/gogglesmm-1.2.5.ebuild
+++ b/media-sound/gogglesmm/gogglesmm-1.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="a52 +aac alsa +dbus dca +flac jack libsamplerate +mad nls +opengl +opus"
 IUSE+=" +pulseaudio sndio stream tremor +vorbis"
 REQUIRED_USE="?? ( tremor vorbis )"
diff --git a/media-sound/kasts/Manifest b/media-sound/kasts/Manifest
index b6420ca26c10..b944fe8d41fe 100644
--- a/media-sound/kasts/Manifest
+++ b/media-sound/kasts/Manifest
@@ -1,7 +1,5 @@
-DIST kasts-24.08.3.tar.xz 619032 BLAKE2B a5c6a0fe14ba94fa0f80fe53eca2c51b30d366142f83eeafc5521de923cd06c601fe5fafb929ac671d1f8081f830eb23e70f93e5a421f78b5f112bb96030e7c9 SHA512 b53e8f97508d2cbe846fa263b75192b36f1c3fa23165f3d21bd13c682ac55522e006e00bfb9dc34e8b8d8c216b4607fe5a4094019dd274097f34a0b2ac09f7a8
 DIST kasts-24.12.2.tar.xz 626452 BLAKE2B aec2a1bdab50619ff421e57e997c41c814d1c0c856483d5d6d970101877a7d1e0a7e24960d558b39971fac5edb70f8744a97dbea74f7169cb23c0076b966d2b4 SHA512 14afb2be22e4bdb32429934b2e52c14718e70f10057161df29959dba834ab55b96180cd6cd434b8935108e3dca136591358090a640c21322a7db554dd72d92ef
 DIST kasts-24.12.3.tar.xz 626512 BLAKE2B 1617b57de6c6bf827c1df4ed9a46615dfcf74882e52ba27b6dd1610e915c8ed19484317279d11ccbfc78c51c0c99b6c364ffc8a90a8e1fc7ce47ce76650a2c7a SHA512 135105b92a744d5a1bf8b6dd159c1782e5f89974e1e12d56fa9d29f1c5c531e6c7622a67a3f819baa0a12acafa61e5bad42dad6af0239f2a4c8fcc63039d30c8
-EBUILD kasts-24.08.3.ebuild 1285 BLAKE2B b2d774a6481b2db0f76d6c92769798c8d75fab57a8157ef29e91c80bce14436896fd74ec231b0b0a9586a67ad63e5401f3baed53d914ec5a4f742b9c80018748 SHA512 45dec9d26feb22ef22b576a21c9aa6100e16fb641ae078bc2127abddd0a9a01b6502259add5ee73e7407885a0466058dd8da47b2d1aec8236094affbad023290
 EBUILD kasts-24.12.2.ebuild 1321 BLAKE2B cc220018e4047ec6cd8ca6bce6d080c3d08cd2ef6a4778a2ad958718cec13d1ac1eb1def0c63df1615387c62dd6703a708b5c5f7e3b83eacb7464105c46831a8 SHA512 ded7ea8ddbeb0a75a6112769615fa03bf17c39f49c6db57db2f310a5812333bc6c9e51b7991c69d4b07823d624c8e3e3e484df2a42b6f32c53030f72db36b9f1
 EBUILD kasts-24.12.3.ebuild 1323 BLAKE2B f07d53085b93265c2426c73e23d2019fe10779f30454c89011aeb8bd7af3d437abb685bd609c24a52433c3a247628679c539bdcc05b16035f8ff1c34453838a8 SHA512 78a5a21b66f60cbea60d8487920a9d9073871f1998e582ce07ebd38dec86cdba6e3bfaea7b09a65b476bbc452ea06931666d20d529e9d83bae4f7a0c67d31805
 MISC metadata.xml 461 BLAKE2B f69d730a1f4e042650158f9819d07209c9d98492076400efebc152aa60950bd512bce5f8fabbd0a1bded16af201a03db57a56ef5c708662d7e8b058c2f0aa194 SHA512 4ac8027c4d3068ba151104708b13c3cbf21617da83e32d7a471421e9007d31ae5122335072bc99c7c2e4e2981e8ce1812e0b4dbf168f6d8adfeb6d079e68793f
diff --git a/media-sound/kasts/kasts-24.08.3.ebuild b/media-sound/kasts/kasts-24.08.3.ebuild
deleted file mode 100644
index fff8fc103b9c..000000000000
--- a/media-sound/kasts/kasts-24.08.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Convergent podcast application for desktop and mobile"
-HOMEPAGE="https://apps.kde.org/kasts/"
-
-LICENSE="GPL-2 GPL-2+ GPL-3+ BSD LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
-IUSE="gstreamer vlc"
-
-DEPEND="
-	dev-libs/kirigami-addons:6
-	>=dev-libs/qtkeychain-0.14.1-r1:=[qt6]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/breeze-icons-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/syndication-${KFMIN}:6
-	>=kde-frameworks/threadweaver-${KFMIN}:6
-	media-libs/taglib:=
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-good:1.0
-	)
-	vlc? ( media-video/vlc:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="gstreamer? ( virtual/pkgconfig )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLE_PLAYER=OFF
-		-DBUILD_GSTREAMER_BACKEND=$(usex gstreamer)
-		$(cmake_use_find_package vlc LIBVLC)
-	)
-	ecm_src_configure
-}
diff --git a/media-sound/krecorder/Manifest b/media-sound/krecorder/Manifest
index ef886067a302..871bfc7073b4 100644
--- a/media-sound/krecorder/Manifest
+++ b/media-sound/krecorder/Manifest
@@ -1,7 +1,5 @@
-DIST krecorder-24.08.3.tar.xz 168280 BLAKE2B 8f17304e9528657be24934ed23d1d7115607454f819f0201b1bc0bc2e840dbce7d8e26981ce0c57977aae6f16665a6e4981d2033640f607b6b49a0aa66cbcac9 SHA512 4697ae0708206a02ef63e023590a5200add598be57306b8c3b0d8d29d5eef7d9cf3ca2bce425de323059b44ee583934312ec05fb9864d6288591822718326dc2
 DIST krecorder-24.12.2.tar.xz 168944 BLAKE2B 514538a91fc292c0c58ff6ce66bb58b542df5b1803c24ea670c814413cf0f0bfc5e70f1e4164d65d992c77695f93fe25f76d4e0ffb5f04d7345a899b7ff7c646 SHA512 2b2ed79baa873c6fd6c8982435b44034d936b3d5888ea51bcb5840efccf3d569ba6c734743fcd41e89db3a44b97e9af4c85725a1cf09d168d1bf19af01631e21
 DIST krecorder-24.12.3.tar.xz 168884 BLAKE2B 56365643d10cf73d0ee4392f354b76f49a6d2546a0f740530250a3e3b334fa94d1de4abf11642eef791d06b9137a329d7c983cdd6d24d28d68bf5a61271e2204 SHA512 f27c9c10598cc434f004acf64e2fe922d8bcb071c0bcc70b8f36c3102e9eb62d3da701a6a63230ec8b898562a865ce0eed949d704b3f57b33f2cea50d7131cd0
-EBUILD krecorder-24.08.3.ebuild 747 BLAKE2B e3524360477f4d5f7ef8c3351f22f274a7ca204fe0239a6da8a02e2f63405520f740211d8b23839f3f889cafcb92d848eab34d618c9546a98a4ab322d21d0b9a SHA512 3621e77b205539110409fd04ad38ab76b84554f460cd1c21405fadb74aabf5ddcd0a588c23be70b72742cb6457e9a6cb271ddf5df8e9ca00cb03b86d07c658b5
 EBUILD krecorder-24.12.2.ebuild 747 BLAKE2B 6aba7cac981ac0b5517ec6b1bdc1c09be75a21ca45dee43ff8e53b5ac39290b0aae0fef09bdf065ee346feb9e2f49398f2a14c79eb00d1cf69fe5c51043d2a93 SHA512 b58814e9551afcea811695943b0515923ca50a4a60f824ede0d1b385d1239797ed27846fb3cf0bd3a8140c19c9b900d8f9f5de882bee33174885b28c7b081eeb
 EBUILD krecorder-24.12.3.ebuild 749 BLAKE2B ca6598ffdbbcb780aed3745b07b09eb8bbd202222c1712b6fce718cfc890931a4dd506c02ad8948dd2a8987a8ed15a811aaa17dd8d5b71079718ff922b2e0b41 SHA512 442c8fdbef5a7c4c4f1b3b8a1f3fe4a093d8f5e7d9328579d0a24f37aac1c754e3888e2a1f29a9b69b2357c0202c87394031157b186a7a4627d503aeeaa40560
 MISC metadata.xml 729 BLAKE2B 5afa1d385a0f5183b46590e95ef8e99b94d235a4720379222d8bbe43ff86e067d6d0d8580767ec31a0e80c38627535540ccb20c27ee09a4066ed268378f25272 SHA512 82df50c08faa64aa436b674336648887d13f77c2d6417a5ddf3c9f75b77ac705d2181dbbdc4bed0bb5d35276f3616f2e339ab48b7d4e3e2234515f245ce8c3f2
diff --git a/media-sound/krecorder/krecorder-24.08.3.ebuild b/media-sound/krecorder/krecorder-24.08.3.ebuild
deleted file mode 100644
index 15bce9ee6d6f..000000000000
--- a/media-sound/krecorder/krecorder-24.08.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="utilities"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Convergent audio recording application for Plasma"
-HOMEPAGE="https://apps.kde.org/krecorder/"
-
-LICENSE="CC0-1.0 CC-BY-4.0 GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	dev-libs/kirigami-addons:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-"
-BDEPEND=">=kde-frameworks/ki18n-${KFMIN}:6"
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index 7356c00edfa9..7a71aa91bcea 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -3,12 +3,12 @@ AUX mac-10.52-output.patch 3033 BLAKE2B 6c507fb39f78711270a2c123bbdb17646764e3ac
 AUX mac-4.11.4.5.7-gcc6.patch 10119 BLAKE2B d6a363f26c7a08c6bdb0e14fea6bb29553427372fa74375c1cf5721f28bd6bbcc6e091cb3703705d773bda93e3cede89725cbe28b8b678307fa3d5eeca1c3a5d SHA512 0439cb133779dd540c5cee6760dd6a8acd23434b60baaba804430883cb6d67ca37151370356e9adec3f031cb02c34d529a8f91618f0f9fca6e58e14a295c3a63
 AUX mac-4.11.4.5.7-null.patch 406 BLAKE2B 8e8c38cebd040bc9728de64c994ee422ee6ab6f403773ff69ea26b85c38ceb4b15ced1b3b6343b36ebc7e380bde54eddf2c13e6c00e8f33cfac99955f6b44920 SHA512 d8fc2ed994b627176f78796980a9d8f4ce386c97aa05ce68085f642f3feb62a0994f88c8586f60a4a1f1116bc42e57d3881deb967e81a887eed800589d61c867
 AUX mac-4.11.4.5.7-output.patch 1498 BLAKE2B 7016b28d4c9a71d02471de1f4a5e5f1ade7db75d53f096916d3f87b154d82fcb4c3e6fd3891f909e0eebef512795ad2072d332241d69315b9e1ab959f7f895ad SHA512 c96874817ea5389ea2af46c634cd548733e614274b43c9395e146c9151dd9e7a03bbb8c82f36807cc2178070f8a87b886c6db94c27cb4369dbfcb874074db490
-DIST mac-10.82.zip 1675437 BLAKE2B 1915a8154873d972998f11b0f6b233150ede890bbe82b124f9e5c90caad716971c63069724fe5b38fd410c1f2e6a8e96156ed608b3a00839b6741a94c59a95b8 SHA512 9d29b52112a6511dda04bd49d365bd564cba63923abe4bfa72d5af292e01ce3fe330ad71833113692e7e675d44a4bc8edd43e8eab4aeb4c3178debbdb2750a88
 DIST mac-10.87.zip 1673921 BLAKE2B 4a4d1946bcb33f742b75f1ad1d21170309ff82016eaa82104035d544c6916b5a0fb8ceff827bafb782aaea07d77c83b94c080426e5ed458e3e9d53f46a584354 SHA512 2e0ef696302d8a066e57a47df9578a922fa07f0b8a916d0bb041b4f558e4824e0cc4d2c3fa5bda2ecf22c5380780301f03af1cb4b01ba5b525b6c2616f9a0197
 DIST mac-10.93.zip 1674933 BLAKE2B b888007e2e675185291a91098b164d94843bb41b5fc5939c29e61b124a2f07bd410910f7280530c781d0d0bb9141ff3decbdc21beac16e7916ac82cf47b05f6f SHA512 2ac58486d80c0a91b6079341ed27e3a379113b6bcb7dbaf75fc2d6acdc45afb6ea05f8846494888e59311f90ed7354e2099ec9bf156788a451f5c138e27a50e5
+DIST mac-10.96.zip 1675244 BLAKE2B ea3b32d801d0414678ac4fa698c4d10517f403e9458311d3404b5b3773ecaa5e96a83d74af5af7ffdb1c0dacb296f5cfd89e5084d920867492e39738b520e308 SHA512 fa1c9393262393b1cae1c6f2b4b02a32c47bef6f915edc60c4140a436bd0a23a3a6a73313cc93357f3bca6137c3ddb1cd50dc297c9dcb1a5e9f69b8b844b41d4
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
-EBUILD mac-10.82.ebuild 574 BLAKE2B 37e3da81fb3000ce9723e7443623c1cca73c5fa4bd14f6f692433ec94ae5ce6e60fcd7d9204db901456c3a27a5df632fb758d49b99a59d2f9be9ebb05f522848 SHA512 354668c3ae5e6e2aa375faf9da97bb5adf8fed12a6f619cbcfa733cf34f6873dcc313f806f0529249caa07acfc5af84df54225195ddc22f31d50e51e7a9ce134
 EBUILD mac-10.87.ebuild 574 BLAKE2B 37e3da81fb3000ce9723e7443623c1cca73c5fa4bd14f6f692433ec94ae5ce6e60fcd7d9204db901456c3a27a5df632fb758d49b99a59d2f9be9ebb05f522848 SHA512 354668c3ae5e6e2aa375faf9da97bb5adf8fed12a6f619cbcfa733cf34f6873dcc313f806f0529249caa07acfc5af84df54225195ddc22f31d50e51e7a9ce134
 EBUILD mac-10.93.ebuild 579 BLAKE2B b35ade1f2c0e80f924b109a0b53f4ece8ec959b3c9baf74762e20b308f2b3740c24626e60d5ca11d10fbf7fb4bba9a469112470a0647421714aa4a02c4690bc5 SHA512 423c742e647b58ebe3c1c5292af483faf3e810ddb9c0d42ffc4f89fd33b8d0c9aca9e94288edf753d5b450ad267cf67e230ff97cbf968fb2aa665716365d6a4a
+EBUILD mac-10.96.ebuild 579 BLAKE2B b35ade1f2c0e80f924b109a0b53f4ece8ec959b3c9baf74762e20b308f2b3740c24626e60d5ca11d10fbf7fb4bba9a469112470a0647421714aa4a02c4690bc5 SHA512 423c742e647b58ebe3c1c5292af483faf3e810ddb9c0d42ffc4f89fd33b8d0c9aca9e94288edf753d5b450ad267cf67e230ff97cbf968fb2aa665716365d6a4a
 EBUILD mac-4.11.4.5.7-r1.ebuild 1419 BLAKE2B f0f98dbf50f62289d4f6767b96c3a31d70561253c014c2f0dd4e0941941c3389ea5c59e404ded08c0e2e3d0d0c658dbb378993b18aca171e71ee17cd8c6a318f SHA512 96d6deb9c106b8efe2c7ec151aabafdf1922475274efaf37763a22e538bbb73b021b607c1fd95ad591dcce4ec5506b6ee6ce4bd9488d4e124a3ff6353a2a78ec
 MISC metadata.xml 374 BLAKE2B ac05d2add0cd7ac5956aad2f5a7bc031880ac86b1ba62266c3d5afcfa769e687d974cf00e1e1d4c3b50964b5a05c193f4a033eabe0ec0a6d626018aedf32be00 SHA512 586664bdcd30ef7b414740d264e143511f39411a33b845ce0f39503dd2215e501fba07c408ea777472ede967e91001617ac91dd9acb303ad8757bcabbba17b0e
diff --git a/media-sound/mac/mac-10.82.ebuild b/media-sound/mac/mac-10.96.ebuild
index 5752c0372ccc..d39fc2150341 100644
--- a/media-sound/mac/mac-10.82.ebuild
+++ b/media-sound/mac/mac-10.96.ebuild
@@ -11,8 +11,8 @@ HOMEPAGE="https://www.monkeysaudio.com"
 SRC_URI="https://monkeysaudio.com/files/MAC_${PV/.}_SDK.zip -> ${P}.zip"
 
 LICENSE="BSD"
-SLOT="0/11"
-KEYWORDS="~alpha amd64 ~loong ppc ppc64 ~riscv sparc x86"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 95074b8b2fa9..65dd6a431994 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -29,6 +29,6 @@ DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0
 DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd1452c279410c547fabc333b6adccaf47fb8e4bbac0c612f9679c8d85317e9b706e5fe10b7c1fc11a4325a14c5b3faafdda46 SHA512 995fb6c9bf1f729eaa08cd5b2003f21c76274f8f3046bd85b771cb86c429fa65cc50f0f4a36396e654a4378125157777b2f0f04a9343b20aa3aef76281395aec
 DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f
 EBUILD mixxx-2.3.6-r2.ebuild 3789 BLAKE2B d0cd7dc74efb4ada400784f34aa6d2a740fa574f80779bf6a6b3e7c0bf9b75c81699ef817d733a79d3e221f2765bee1856d29e31384ce016a701e6a6ef275344 SHA512 7e104c7e527fd2970da7bd8b8e8257078dc05396abdaad3b5b3e15b4ea5dfa9c5430ed35a9ec6487b67186a63987dc5030861bdd349b5a956f0a4062c4f2a34e
-EBUILD mixxx-2.5.0.ebuild 4170 BLAKE2B 4885247215b20cf699905386827f11ddba97e071729a12dbc7d870d6928a3a74a7e7403dccaf3c6c8ff984c1353479033aab14a27c6d4c9598d7115a8ebdde47 SHA512 5424973ab91f6fc46eca96bf268455cbb1f2109c52ee4b78c90d2f6696c11bae487022d89ffaab240d8e919939489d56a619d88f86c0d096cea7e0c63d4e9ff1
+EBUILD mixxx-2.5.0.ebuild 4169 BLAKE2B 5312ff186dcdf84d186c2afdd8d3fa6c234a89520d8769aaded4630aa568fe4414fc1e70b62ac6a3ab541b46c0600e9e9b677d83f16d72c34c49431195ca393f SHA512 e754b9f875d25aadbef7c1ae7938b9bc816047224347ecf8d3ab49d614bd7ab7b29d417a52db126d70c7ae106827d61371f0f229be20310af17213b636a8bf43
 EBUILD mixxx-9999.ebuild 4076 BLAKE2B 8167a113b684b9375a1ac4d159a419a319cac9efccce0f766774ca1c900989f805c8ec5ac6301702d89746ded5c3bcff100ee1a53d435b01b9f40101a2a52e76 SHA512 fdbdb70f8cd72ac3677d8731a2771067b6c46d242bc093be45ada9f5cdeef6381494424f57e4648d135a6e7926b042407b5b6a400cc229b99de3b01bfd81b1d3
 MISC metadata.xml 1223 BLAKE2B 4766cdc5a3a4baac92ea43893535bcfc70a13a4ff5ba07b1e29df361e5b32108df91a1899d25f312be77b45bbae8ba949847a47ec50782c64eaae3b9f76764d5 SHA512 f7e87ed465425aca876e44db06e0c02237f54fc6ae7b5b44c81dec1e33cc8e63194013092149e56d07ff8b083deae1afe270b2ff46344c08f5b3147f51fe429b
diff --git a/media-sound/mixxx/mixxx-2.5.0.ebuild b/media-sound/mixxx/mixxx-2.5.0.ebuild
index 46c613f56911..95cd36f59db7 100644
--- a/media-sound/mixxx/mixxx-2.5.0.ebuild
+++ b/media-sound/mixxx/mixxx-2.5.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
 else
 	SRC_URI="https://github.com/mixxxdj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/musique/Manifest b/media-sound/musique/Manifest
index 1469bf39506d..6332c4d9272f 100644
--- a/media-sound/musique/Manifest
+++ b/media-sound/musique/Manifest
@@ -1,7 +1,4 @@
-AUX musique-1.5-fix-build-taglib2.patch 1650 BLAKE2B 05c89b228716f647aaf15368ec9771b739180b0d9bd517099a88fc66f0d072dba424adad84677751d9495f7c70cab8f755c3c2fc79b462618442ca99cde06a38 SHA512 e01bd88185efc6a254a380b0f4536cf6684e414eb632c1f57196df5baf45b9d54c0cda16dfbdd23ad5fdafc9cddfe5247a7ad091c3b031570eae9ea59a18dae2
-AUX musique-1.5-unbundle-qtsingleapplication.patch 273 BLAKE2B f2150b1d54201e8d7bd64675dfc5a73a1c74abcea9c34d45f52f4d414f56c6b26d97a8c12f1d4823b5272fa32ea866b6c1d1c8052f8304a46823504203a207ed SHA512 d51389a43c5045c453aa516da4da6d50e2d7fb2b064e40df5cd3ff50469a414bf0ec4d44c716be8b83b8bbf1944f72474b3b917dfcd661eef25c2b7298440641
 DIST musique-1.12.1_p20240628.tar.gz 478726 BLAKE2B 474aed6bd3901b9225cf207ebb8bf2fad372aafb5ab5faaeebe87274e829f99d49d6212b012ef88f6db525e4bd1d5590ef767848b8e0f40f6eae97557ddf43d7 SHA512 75d165a4f9c8773e11e30f4d7922406ac4e79c348073058bf7f02d6a4d2f097e56e3c1a82d5e1a5dc8bf574c071684d069589556950ef3773113340be98e77d8
-DIST musique-1.5.tar.gz 377072 BLAKE2B 839b6096bd70171f807cd4177c2374f20089e1a8f22e59fb76d251c743cb3b9b8c86eb81131d15c6291bae1020df7380ae007689a23b67529978de9ee08ed1c2 SHA512 ea4ba84e6b1a69acf054c8ca001afcf3f0e9b17f3557209da649662b2940777babac454a5d4fa0a210e2e15c58bcf4cdfc8757f92b677d46217e3400fcbdc12e
 DIST musique-SingleApplication-494772e98cef0aa88124f154feb575cc60b08b38.tar.gz 23324 BLAKE2B eccf28a712e058f2ad997cd0ccd8f2117eec06e34846f87c1d6e51b0ca04ef1da0169fdd20f8f8de80a81ffa280c4045db7a1321691a5cfac8de3e5f60260f5d SHA512 98178e86fa85fcaa3e2f0030ce4e26c70489f364448c79b3e0cae304ad8fe698a4d29c0030810cef0edd32c17ebdaafc2223e32506381ade6705dcf831537221
 DIST musique-http-e7689c1b0535afab8c4ea95d2dea7906d8a3ef8d.tar.gz 11360 BLAKE2B f83d5392516a105dfdd33165120663c39f05f022bcbc795f0902a78622c76f7fb2ab7adec373717914c9831e72b347a15602d1fa73f6f04585eec6f3dedb87c2 SHA512 b743fb2cda5265903089d4f7aa0d51fa765c892eff4954fbd0a71094f2851eb54fa0f34198cc3dfe974c9cf6d5fb0c923d70e92d20551f0793b444d9491f1165
 DIST musique-idle-8a8bbb76be64ad47893ca0d5648521c40bf9e956.tar.gz 1680 BLAKE2B 669351a99270fda599608231657d4638bab9d63999274e3ea97bfe785d837d1afb90f29ad11d6ec2c4c3d6fa80870fe5c319555a43dc0524f5df76395a42045f SHA512 45534696457911f1d0ad4c98ad88b98c78bdd2cc8f0096e0469d8ad6fb3287709a62bbd3c557c82954fdbc6a86ebb4d99d34fd6c6c1d66364d0ad86faa33b97a
@@ -10,5 +7,4 @@ DIST musique-media-b0310b8e81ddc672856780f8d23eea2947a2a47b.tar.gz 26234 BLAKE2B
 DIST musique-qt-reusable-widgets-197e8749fde2acd6f81e3a79c1d8db916611175f.tar.gz 24345 BLAKE2B b3dfcc3391290bbf793d13d7ce742fd1dcaf33db633f30b694734d4f3535f032004c72b469d3aaec762c43d9362993fafb9cc6eb8a9bdf55bf36c5b04cba30bc SHA512 5a9d50ab7b8fc91b945484f3319473cacef6d81623f785d1ccf0803cd7dfd88bd4d7949bdb709d2a6f74cbafb7357e613160da1aa1e115ca3d27e3a31e04fb06
 DIST musique-sharedcache-eec981a4285c7b371aa9dc7f0074f03794e86a26.tar.gz 2437 BLAKE2B 7f07d81428f3dea65557e420aac09aa8c97613a240ff000354c7c97982efde7ec39857f83df3e2711ecddf3947214b7ecc0af3ec3825e884f4cafd0d438004d5 SHA512 3190d74addbd2b3233e40acb83c90f6f0ffe01cd482d63f19045de9aef956a265172e6e4fb1927f2d3578319566071d8e8a3167563f6e475b9dfdcea2e49c998
 EBUILD musique-1.12.1_p20240628.ebuild 2971 BLAKE2B 2777e6d83fefdf366964d5b9986f56e2693e4749bb0c85da9a22dbda2959b0dd7ca139cf5bf82b76bb576f937c9b5cdba51b9b0507b39936514aaddce6b0e2e6 SHA512 36f45cb61e11ddb6811dd6d92aa1f8f4891deef6d94a9329afa06ced61e86a26609fb07fdd36789de2b2fc8f66b39f58b7bc2a8d9f913e3ca1a0517e48ab0ef5
-EBUILD musique-1.5-r2.ebuild 1035 BLAKE2B 7441d4521d8a6d08f0691fe7e1d21a7e90f9a52b93151fe94193a6160fafd3c8c51d1580dd605835338b0770015c5917a45c6730bd287d76c2b7571fa08ac697 SHA512 3af6b193648c1054fa032536bf001a0634d946cb35544b7a0c300172352187474814a70f00fb9335eb6fac86e1c76a92cfb803e7d4e062c48e685df6a7882b73
 MISC metadata.xml 254 BLAKE2B dfb1aa113c3ec296cc09365965f6524f666dfcd4da1c88679a1c80c180e4d4b7ab1e189fabdae99a2b2cbb4f2d334f9aaee8be37ca1ac348a51dd915caa6db04 SHA512 ae47624a212dd9b5fca6b25c26fa565f033c4c71d49d2046274f6afd3c19e93e0dff2912512a00cc543dcab7edf481c733239c92738da99013cd29a5245a53c6
diff --git a/media-sound/musique/files/musique-1.5-fix-build-taglib2.patch b/media-sound/musique/files/musique-1.5-fix-build-taglib2.patch
deleted file mode 100644
index 039f06c925e0..000000000000
--- a/media-sound/musique/files/musique-1.5-fix-build-taglib2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/flaviotordini/musique/commit/7277d40defe9cde40f947a81d624195ddf683f44.patch
-
-- replace MP4::ItemListMap by TagLib::MP4::ItemMap
-- replace MP4::Tag::itemListMap() by MP4::Tag::itemMap()
-
-diff --git a/src/coverutils.cpp b/src/coverutils.cpp
-index ae89330..4ba717e 100644
---- a/src/coverutils.cpp
-+++ b/src/coverutils.cpp
-@@ -158,7 +158,7 @@ bool CoverUtils::coverFromMP4(const QString &filename, Album *album) {
-     TagLib::MP4::Tag *tag = static_cast<TagLib::MP4::Tag *>(f.tag());
-     if (!tag) return false;
- 
--    TagLib::MP4::ItemListMap itemsListMap = tag->itemListMap();
-+    TagLib::MP4::ItemMap itemsListMap = tag->itemMap();
-     TagLib::MP4::Item coverItem = itemsListMap["covr"];
-     TagLib::MP4::CoverArtList coverArtList = coverItem.toCoverArtList();
-     TagLib::MP4::CoverArt coverArt = coverArtList.front();
-diff --git a/src/tags/mp4utils.h b/src/tags/mp4utils.h
-index 138c5b5..6b4bcef 100644
---- a/src/tags/mp4utils.h
-+++ b/src/tags/mp4utils.h
-@@ -9,7 +9,7 @@
- namespace Mp4Utils {
- 
- void load(TagLib::MP4::Tag *tag, Tags *tags) {
--    const TagLib::MP4::ItemListMap &map = tag->itemListMap();
-+    const TagLib::MP4::ItemMap &map = tag->itemMap();
- 
-     if (map.contains("trkn")) {
-         TagLib::MP4::Item::IntPair intPair = map["trkn"].toIntPair();
-@@ -31,7 +31,7 @@ void load(TagLib::MP4::Tag *tag, Tags *tags) {
-         tags->setComposerSort(v);
-     }
- 
--    TagLib::MP4::ItemListMap::ConstIterator it = map.find("aART");
-+    TagLib::MP4::ItemMap::ConstIterator it = map.find("aART");
-     if (it != map.end()) {
-         TagLib::StringList sl = it->second.toStringList();
-         if (!sl.isEmpty())
diff --git a/media-sound/musique/files/musique-1.5-unbundle-qtsingleapplication.patch b/media-sound/musique/files/musique-1.5-unbundle-qtsingleapplication.patch
deleted file mode 100644
index 63e50b3ea721..000000000000
--- a/media-sound/musique/files/musique-1.5-unbundle-qtsingleapplication.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Use system copy of qtsingleapplication.
-
---- a/musique.pro
-+++ b/musique.pro
-@@ -18,7 +18,7 @@
- 
- QT += network sql widgets
- 
--include(src/qtsingleapplication/qtsingleapplication.pri)
-+CONFIG += qtsingleapplication
- include(src/http/http.pri)
- include(src/tags/tags.pri)
- 
diff --git a/media-sound/musique/musique-1.5-r2.ebuild b/media-sound/musique/musique-1.5-r2.ebuild
deleted file mode 100644
index 0be338504fad..000000000000
--- a/media-sound/musique/musique-1.5-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Qt music player"
-HOMEPAGE="https://flavio.tordini.org/musique"
-SRC_URI="https://github.com/flaviotordini/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	>=media-libs/phonon-4.12.0[qt5(-)]
-	media-libs/taglib:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-DOCS=( CHANGES TODO )
-
-PATCHES=(
-	"${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
-	"${FILESDIR}/${P}-fix-build-taglib2.patch"
-)
-
-src_prepare() {
-	rm -r src/qtsingleapplication || die
-	default
-}
-
-src_configure() {
-	eqmake5 ${PN}.pro PREFIX="/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 5d6f0ce15f8a..6436b0a92634 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -3,6 +3,6 @@ AUX rosegarden-24.12-missing-includes.patch 390 BLAKE2B afa7dcd04f649d267ef1e90f
 AUX rosegarden-24.12-parameter-declaration.patch 493 BLAKE2B 2cdf07c60fe8c87c5e15a514389c0856adb5166a9fd2b7600c45a448af004a42ade2d8d4c42f05d9f4cb7fcc6c2a7d9d70c1ceef3a873e08f5cad49335343f50 SHA512 9d222d9cdbae3c8cfe26061e3485dad6aeca4d03cf79062a42dcefe1df1441fae4fe57b0bcdd246b8694b9a68345b4e39d3faf2deec3a9513fd8c8465c2223a1
 DIST rosegarden-24.12.1.tar.xz 5738756 BLAKE2B 5202a511c53bae267c347ff9197acfe4283987bbad3764393a0335bd7dad775a2042430d3f8226e24436ce15c03204312ce6dc123938f2cec33960c3eeba707d SHA512 f732951162e816a2dde4805e519c9b99598edb543fbe01f819248454c23eb70293a74e92ad11a51ecdd4990bca1f111242f838b2e3259ca09cb4f9bf955b9b6a
 DIST rosegarden-24.12.tar.xz 5737612 BLAKE2B e8976ef1c46d4e137ad78f762cc979363e66427b47760e8ee5e5813e89fa68349d1cc541223c980b6e3972b2d55d33bc8cc2de77d61f95b903f897626be1571e SHA512 dd948e2f9bd0fe11249c1e138afc79da10043664c85ea300f9050dd01e959be50f1056d5035f89b8b1f62fb58254890f6f03384eda546f8968cd42baf1153555
-EBUILD rosegarden-24.12.1.ebuild 1250 BLAKE2B 240b29a7296f1e9bac0994c9af8bc65c629dde0d0e684d5d3401b03ae652e9042732ec1864cc8f62015586c51b62e33cdac698e6611588bf317256ec620ffa25 SHA512 3452186a48d063a3bf5fe92a927f82083772b94c91875edb29e27496966cb78b8e85a5f20b5975dd1546942249a16fd792ca9d276a165846998434a10dc68141
+EBUILD rosegarden-24.12.1.ebuild 1235 BLAKE2B 7eb3b7999a6cd0731f0de088710dd51ca488bcf3ae8ddccb4ca6766566df4aadafe3d3e4842e946f68b9f1f9763eb78951ef42506572c95f78f2fcfa5e97c0fc SHA512 888e6ca013e7ed833228e2cde60923d28366040cd76f9dc1b41ce76e1b5351f0c364883cc20ee891b806e5166b02fd5b37d7e8af7933e0a05e71ef98fa21a054
 EBUILD rosegarden-24.12.ebuild 1305 BLAKE2B 05bfaf0037eeeaf1dd7262cbe22f31e7f67045eb168ca4725100e84a3a177c5d1900f0733aed8077a06c4ca345bf49d62cc5495b7ad243c54145f59342a7b097 SHA512 402b7f608443769b504ae7f2985ebf9ecf55d9de32ca03fc0117fdcbf8d71a0c8e06c3b57008031c466785c8628622374ea27b1092e8b5150a77e6e40cfefe91
 MISC metadata.xml 350 BLAKE2B a98ce813216f0135bf3db7e71b401be679ac05012731d4380820df75d91cc919db2923c867f1593aff8939c5202b03d3b3c1cdf1a7884ec12f83952a66845a38 SHA512 9287817aa2c7a4d7d7767f3a44561920dc06a40fa376e3f9d04e6998e3995e93ff74170f772baedbd94c4519bd62c2c7b1b619e9a69c4a7c707ece518b6ce7a4
diff --git a/media-sound/rosegarden/rosegarden-24.12.1.ebuild b/media-sound/rosegarden/rosegarden-24.12.1.ebuild
index b2a6f4dbe8b9..97c9b66633bf 100644
--- a/media-sound/rosegarden/rosegarden-24.12.1.ebuild
+++ b/media-sound/rosegarden/rosegarden-24.12.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="lirc"
 
 BDEPEND="
-	dev-qt/linguist-tools:5
+	dev-qt/qttools:6[linguist]
 	virtual/pkgconfig
 "
 RDEPEND="
@@ -33,9 +33,7 @@ RDEPEND="
 	x11-libs/libSM:=
 	lirc? ( app-misc/lirc:= )
 "
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-24.06-includes.patch"