gentoo auto-resync : 05:11:2024 - 03:03:37

32 files changed, 295 insertions, 551 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 6f7d6fa7c8e7..1bf631dfaf2b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 4b02106702da..92033f8550a7 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,8 +1,9 @@
 AUX ardour-6.8-boost-1.85.patch 750 BLAKE2B 9a86275431cb735b32b36a570450d4b5c035f1360c89e69d7d688171e299aea15128057f01dd905335c4fca68035a146cc54cd62b0aa163ec56ae06e545ca8ad SHA512 ad4888bbda5da5ba3e49ca751bdec34159fde01355e8dac3e23c968a8eeba4bce3228f43ef87977ee619c70063ef16e2383c6b7126213d88125222431f79574d
 AUX ardour-6.8-metadata.patch 568 BLAKE2B 68bb84e5249d67e88e191dbc009b7f2b696d448903a2c7164778f4fda3b526370bd2562fa627faea832da2c115d61fe8ddccf6c54c016a7f68e5cab688868984 SHA512 1bf77b0cf2692e7051a524a049add8f22feb734120d9ae58ffcf06647e8ed28249dcbe2cd124eb2354897f119a2977c6124228fc37c15e476053dc5ea4b5033c
+AUX ardour-9.0.0-fix-clang-crash.patch 4511 BLAKE2B ad67f040fbb51f18f7feca562c6a741aad1d2e559820319e8eefb998198a78a59df61ef3ff2643be1f52f21c7e04570056af546229f395d1967f3de1d5a0fc0e SHA512 e98f83676b9c063e3a1abcd554f14e83dcfb2ff35525917dbf2e301947902ed51613826a08334df8e7a00847ff454bfdec3828176fba351075d85c28a7355319
 DIST Ardour-8.10.0.tar.bz2 17811275 BLAKE2B 5a0edc68c707ae1659b080cf543a4a3dc3397c91366e5c5e3084fe0095d983ba1170acc1fde49dbd6abd1b05325e2117b79fcf96c1d5c84b24d5ecc76a39cd64 SHA512 744e4bc73e35a758fce46c0035a11b430b70aa77503446a0118aba62b86b62fb293be1418ec8cfc0e1495a3a005bb71445f48661d9302a3b5bacc1a7f6c2874b
 DIST Ardour-8.7.0.tar.bz2 17807972 BLAKE2B 9bbe4ed5c3ad62d643518881a45b71642f5ce41c8620eb4c82befcb9df1053b08b60d3683961d78825f99e3a74222404c511073491972f138edaaaea445c6961 SHA512 cd2cdc1360b01d23cd3df62ee949ecab9d5d8da5112636438c2ef8a88d188503bcd7f09f2a5d8e07460dacbc35cecd96e8edbc748adccc50b5a90375f2f742d0
-EBUILD ardour-8.10-r1.ebuild 5272 BLAKE2B 52c0bba86ffb317e835ab53aa15dad0c0c44a52141caf218a63931c2d5457df1f4d50c280c471a79b85533a80a232a060abd91b7e209255547e19d04b56429dd SHA512 9030c756d44f3605c12a7fb99583a65edc50aff4bef6e49a0fe54c77ab71958baa0605e049a1b6ad995e554b9ff0be340442b165e55d278dc77ca0b42e8cdfeb
+EBUILD ardour-8.10-r2.ebuild 5197 BLAKE2B b751cab598b8160904d6e8089288f875d0ccec378690e8080e37a90fb45e305874325455f8cd6d1a8143571dd8c5c85365a0b493c39b57ea1340bf9242b4638a SHA512 cf0f3573274340d0d0a597e43066bfd2dfde85bc40899448c8fb7e9579cd36b4488ce0c41724baf8235ed4a7801a2fa01865fc1a8a69ec7965502d5b1feb77a2
 EBUILD ardour-8.10.ebuild 5216 BLAKE2B 76147b3a790cccf26e6c7cb11305d2f50271f93abab3eb83d25c98559aced9ea0719e80240986d1adb0e6bf5adbf337b6422443babf2388f533aeb98a99dc188 SHA512 941298dfb89c7c86b100a4d127f8aa775b084f8c98cac7bba8d1e5a10a6922d8cb7828a5d16afd9896635e11b09bce653f3bc07bb8bb870953c1d142192a1ea1
 EBUILD ardour-8.7.ebuild 5257 BLAKE2B 48899bdee879dd24d9530e2eadb4c89a03241a1c793e87bd8ff5df3cdd25e598bc73ae2cb4dae131bfd6607957e77b42ddf0d33e996949e10887a0b8cbd6047d SHA512 d37fb303db968c36017d1e6a4a296e534bfd6280bd25ef841f5fb556ebda5b87e6bbf3d8e4b47517c28d0f99573d6d6852a5c6801960a5309a2107be2e8b4552
 EBUILD ardour-9999.ebuild 5150 BLAKE2B dc3d456ef39ed244244ceeafea10a6e6c841638f3c1b8a8608990f69d6e96fe10d822a3e59edb00d743090471d4c78461250189bac4838ac8144862a977090a9 SHA512 aed242f55912801b1ded17e06fd1c2666d11d2254c1d142bb8d8fd861742176922e391b095d063701fc26e0a76315d42913656832fa4a3e91d844625f786a1e5
diff --git a/media-sound/ardour/ardour-8.10-r1.ebuild b/media-sound/ardour/ardour-8.10-r2.ebuild
index 0f3b1f15c091..bb6ece851b94 100644
--- a/media-sound/ardour/ardour-8.10-r1.ebuild
+++ b/media-sound/ardour/ardour-8.10-r2.ebuild
@@ -71,6 +71,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-6.8-metadata.patch"
+	"${FILESDIR}/${PN}-9.0.0-fix-clang-crash.patch"
 )
 
 pkg_pretend() {
@@ -78,13 +79,6 @@ pkg_pretend() {
 		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
 }
 
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 
diff --git a/media-sound/ardour/files/ardour-9.0.0-fix-clang-crash.patch b/media-sound/ardour/files/ardour-9.0.0-fix-clang-crash.patch
new file mode 100644
index 000000000000..6162782d91f5
--- /dev/null
+++ b/media-sound/ardour/files/ardour-9.0.0-fix-clang-crash.patch
@@ -0,0 +1,123 @@
+From f17a6562174ccf658eb35ba7a425d3ac340c1607 Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Mon, 4 Nov 2024 18:46:21 +0100
+Subject: [PATCH] use modern C++ for snprintf (#9841)
+
+This replaces vector<char>::operator[] (which now
+a constexpr since C++20). We could use &vector::data(),
+but a unique_ptr seems more appropriate for the case at hand.
+--- a/libs/ardour/broadcast_info.cc
++++ b/libs/ardour/broadcast_info.cc
+@@ -39,15 +39,15 @@ namespace ARDOUR
+ static void
+ snprintf_bounded_null_filled (char* target, size_t target_size, char const * fmt, ...)
+ {
+-	std::vector<char> buf(target_size+1);
++	std::unique_ptr<char[]> buf (new char [target_size + 1]);
+ 	va_list ap;
+ 
+ 	va_start (ap, fmt);
+-	vsnprintf (&buf[0], target_size+1, fmt, ap);
++	vsnprintf (buf.get (), target_size+1, fmt, ap);
+ 	va_end (ap);
+ 
+ 	memset (target, 0, target_size);
+-	memcpy (target, &buf[0], target_size);
++	memcpy (target, buf.get (), target_size);
+ 
+ }
+ 
+--- a/libs/ardour/export_graph_builder.cc
++++ b/libs/ardour/export_graph_builder.cc
+@@ -796,9 +796,9 @@ ExportGraphBuilder::Intermediate::Intermediate (ExportGraphBuilder & parent, Fil
+ 	int format = ExportFormatBase::F_RAW | ExportFormatBase::SF_Float;
+ 
+ 	if (parent._realtime) {
+-		tmp_file.reset (new TmpFileRt<float> (&tmpfile_path_buf[0], format, channels, config.format->sample_rate()));
++		tmp_file.reset (new TmpFileRt<float> (tmpfile_path_buf.data (), format, channels, config.format->sample_rate()));
+ 	} else {
+-		tmp_file.reset (new TmpFileSync<float> (&tmpfile_path_buf[0], format, channels, config.format->sample_rate()));
++		tmp_file.reset (new TmpFileSync<float> (tmpfile_path_buf.data (), format, channels, config.format->sample_rate()));
+ 	}
+ 
+ 	tmp_file->FileWritten.connect_same_thread (post_processing_connection,
+--- a/libs/ardour/io.cc
++++ b/libs/ardour/io.cc
+@@ -1338,7 +1338,6 @@ IO::bundle_changed (Bundle::Change /*c*/)
+ string
+ IO::build_legal_port_name (std::shared_ptr<PortSet const> ports, DataType type)
+ {
+-	const int name_size = AudioEngine::instance()->port_name_size();
+ 	int limit;
+ 	string suffix;
+ 
+@@ -1372,21 +1371,24 @@ IO::build_legal_port_name (std::shared_ptr<PortSet const> ports, DataType type)
+ 
+ 	// allow up to 4 digits for the output port number, plus the slash, suffix and extra space
+ 
++	uint32_t name_size = AudioEngine::instance()->port_name_size();
+ 	limit = name_size - AudioEngine::instance()->my_name().length() - (suffix.length() + 5);
+ 
+-	std::vector<char> buf1(name_size+1);
+-	std::vector<char> buf2(name_size+1);
++	++name_size; // allow for \0
++
++	std::unique_ptr<char[]> buf1 (new char[name_size]);
++	std::unique_ptr<char[]> buf2 (new char[name_size]);
+ 
+ 	/* colons are illegal in port names, so fix that */
+ 
+ 	string nom = legalize_io_name (_name.val());
+ 
+-	snprintf (&buf1[0], name_size+1, ("%.*s/%s"), limit, nom.c_str(), suffix.c_str());
++	std::snprintf (buf1.get(), name_size, ("%.*s/%s"), limit, nom.c_str(), suffix.c_str());
+ 
+-	int port_number = find_port_hole (ports, &buf1[0]);
+-	snprintf (&buf2[0], name_size+1, "%s %d", &buf1[0], port_number);
++	int port_number = find_port_hole (ports, buf1.get ());
++	std::snprintf (buf2.get(), name_size, "%s %d", buf1.get (), port_number);
+ 
+-	return string (&buf2[0]);
++	return string (buf2.get ());
+ }
+ 
+ int32_t
+@@ -1400,17 +1402,17 @@ IO::find_port_hole (std::shared_ptr<PortSet const> ports, const char* base)
+ 		return 1;
+ 	}
+ 
+-	/* we only allow up to 4 characters for the port number
+-	 */
++	uint32_t const name_size = AudioEngine::instance()->port_name_size() + 1;
+ 
++	/* we only allow up to 4 characters for the port number */
+ 	for (n = 1; n < 9999; ++n) {
+-		std::vector<char> buf (AudioEngine::instance()->port_name_size());
+ 		PortSet::const_iterator i = ports->begin ();
+ 
+-		snprintf (&buf[0], buf.size()+1, _("%s %u"), base, n);
++		std::unique_ptr<char[]> buf (new char[name_size]);
++		std::snprintf (buf.get (), name_size, "%s %u", base, n);
+ 
+ 		for ( ; i != ports->end (); ++i) {
+-			if (string (i->name()) == string (&buf[0])) {
++			if (string (i->name()) == string (buf.get ())) {
+ 				break;
+ 			}
+ 		}
+@@ -1526,13 +1528,13 @@ IO::bundle_channel_name (uint32_t c, uint32_t n, DataType t) const
+ 		case 2:
+ 			return c == 0 ? _("L") : _("R");
+ 		default:
+-			snprintf (buf, sizeof(buf), "%d", (c + 1));
++			std::snprintf (buf, sizeof(buf), "%d", (c + 1));
+ 			return buf;
+ 		}
+ 
+ 	} else {
+ 
+-		snprintf (buf, sizeof(buf), "%d", (c + 1));
++		std::snprintf (buf, sizeof(buf), "%d", (c + 1));
+ 		return buf;
+ 
+ 	}
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index df7dfb89ab43..be6c8b9a100b 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,7 +1,6 @@
-AUX audacious-enum-backporting.patch 1153 BLAKE2B b5934eaccb88bd37848b50a6834858dbc8a2c7419ff4dbbfbef8b89a932898b219addae0ad9f176c964b27a30ea96b5b73969df44f1d1bad43a4747031392d02 SHA512 b84c04bf47916b5da9049fe2e58576db6ec2753fa45564da4ffec7155c2dc073d57c33201a81f458f542408518d47adc39021033992d822a5220f7400fd18ba0
-DIST audacious-4.3.1.tar.bz2 630820 BLAKE2B e8885d25cce4a480ac58c5ee1874a530f4b169f264eaafb13830be17ce7e25933a2fb491ed0b86220fdb2e916ea5d7b13bca8a5ac00695ffd06e1ad8b2a6ff67 SHA512 7662a1b136c6ced346ce160a3a6b71ea5941644860466e23248a44168179118202006e8892a5bbd1f6d77730846a4644b6cb4e008af38e1117588b9f4d1521f5
 DIST audacious-4.4.1.tar.bz2 636301 BLAKE2B 875b214e3372ce000684d4e9a2868062bc0addea19ecaa652b605e1ae79d13f58f42eeb761451da682301124c54cacdb61b326a3b1855d0cc7b47c4d8983e459 SHA512 68ba1f468b540dfeec82825b19352dab785243aa3dc456d2a5acfda97601d64a11dadd2de668a1b0adab3a42e232509d60b5658f0a0047e153791ab9318f2b76
+DIST audacious-4.4.2.tar.bz2 636838 BLAKE2B 6e0b4e099660249d3631091e6c38e2b2ad40e2fafeb9e85bb365134fe1c28f128f294bdeadf50643329569c21475fc6d0da8e41fb9839cff0131ddce61597c72 SHA512 a1a561ac969863555aa349c068d85398bc6e58c3f11b74842799c7ed1287a826bd6ce9624421b9da47354a632d2e0ccb8326de27c0730028d98dd85fa0c061c1
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
-EBUILD audacious-4.3.1.ebuild 1520 BLAKE2B a603d51ee02342b8dbefadaf10a46667ca66a70125250c39410ac5c04f3dfbe5a34a23e8c0f26e2d543a7b66769fb1e90a2bffa263ec9f49f2326b24bc289c36 SHA512 f3673882ae2ee0e1fbaa3e615cd8fe15f6363b077e842c53a1b852d2110fcfb03a719978f9a277996480459ef9ebef16b15ed8900efd2fda11f1b1b72410257a
 EBUILD audacious-4.4.1.ebuild 1444 BLAKE2B 72c87c2c0dc339f1c0dcfec88d9e90737b7ede7be3aa7892b4ef6f98ad2274608d1584fa403a496694c616a0283b0973d7891d5f8d7b95dd7258cd827ed66d7f SHA512 2b8572d465f7caa3705b2cd10407be67b400555932ea73bee5f55d8730e985bccf4a9732374a71663d51eb2184bd503e04fb34f0abac3023cee9aaf85ed8ff6c
+EBUILD audacious-4.4.2.ebuild 1446 BLAKE2B 326ce08ebcde56a551c4b0ee5522b567712f8449db0bb47ad846751d6147c1e95b7087106612369236c9583516c10e102ded6fcb451ad214053ca058097dc981 SHA512 ee9aa71b07ee22551db5b42d37752f6628a9c4fcf6ea52b93084ded71c114322fdf140876bb054a3efbe048d8134e63765e0cb28fa498f9244c04152d1c67c09
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/audacious/audacious-4.3.1.ebuild b/media-sound/audacious/audacious-4.3.1.ebuild
deleted file mode 100644
index 591c2b60ab94..000000000000
--- a/media-sound/audacious/audacious-4.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${P/_/-}"
-
-inherit xdg
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-KEYWORDS="amd64 ~riscv x86"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="nls"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	virtual/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}"
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-enum-backporting.patch
-)
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die "failed to sed" # bug #512698
-	fi
-}
-
-src_configure() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	local myeconfargs=(
-		--disable-valgrind
-		--disable-gtk
-		--enable-dbus
-		--enable-qt
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins -r "${WORKDIR}"/gentoo_ice/.
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-4.4.2.ebuild b/media-sound/audacious/audacious-4.4.2.ebuild
new file mode 100644
index 000000000000..67b9613808c7
--- /dev/null
+++ b/media-sound/audacious/audacious-4.4.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
+SRC_URI="
+	https://distfiles.audacious-media-player.org/${P}.tar.bz2
+	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="gtk qt6"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	virtual/freedesktop-icon-theme
+	gtk? (
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-3.18:3
+		x11-libs/pango
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets]
+		dev-qt/qtsvg:6
+	)
+"
+RDEPEND="${DEPEND}"
+PDEPEND="~media-plugins/audacious-plugins-${PV}[gtk=,qt6=]"
+
+src_configure() {
+	# D-Bus is a mandatory dependency. Remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	local emesonargs=(
+		-Ddbus=true
+		$(meson_use qt6 qt)
+		-Dqt5=false
+		$(meson_use gtk)
+		-Dgtk2=false
+		-Dlibarchive=false
+		-Dbuildstamp="Gentoo ${P}"
+		-Dvalgrind=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins -r "${WORKDIR}"/gentoo_ice/.
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/files/audacious-enum-backporting.patch b/media-sound/audacious/files/audacious-enum-backporting.patch
deleted file mode 100644
index 66bb959f737e..000000000000
--- a/media-sound/audacious/files/audacious-enum-backporting.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3989bafcb7a8843cef4e25875cd6c0e72680ad80 Mon Sep 17 00:00:00 2001
-From: Guido Falsi <mad@madpilot.net>
-Date: Wed, 28 Jun 2023 15:42:37 +0200
-Subject: [PATCH] Add missing enum value.
-
-New versions of the clang compiler have strict checks for enum values.
-
-The value "-1" is returned as a last resort from to_vfs_seek_type() as a VFSSeekType.
-
-Replace usage of `-1` with the new enum name.
----
- src/libaudcore/vfs.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/libaudcore/vfs.h b/src/libaudcore/vfs.h
-index 33c5a65c97..f6a1dd3f23 100644
---- a/src/libaudcore/vfs.h
-+++ b/src/libaudcore/vfs.h
-@@ -51,6 +51,7 @@ enum VFSReadOptions
- 
- enum VFSSeekType
- {
-+    VFS_SEEK_INVALID = -1,
-     VFS_SEEK_SET = 0,
-     VFS_SEEK_CUR = 1,
-     VFS_SEEK_END = 2
-@@ -75,7 +76,7 @@ constexpr VFSSeekType to_vfs_seek_type(int whence)
-                ? VFS_SEEK_SET
-                : (whence == SEEK_CUR)
-                      ? VFS_SEEK_CUR
--                     : (whence == SEEK_END) ? VFS_SEEK_END : (VFSSeekType)-1;
-+                     : (whence == SEEK_END) ? VFS_SEEK_END : VFS_SEEK_INVALID;
- }
- 
- #endif // WANT_VFS_STDIO_COMPAT
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 04c021793ee0..bfd86c65326a 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,4 +1,4 @@
 AUX easytag-2.4.3-ogg-corruption.patch 7233 BLAKE2B e0123a9d195a85d80136fc831cdfe1a870346a2f0cf0213a53e0ef51bc82e72db390898df0c8d02ba8865c3571e5d2f8b8faafe0b3750b6cd123e3fe065cc65f SHA512 f25cedb0f09edf987317f395133195f115549503a6c02edfce7e49f1f24d2e5d01920c9b48f41addb2b632d68bb329cbdefc25aec4e56239daa4f7980d33bd10
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
-EBUILD easytag-2.4.3-r5.ebuild 1928 BLAKE2B ecdc57479a60eb05e2da3752866e11a09100f26761d9de2176a3ec7c88c5f97b68d0f66a67ff256793b979e545fde935e4d24dc7db77b13cb8086148b658586b SHA512 59b0401b8884c427cc77337f5287d0a8dba9c5f10430ae110c6039335a51e253c9371e0b687a26714baa232f29e73776210dd016b14430f69bda9715e511d92a
+EBUILD easytag-2.4.3-r6.ebuild 1971 BLAKE2B cc41ea0cdb02a1cf520f4cdf669189c8e693c3c4f65c6954534d43a0c941e76e9b48989c96a273ed5c320aaa2b9b0e435a086606bde7036dda925308ad8ece45 SHA512 835083104b3ada76d5b62ca026407c7f35210e0ccd8980f84475446740915c98934b240ea99877bfa48365ad46ee77f83eef1b6952560ff575d765e3d4634a7c
 MISC metadata.xml 422 BLAKE2B d1415eb185e22013f0567c5553c886558d812f8edaa2c817f684d6f0c1bb04d8a7fa8fd63abf929d07e9d9f181d0dd64af3c2c2c77f5769e3a718530598d9529 SHA512 438a22ec60b4e7b2061fd6d7645b4a31b537c06fec22968b86496e85f98306227ff6025eb2afd8a0dbaa57929aa78b3f7bc4631f9232f1204e8efa3d6f16e238
diff --git a/media-sound/easytag/easytag-2.4.3-r5.ebuild b/media-sound/easytag/easytag-2.4.3-r6.ebuild
index e61c1d3e4ef8..039cd6b115b8 100644
--- a/media-sound/easytag/easytag-2.4.3-r5.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r6.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
@@ -21,7 +21,10 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
-	media-libs/libcanberra[gtk3]
+	|| (
+		media-libs/libcanberra-gtk3
+		media-libs/libcanberra[gtk3(-)]
+	)
 	>=x11-libs/gtk+-3.10:3
 	flac? ( >=media-libs/flac-1.3:= )
 	mp3? (
diff --git a/media-sound/kmetronome/Manifest b/media-sound/kmetronome/Manifest
index f220270cae3d..74eb802f2205 100644
--- a/media-sound/kmetronome/Manifest
+++ b/media-sound/kmetronome/Manifest
@@ -1,5 +1,5 @@
 DIST kmetronome-1.3.0.tar.bz2 366463 BLAKE2B 5140fbf8a31a76febda94713419f14455196ab0017ef048be1d780e66bde95c9f79f6917a02a73f74cd996f39d5e020c6b6fff744c48f21ae0c516940f43aba7 SHA512 3b888dfc802a5a3e83d11a42c6f6f9fd5cd21e294fafa6ef670a6a76cf6b0f37616fcf465d0589c10238b18881e44b85a2104f9b986bc5ddfeecddb51918a78a
 DIST kmetronome-1.4.0.tar.bz2 226942 BLAKE2B e8a5c7d0f2458b58d6329a72af622522004853af1fccdf73eedf5161d1f9ea72ee1ff40276b6626fcc0d56b737f2176d857646eda284947a63647cee968b79d0 SHA512 e101d3558064c67937995640f355abfa16e6e8790ac2566cfdd872fbea87df8cfce8430e8976f2ee6c23f0a9e2b66324b2b49c24c41d54c83cc7b51fce557461
 EBUILD kmetronome-1.3.0-r1.ebuild 675 BLAKE2B b998adb3bb422feeed51afa7393758db798ac371dd9cdeccc9bf3d69627600e51ea199b7b03b7ee315768f44e74b0815b5d9f127daa0428aab2998963a0ca953 SHA512 1fb62764ed81b677898069c93cf68931896b67921b5d35051d7cb00ee8612a449c69e4b4f6a234b1faa7b040514f6ae8c36bbbaadac68a6c403f3722c18ec27d
-EBUILD kmetronome-1.4.0.ebuild 639 BLAKE2B c7f3cdf08de8291eb5efe73274e1c87965e57d5cddac6007daaaf68d9040ada073d75aaea15f95c5997e98a7bbe5a2f0c9187fd681493a5755b58e70b1159572 SHA512 e9166c02d09060bceb4c63b7791139788193577e0fecf1ecadae10588c7efcfaef0feae9049f47e4ae849e617217d042ad9e5603678a1a0cfe122985d6c2e1c9
+EBUILD kmetronome-1.4.0.ebuild 638 BLAKE2B d5093cac3c559470454233579a618aa5c87308c1a83c7432964902f4604f0ac15d4f616d7a27f1e3a7b0e25bf18ec6423d4bfe97bc0d859782fc9aa9c69f0c06 SHA512 6d6692cd9878c31ed3a377be4bc4aac719e01ff4bdc2dfc23abfa40a10ae7832fc396cb922eb94ef5ac707c0483d44b05e4017977f330b0f5f852b0066ee1b0d
 MISC metadata.xml 444 BLAKE2B dcbcb4ac3aaf26e6732bede37e196ca0ed5962038888d4f15fea2adebfa767059bb7be433355e9fad07faa18e3a7fab60afeadd61ff699b7e70888b168859f70 SHA512 efb191ddc954fb7115879eb8c6c992da1c5aef70d84fdb4d22a78202634aa7bad4a602ea60bf1a14d23b6ea6ffdde883a04a31d3a5cb76be003a45831490b074
diff --git a/media-sound/kmetronome/kmetronome-1.4.0.ebuild b/media-sound/kmetronome/kmetronome-1.4.0.ebuild
index a22ff09b58d7..c0242a433eef 100644
--- a/media-sound/kmetronome/kmetronome-1.4.0.ebuild
+++ b/media-sound/kmetronome/kmetronome-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/kmidimon/Manifest b/media-sound/kmidimon/Manifest
index 3f62b7ed425c..4cc305083392 100644
--- a/media-sound/kmidimon/Manifest
+++ b/media-sound/kmidimon/Manifest
@@ -2,5 +2,5 @@ AUX kmidimon-1.2.0-fix-cmake-pathvar.patch 579 BLAKE2B c3a169a4d947aed747fcf63a0
 DIST kmidimon-1.3.0.tar.bz2 698412 BLAKE2B 185125fda809042a064b225f14ef5c04c69f07bda77d2291d2719256ccbee122bc181d9ea602cb43335f764ae9576daf79966a681637d080f5e3533bd856715d SHA512 02085e6d6768fe5d35649446ec5db2eadcf34b4c727fb250bdbc33d79c86a16d6dc3993ddd9fe08e93e08e1400fb3f56bb71913020ffa410f56ad7168bf08b97
 DIST kmidimon-1.4.0.tar.bz2 309675 BLAKE2B 83a466b63256d082e257af797c501cd4a405409a31c20f26bd38cb7afbfe84566550589feceb201563572352b9ae90f20e255d6c75e21340bd43316ea392e5a2 SHA512 83f3ff86b02d91bd20c81c4dc8dc036b3c8483c246c65b1dc4fe2d084f98c792cf1e9dcaad3b0984f0f294bc0b7f4d6d090bd44b88efa3738fc9ada63cf613ba
 EBUILD kmidimon-1.3.0-r1.ebuild 759 BLAKE2B 2dc017f1eff7506e1caed81ee5e016a4668e32a15ba4fe473d2a560d51447aefb99c9280e55f0c342652e03eecccbc975d446465527baa34fc6856754aaabcc2 SHA512 cb1235cb185803bdde6a0c7170d8854fcb418a7b158bf5dce16e2ad0ad2e480f8a01c759d3bd530f0f17ec5858e052b39a4bd1f89a851a3f40943dfcdda4dfe6
-EBUILD kmidimon-1.4.0.ebuild 755 BLAKE2B 1f1e4201e2da5210c325671bfe09cf42e294d0d5687701f5eda0f6ca4c3e7c5e0887b73e9d1e755f90fbe21da83a365e0760ac58668a9bfcdf61fcab7ca9ac2c SHA512 91b85ab8f727992c862d9c9198f5c983427b9723581de9229b6df87acd11751cddb7a36b0acad51f175bf674072528542968dfea22decaf43cfc285429d9d784
+EBUILD kmidimon-1.4.0.ebuild 754 BLAKE2B 711003bfa9acbae12736985413ec6ea6fea2ade3e58ce37b186131d8f0a2cc85406d387076974935ab2028648161c5fe1c8e6ac44e2cf1239a7341be837b23cf SHA512 e40147c44cfdfe5794ac7e47eb05c984a36855b228a82eb3c5a1a7411f589ef6cdc2857ab69c6b7e49e97bb7123514f7bbe5cefbb68935295f29e7539d15787e
 MISC metadata.xml 442 BLAKE2B 20c1a6190737f4d447ab159fa0568f27b731d3472b3a4ec26fc4d3225ec9e82fca014d82ad41fe1c8c6b80e785973d066bf7101078ccccd7efac67d3d992749b SHA512 bf4cb478d26b5e1f49057954f77284b6126c72541925299b71f901559bba3020c25a8ca6e6b9b4ccee966f612c71a6b8554f08e64e97e00c3c09232ded483c09
diff --git a/media-sound/kmidimon/kmidimon-1.4.0.ebuild b/media-sound/kmidimon/kmidimon-1.4.0.ebuild
index 4db8b777b2c6..55606e42f29d 100644
--- a/media-sound/kmidimon/kmidimon-1.4.0.ebuild
+++ b/media-sound/kmidimon/kmidimon-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 7df04a6d1a8c..7a1e07181e05 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,4 +1,4 @@
 AUX pavucontrol-5.0-make-libcanberra-optional.patch 3727 BLAKE2B 27e38b16e1eaf64c7b1c3b0f3a6efc85bd4b290fef8b4c4c64a0e6e24de6565090e8a1f5d0ec1dc6ef1b65ff3c3c0836186ee53f27c844ca68515e98ea239e0c SHA512 3b866adf8495b8ffdbe48329ab4d54663ea3294e031f6d870d3c278b26b1d0314245ed4bca88e905e79cb503506f5762c3332fb5c9cc66ebe8205feb89e21369
 DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
-EBUILD pavucontrol-5.0-r3.ebuild 1013 BLAKE2B e74befc69b34d827a34cfa883a9b5e1cf472a92716b8a1d2989483aa985e3f9398aa7d7e73f0ab8ba8ee020e47032d8f2836f2b6d2aca53861aed2dcb951fca3 SHA512 e530adefe6ab8a7ca64c9fe3d8cf8d6b5b5a4b0f1b2bfd60bc972a2ebe2413010fa0cb78f08b6f272700b27c4aaa763a0b456f13b6d9301b72f527b8987e9e60
+EBUILD pavucontrol-5.0-r4.ebuild 1059 BLAKE2B 9a89dc64569d4af159421bb1a3f3938cca18d3fef422580928f957f098a0b7293692242672b296e73ca32f1f4b127ff9316dd68e927315d5b8d9dc15dcc33ccc SHA512 5b41954bce30f44c077af758a9dd361f4f7a27993707001528132127fc6499f49a9c8c1a712c4bee9ed94e31c6d0071e182afb0f27bb41cd088160bebf934f11
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/pavucontrol/pavucontrol-5.0-r3.ebuild b/media-sound/pavucontrol/pavucontrol-5.0-r4.ebuild
index 7d052445becf..c35f01980e1b 100644
--- a/media-sound/pavucontrol/pavucontrol-5.0-r3.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-5.0-r4.ebuild
@@ -22,7 +22,10 @@ RDEPEND="
 	dev-libs/json-glib
 	X? (
 		>=dev-cpp/gtkmm-3.22:3.0[X]
-		>=media-libs/libcanberra-0.16[gtk3]
+		|| (
+			media-libs/libcanberra-gtk3
+			>=media-libs/libcanberra-0.16[gtk3(-)]
+		)
 	)
 	!X? ( >=dev-cpp/gtkmm-3.22:3.0 )
 	>=dev-libs/libsigc++-2.2:2
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index b6f3a3ae4d27..e5b22db6ad8f 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,6 +1,4 @@
-DIST qsynth-1.0.1.tar.gz 338049 BLAKE2B 9fc3d70aa20af4523a0c1e8ff6d9190b30359b7cd5fa1516e8ad0e6cc9aa0ec9e23cfc850e2796519fa462c0028550c9c43eebb8f1dc413bc9e5fd5a953ba6e8 SHA512 be81442e3eb50cdd8075e7674413c8f9b297bc19c799da138bc8491dc225f03290856d4048b27dcc192fab636d4175ed457bdf798f3a4b61c2b195c2e8a92b33
 DIST qsynth-1.0.2.tar.gz 337605 BLAKE2B 8b1911c8baa7d1b73a18061628044b4b428c2c01a0bdbac9b37388bf6cb65e872272af002d943f062b64bb275cb675b91d2a50e3fc0c970fb4eeb631734a6b9b SHA512 a5585481ca88f65a38da75cb6355e5b0e23b04da70ac9ab8e55abafe2b0fac83905a873a990e4de8adcf3cf484b48088d83a7aec99252a48a004158504a7e137
-EBUILD qsynth-1.0.1.ebuild 1446 BLAKE2B ac188db2357400e302959fae3e13def93ecc2ed37364233f5120369b2d0391dd36127a21d05f7bf06d443141e65b155f86681acc4d4563e1252486dda581ed68 SHA512 c871fd5c08a346bc9e6292442db4622401fa8dbf4bbea76eee9eb997179715d1b711de3ddba6323362c95a82621800c88191dd1c5e8c53778944cd020323dbf5
-EBUILD qsynth-1.0.2.ebuild 1450 BLAKE2B 89489add82e60db13848dd37e80966790ab9c697ae293b74a3c73bb84cf35e53c045e5cb3f1b56a8cd58993d7d12b5a1aa282561a4e773921f5c24fd7dc03086 SHA512 76a7e85715aa5df34219ee005e802cab0459a044653a63a1c70863d296c0e07389d02c6cf6e24b73649c2524eb5f1fb3ea5ccb148d9c98b74691706197a1aec1
+EBUILD qsynth-1.0.2.ebuild 1446 BLAKE2B ac188db2357400e302959fae3e13def93ecc2ed37364233f5120369b2d0391dd36127a21d05f7bf06d443141e65b155f86681acc4d4563e1252486dda581ed68 SHA512 c871fd5c08a346bc9e6292442db4622401fa8dbf4bbea76eee9eb997179715d1b711de3ddba6323362c95a82621800c88191dd1c5e8c53778944cd020323dbf5
 EBUILD qsynth-9999.ebuild 1450 BLAKE2B 89489add82e60db13848dd37e80966790ab9c697ae293b74a3c73bb84cf35e53c045e5cb3f1b56a8cd58993d7d12b5a1aa282561a4e773921f5c24fd7dc03086 SHA512 76a7e85715aa5df34219ee005e802cab0459a044653a63a1c70863d296c0e07389d02c6cf6e24b73649c2524eb5f1fb3ea5ccb148d9c98b74691706197a1aec1
 MISC metadata.xml 763 BLAKE2B 871d9e5edd0dcd434d496c2d40f997717d424502a5d7072264886477eaaf4bf460e32746bc899a124d97f5cadf116c0cdd198d017ebd4e9cbd769ba2af8a8512 SHA512 147e494f3b468283759a06d361d286e211e95cabbfc6daef67c406e5f19a9eb04ec611f41273ddb0c712dd1fd9afa3a71922bd9cfe749c388ab61d550dc86def
diff --git a/media-sound/qsynth/qsynth-1.0.1.ebuild b/media-sound/qsynth/qsynth-1.0.1.ebuild
deleted file mode 100644
index e030f127d687..000000000000
--- a/media-sound/qsynth/qsynth-1.0.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-DESCRIPTION="Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
-	inherit git-r3
-else
-	SRC_URI="https://downloads.sourceforge.net/qsynth/${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio qt6"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-BDEPEND="
-	qt6? ( dev-qt/qttools:6[linguist] )
-	!qt6? ( dev-qt/linguist-tools:5 )
-"
-DEPEND="
-	qt6? (
-		dev-qt/qtbase:6[gui,network,widgets]
-		dev-qt/qtsvg:6
-	)
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_QT6=$(usex qt6 1 0)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${D}/usr/share/applications/org.rncbc.qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth org.rncbc.qsynth
-}
diff --git a/media-sound/qsynth/qsynth-1.0.2.ebuild b/media-sound/qsynth/qsynth-1.0.2.ebuild
index 496e8129a1ca..e030f127d687 100644
--- a/media-sound/qsynth/qsynth-1.0.2.ebuild
+++ b/media-sound/qsynth/qsynth-1.0.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://downloads.sourceforge.net/qsynth/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 39439ee0bdb9..2cb734e33319 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,7 +1,5 @@
-DIST qtractor-1.2.0.tar.gz 2650100 BLAKE2B 18afad9da8ed526747d89448fd371d9b76f79c0e2f4cb9aa6d672692aa8862f5d362e0334254e71c89eee3f85a096f873343968116e4d6ef169be9043db603c1 SHA512 0a5e3ee9675bbb0603ce1833ee44e49144fbd501a4c7d937cfe5e3e2556fef8cf5917a5d20f10181d464dbf603f7701d1ff5fc25465dbfcaca85f5411370418f
 DIST qtractor-1.3.0.tar.gz 2662875 BLAKE2B f4db810ff073b1587abdbfafb807bcc846e11c3a633a0b19a01bf1e82335fcd00d65e7bc68a3ad1cd36ff3bc626201a46b66ca40dc7672a8c6dc9bfb5c5f46e6 SHA512 52f61ce938f2357abc3a7affb7b65e445c9418f5f00327f4cfd7aa2222786304e3e1912a5c710851fc316fe684261b45cc97a89854ad45be6b400b2392ae9f6e
 DIST qtractor-1.4.0.tar.gz 2662656 BLAKE2B 52a40439e498a3316964ad181c95b0f18ebf89b246553af30f490ce229fedbea8195b0e88518216622833e1dd8d5ad253179cb9d3d86065f10ff5f6e24377adf SHA512 23fc7922f63a31f7e8483c4d90f08e6852778edfe365e40086d3a9aa350ba75fed93d25f153e261a522615fd43515926abac913b8ee106efa5680c51100a992a
-EBUILD qtractor-1.2.0.ebuild 2568 BLAKE2B 3ff74dfde42f08bcccf2fceb8dbe8c69bbdabcfdcbd5025e93043c0dadfb614973679a1c86b99cd77b8f07e21f290b10e7948f65870ed6975241223f3789d5ad SHA512 bb1575ef98d41108910439e1f6d81e5693a11181b6710f9fe0dccb55f804b2f8f053af3a63459a7b2b59b52747f3a03bcb8dc4d2d7c48f0a0d4786075a3e20b9
-EBUILD qtractor-1.3.0.ebuild 2570 BLAKE2B 20c3c81d6ff3e79c8f6d32483992ec3ca09020a0cb2ffba5e154aa6aeea9440e9e1f7ee286c88a9970f86862d52cec2ea2e2e10cc8566ad2743af57422fab21f SHA512 8e09cf71c1eb30440184d40ead24e740797cda034dcfa456a0f74140205925968e9dfbde8d202b5e09b15e5a16551283f15a65097826d5b3bace5fcee8dc1b86
-EBUILD qtractor-1.4.0.ebuild 2570 BLAKE2B 20c3c81d6ff3e79c8f6d32483992ec3ca09020a0cb2ffba5e154aa6aeea9440e9e1f7ee286c88a9970f86862d52cec2ea2e2e10cc8566ad2743af57422fab21f SHA512 8e09cf71c1eb30440184d40ead24e740797cda034dcfa456a0f74140205925968e9dfbde8d202b5e09b15e5a16551283f15a65097826d5b3bace5fcee8dc1b86
+EBUILD qtractor-1.3.0.ebuild 2568 BLAKE2B 3ff74dfde42f08bcccf2fceb8dbe8c69bbdabcfdcbd5025e93043c0dadfb614973679a1c86b99cd77b8f07e21f290b10e7948f65870ed6975241223f3789d5ad SHA512 bb1575ef98d41108910439e1f6d81e5693a11181b6710f9fe0dccb55f804b2f8f053af3a63459a7b2b59b52747f3a03bcb8dc4d2d7c48f0a0d4786075a3e20b9
+EBUILD qtractor-1.4.0-r1.ebuild 2716 BLAKE2B 3018edd88c136c2c5cc61f8066968dbd2821dd540ec410975b22b2a88de4aa2456ccdae916389daf65a4c1c765b3d7a865f92a402ce3f7bfeafc78f78f351ff7 SHA512 79bec57a3c285ac19ece151bffcec3acafabeb1888b62023525f6b4177a9c583144ce3062413fb68f80fe6d03a27c2727698028617d8542fe5b2f9f8d47d862a
 MISC metadata.xml 945 BLAKE2B 4f88a28c83ce8b2874664ad8bf6a08d5a575a609fab948c47471ed226e284453f87da5b1ae034678295e30e5e1dce357ced317ef5d3ab793e04fb17120ce55b4 SHA512 5ab11543fa297253f5cb15515c16caf967fc69e9cccccb9ac6a6ba26fffce1f8539414edf3b065a61ddce0ff8ce3f04b90a68fd5bb79e0a498ca14c275753947
diff --git a/media-sound/qtractor/qtractor-1.2.0.ebuild b/media-sound/qtractor/qtractor-1.2.0.ebuild
deleted file mode 100644
index 27cb23754511..000000000000
--- a/media-sound/qtractor/qtractor-1.2.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io https://github.com/rncbc/qtractor"
-SRC_URI="https://downloads.sourceforge.net/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
-REQUIRED_USE="dssi? ( ladspa )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/libsndfile
-	media-libs/lilv
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	x11-libs/libxcb:=
-	aubio? ( media-libs/aubio:= )
-	dssi? ( media-libs/dssi )
-	ladspa? ( media-libs/ladspa-sdk )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DSSI=$(usex dssi 1 0)
-		-DCONFIG_GRADIENT=1
-		-DCONFIG_JACK_LATENCY=1
-		-DCONFIG_JACK_METADATA=1
-		-DCONFIG_JACK_SESSION=1
-		-DCONFIG_LADSPA=$(usex ladspa 1 0)
-		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
-		-DCONFIG_LIBLILV=1
-		-DCONFIG_LIBLO=$(usex osc 1 0)
-		-DCONFIG_LIBMAD=$(usex mad 1 0)
-		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
-		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
-		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
-		-DCONFIG_LIBZ=$(usex zlib 1 0)
-		-DCONFIG_LV2=1
-		-DCONFIG_LV2_UI_GTK2=0
-		-DCONFIG_NSM=0
-		-DCONFIG_QT6=0
-		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
-		-DCONFIG_STACKTRACE=$(usex debug 1 0)
-		-DCONFIG_VESTIGE=1
-		-DCONFIG_VST2=1
-		-DCONFIG_VST3=0
-		-DCONFIG_XUNIQUE=0
-	)
-	# Following options are left to the default
-	# CONFIG_LV2_ATOM
-	# CONFIG_LV2_BUF_SIZE
-	# CONFIG_LV2_CVPORT
-	# CONFIG_LV2_EVENT
-	# CONFIG_LV2_EXTERNAL_UI
-	# CONFIG_LV2_MIDNAM
-	# CONFIG_LV2_OPTIONS
-	# CONFIG_LV2_PARAMETERS
-	# CONFIG_LV2_PATCH
-	# CONFIG_LV2_PORT_EVENT
-	# CONFIG_LV2_PRESETS
-	# CONFIG_LV2_PROGRAMS
-	# CONFIG_LV2_STATE
-	# CONFIG_LV2_STATE_FILES
-	# CONFIG_LV2_STATE_MAKE_PATH
-	# CONFIG_LV2_TIME
-	# CONFIG_LV2_TIME_POSITION
-	# CONFIG_LV2_UI
-	# CONFIG_LV2_UI_IDLE
-	# CONFIG_LV2_UI_REQ_VALUE
-	# CONFIG_LV2_UI_SHOW
-	# CONFIG_LV2_UI_TOUCH
-	# CONFIG_LV2_WORKER
-	# CONFIG_LV2_UI_X11
-	cmake_src_configure
-}
diff --git a/media-sound/qtractor/qtractor-1.3.0.ebuild b/media-sound/qtractor/qtractor-1.3.0.ebuild
index 15185bd5c831..27cb23754511 100644
--- a/media-sound/qtractor/qtractor-1.3.0.ebuild
+++ b/media-sound/qtractor/qtractor-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
 REQUIRED_USE="dssi? ( ladspa )"
diff --git a/media-sound/qtractor/qtractor-1.4.0.ebuild b/media-sound/qtractor/qtractor-1.4.0-r1.ebuild
index 15185bd5c831..eb8b13d4e22f 100644
--- a/media-sound/qtractor/qtractor-1.4.0.ebuild
+++ b/media-sound/qtractor/qtractor-1.4.0-r1.ebuild
@@ -13,20 +13,15 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
+IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc qt5 rubberband vorbis zlib"
 REQUIRED_USE="dssi? ( ladspa )"
 
 BDEPEND="
-	dev-qt/linguist-tools:5
 	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+	!qt5? ( dev-qt/qttools:6[linguist] )
 "
 DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
 	media-libs/alsa-lib
 	media-libs/libsndfile
 	media-libs/lilv
@@ -40,6 +35,18 @@ DEPEND="
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
 	osc? ( media-libs/liblo )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dev-qt/qtx11extras:5
+	)
+	!qt5? (
+		dev-qt/qtbase:6[gui,widgets,xml]
+		dev-qt/qtsvg:6
+	)
 	rubberband? ( media-libs/rubberband )
 	vorbis? (
 		media-libs/libogg
@@ -72,7 +79,7 @@ src_configure() {
 		-DCONFIG_LV2=1
 		-DCONFIG_LV2_UI_GTK2=0
 		-DCONFIG_NSM=0
-		-DCONFIG_QT6=0
+		-DCONFIG_QT6=$(usex qt5 0 1)
 		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
 		-DCONFIG_STACKTRACE=$(usex debug 1 0)
 		-DCONFIG_VESTIGE=1
diff --git a/media-sound/sidplayfp/Manifest b/media-sound/sidplayfp/Manifest
index 22f6dff72f94..7726f6c05a1d 100644
--- a/media-sound/sidplayfp/Manifest
+++ b/media-sound/sidplayfp/Manifest
@@ -1,6 +1,8 @@
 AUX sidplayfp-1.4.4-musl-limits.patch 263 BLAKE2B bd9c7d93bb0743d94451d4379baa598265ea95bb5717a31770d85b91a3ef8e0fa222fb4c506b6d36c41354b0ddc821ed531e394e6a4db8e52eeeebd7a17168d6 SHA512 2fe65a56bca1e6f1b898ccc6a2ad0c0d2c38fcfb0a9e5a781e515214f616cee1380b4f80c0df54986d43f30fb85f62c88b73706e5db5e1f89bc0f054d805283e
 DIST sidplayfp-2.10.0.tar.gz 244263 BLAKE2B 62406febe1ba9074779b3ed77e5ceddea35d472eae94bfec13245ce9503c812d5cefeb0fa1d870e00380535145a031427463d58c8d1262ff8a43a2b470b58073 SHA512 7d59f21690d8219fd2d077541ffe90499f4b44b79e1fc4f43f3f048a01e935ad7b4723cd111acb9c9a287a1b8960b187a8e82463b9725a3171d98c32e391b15f
+DIST sidplayfp-2.11.0.tar.gz 252126 BLAKE2B 0ef141ca32c3f91dad67a54bf253da806242fb30294be97b44ded23490bb30d05dfc63593bb3c5b05a1bae48228d0ce3c31c35dba15dea1db70ed36692ef060d SHA512 455e8a81e7540f7fa5b97a11c5ab45cb87d77210569dd62ea3bfee8149d56b884eafb23ae404e806b92bf62f40bbf560ecfda76073477caf3fa960a1f52933be
 DIST sidplayfp-2.9.0.tar.gz 247965 BLAKE2B 11ff3c33360aca182886418bda8dbfb534de6c6e76b854dfaf78599ce388b5c493221cf8d0f13fdb5ccb7cae7d352484b56505cbef3f955cac5cb26d933d35e1 SHA512 2a59cca74456e04ff6cd5bf3c8f47eb8687e577cd907979188713d38f1602ec8933d467222ae4f5e630116bc71832435bd911901c666b3285c796bb1c5d03393
 EBUILD sidplayfp-2.10.0.ebuild 1006 BLAKE2B 944a4fc8f5de733504aaf5fdafa395053761892926fe4b905c445ca7e805c500b84a4cda1eadcad944bce9ee6598a09cdde896bdf09b25b47b8ead7e68ac4032 SHA512 9190d731ace9ff9f42e36b5bebfc21fba44b9d4ece391e12fe08fcd92266cb287e0f76617910ef8aa7e277dcdb117272cdff991642cc666f09100038c2f2d62f
+EBUILD sidplayfp-2.11.0.ebuild 1006 BLAKE2B 944a4fc8f5de733504aaf5fdafa395053761892926fe4b905c445ca7e805c500b84a4cda1eadcad944bce9ee6598a09cdde896bdf09b25b47b8ead7e68ac4032 SHA512 9190d731ace9ff9f42e36b5bebfc21fba44b9d4ece391e12fe08fcd92266cb287e0f76617910ef8aa7e277dcdb117272cdff991642cc666f09100038c2f2d62f
 EBUILD sidplayfp-2.9.0.ebuild 1005 BLAKE2B 3cc6a183340649a7337349e230c5416c6a627b8fc176a105b5788ceb191463d9b74164e106bc5167b70513dcd736ba8159635043df25eda0390495fb28937764 SHA512 a279069fad8ca3d7a410e76122888edec9f0d50a42403a19fb6e34a3c7eae8bfdeec851dc7f68f5d7d7cc970bbf85f377957805b85d3dfcf86074756cea42d0f
 MISC metadata.xml 339 BLAKE2B 79d766f101909c202affb7cc72bbefdfb8d5b44fcbf74f17f98e665351384a8110aec7ddec0c685fb328198d29ae4953ce341cda3dd4abd2a67f157d90628175 SHA512 172879da9ed0be1ff48d75d23d3b23e3070247b4ef1decb291b020f7bc1522dd033e78f92d38511eedaae7c1944edc5bb05ff763f4d20a6b7015198ebd38f16f
diff --git a/media-sound/sidplayfp/sidplayfp-2.11.0.ebuild b/media-sound/sidplayfp/sidplayfp-2.11.0.ebuild
new file mode 100644
index 000000000000..2d76084b9af7
--- /dev/null
+++ b/media-sound/sidplayfp/sidplayfp-2.11.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Sidplay2 fork with resid-fp"
+HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
+SRC_URI="https://downloads.sourceforge.net/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa oss pulseaudio"
+
+BDEPEND="virtual/pkgconfig"
+CDEPEND="
+	media-libs/libsidplayfp
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-libs/libpulse )
+"
+RDEPEND="
+	${CDEPEND}
+	media-plugins/mpg123-output-plugins
+"
+DEPEND="${CDEPEND}
+	oss? ( virtual/os-headers )
+"
+
+DOCS=( AUTHORS README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.4-musl-limits.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use alsa; then
+		sed -i -e 's:alsa >= 1.0:dIsAbLe&:' configure || die
+	fi
+
+	if ! use pulseaudio; then
+		sed -i -e 's:libpulse-simple >= 1.0:dIsAbLe&:' configure || die
+	fi
+}
+
+src_configure() {
+	export ac_cv_header_linux_soundcard_h=$(usex oss)
+
+	econf
+}
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index b5100d7c7490..456916f58ed4 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,3 +1,3 @@
 DIST sound-juicer-3.40.0.tar.xz 1806280 BLAKE2B 9af23f0aec09d27e845d68647ec7c2b3c703ab488d1240211a048c666e67040c157a283f98356d93026ccc3544e05a8616c1556dff115cb2c8f26d410f469b43 SHA512 b0d9720f0c75dfb8809764213e0589978cb265dfc2010f1accb92e7ffdfdc2ac6deb17a4683e9f7f5a6e867d45f87e8f93659ef04bc73ead3b403394a0ba409b
-EBUILD sound-juicer-3.40.0.ebuild 1313 BLAKE2B d7d450da99f75bbbe9e5a45b2be84a38579aa51e292a5f29468742a3901f154a2da01e8cefac10560bc4afc5201fa4b5f564b6e1873599c54aa190a220dbea85 SHA512 5f00a6d952aa343417d125a05a0fd869893fb359c115f768288fdd1a8ad9a979d7e8012192764ea1731a9d8fdd994ada76e8bf5213f6030217610078689cf05e
+EBUILD sound-juicer-3.40.0-r1.ebuild 1356 BLAKE2B 2fad7a34259fdd041a38c6065878344da1a7663cbc6a5a39ece300dea592226c3ea0218f8edc0530e031e652da8b5351a4e2518ddc08723dbe92b46a020540ba SHA512 8b237a5d9162aabe9ba14af99a0f00451d4df968417e48af80b6ce4eb7ca32cbe8c593b4ae4175b9d73a2eceac280dcd4a018043c26dcef51b3a96f339cae672
 MISC metadata.xml 353 BLAKE2B 7bb8c271b55301fc08aa4582359c3252afd29adb1a37c782d7cea6e2749c8078ba2a2c98cf5eb1950e1792f7fc7af1fdcc0ce636ed1a6f16ce4fbe6ffdc5c00e SHA512 3cc1ab276ace79c2735eb99384ee8e793cb6ec724a3a0b9a01603c39a14d141d1177997d6c95e8d9152771db092615eadc09868f61d1d764ef35232def8a4fe9
diff --git a/media-sound/sound-juicer/sound-juicer-3.40.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.40.0-r1.ebuild
index bc9840221f95..7a845ddd1045 100644
--- a/media-sound/sound-juicer/sound-juicer-3.40.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.40.0-r1.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
@@ -17,7 +17,10 @@ RESTRICT="test" # only does appdata validation, which fails with network-sandbox
 DEPEND="
 	>=dev-libs/glib-2.49.5:2[dbus]
 	>=x11-libs/gtk+-3.21.6:3
-	media-libs/libcanberra[gtk3]
+	|| (
+		media-libs/libcanberra-gtk3
+		media-libs/libcanberra[gtk3(-)]
+	)
 	gnome-base/gsettings-desktop-schemas
 	>=app-cdr/brasero-2.90
 	media-libs/gstreamer:1.0
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index da8a3a765887..bebb3d41069a 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,7 +1,7 @@
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
-DIST upmpdcli-1.8.11.tar.gz 629053 BLAKE2B 42b8fa8f69bc0feab8dbeee8be48ec120c7c5084da1ddf64902b26845cecf7b50652260f1e56b9297a632d5b3c143390fbcef9212b0128b8f1b12c05aeb02979 SHA512 86badc49d3a6adef1d5283c38776cc8ab8dce6ce516ce6a87af76d00f4a681747eb5d4415640dfa191929ef5b77865a57bc72c7e10bc37e59c66d44119e7749c
 DIST upmpdcli-1.8.17.tar.gz 706974 BLAKE2B 833aa9cbee6e725d15551409babdab8140721c02048427d6de7b5ddb49ce76f99c7af8c9de4925482f819c636a5fe74037bc096548b79a69afdb828b90aa3e5c SHA512 de11076176d50021103089b202bd7d7b1bb364482eeb5a671038c20b24eead5f64c80ed4873dbd70dae037a8b12fbee6de522f3a484d1b67d77723e26211a4af
-EBUILD upmpdcli-1.8.11.ebuild 820 BLAKE2B 6897748c7959b35629752e1d183eb2b327e3fc9647e049e10df06c6955cf04058a5fc7b6b4ad885c6e06c70b691e62294d56da2e36e1f4babdd6a6d22f1e3297 SHA512 c264769e93941ea227012a6d49a1931040997534b0dfe6c220b9c8020574fddd0a07fe344ed40c54dc3b04f222443fd91769116db55eb52751857ba48fae46f8
-EBUILD upmpdcli-1.8.17.ebuild 822 BLAKE2B 109d9c9825feb4edf5852a11e8ad781c8357cd653b4eb50c61a159ceabe8969dfa2caa04cf2cf9622541f72674dedf81b2d896b1bdc110e95c225daf25f81160 SHA512 2d87da1d700269d540d818c73fefab84fec6fb942859db842a420f0620fb7a0ef3ee0c56a68b79111b33b0b488c4f725e41f3b55a56bc005561bd09debefb5d5
+DIST upmpdcli-1.8.18.tar.gz 706556 BLAKE2B 3c1d3efb5ac2a93feb852a3782580f1259355fffb7a33d74dd1be41cf78df204f66ab347785b27d7680f29f3ab50ff0e801ce1c7bd8e997e8e75b6def6a136fa SHA512 654c816bbddf11fcb882cac73c91dd676116498076fe1b7af135fe6fbff840ce7b9ea0bd4cd52188ece10a7f1758475d2c9b20dbf679f63fa526aab7398d0c80
+EBUILD upmpdcli-1.8.17.ebuild 820 BLAKE2B 6897748c7959b35629752e1d183eb2b327e3fc9647e049e10df06c6955cf04058a5fc7b6b4ad885c6e06c70b691e62294d56da2e36e1f4babdd6a6d22f1e3297 SHA512 c264769e93941ea227012a6d49a1931040997534b0dfe6c220b9c8020574fddd0a07fe344ed40c54dc3b04f222443fd91769116db55eb52751857ba48fae46f8
+EBUILD upmpdcli-1.8.18.ebuild 822 BLAKE2B 109d9c9825feb4edf5852a11e8ad781c8357cd653b4eb50c61a159ceabe8969dfa2caa04cf2cf9622541f72674dedf81b2d896b1bdc110e95c225daf25f81160 SHA512 2d87da1d700269d540d818c73fefab84fec6fb942859db842a420f0620fb7a0ef3ee0c56a68b79111b33b0b488c4f725e41f3b55a56bc005561bd09debefb5d5
 MISC metadata.xml 324 BLAKE2B 53acf2369d1e3957218ea3634ed2fe10034b9d74109af9df7acfcf29a37697ade6488aefc5df3503754833b0f6dc5df777feb945355f633fa6e1a3ade8b13adf SHA512 871929dc11894dc91b3257a5e9e8f5164e3f5e1af0dce2cc7571dd106cc70bd777562bb56913ca45f3bf1cf0316938f7f2c0a8386bdcf408c0f834385db4d45d
diff --git a/media-sound/upmpdcli/upmpdcli-1.8.17.ebuild b/media-sound/upmpdcli/upmpdcli-1.8.17.ebuild
index c929aea886e6..8e63719d0f5c 100644
--- a/media-sound/upmpdcli/upmpdcli-1.8.17.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.8.17.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="thirdparty"
 
 DEPEND="
diff --git a/media-sound/upmpdcli/upmpdcli-1.8.11.ebuild b/media-sound/upmpdcli/upmpdcli-1.8.18.ebuild
index 8e63719d0f5c..c929aea886e6 100644
--- a/media-sound/upmpdcli/upmpdcli-1.8.11.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.8.18.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="thirdparty"
 
 DEPEND="
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index f4f3c0affa64..2fc53ac6c079 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,7 +1,5 @@
 AUX xmms2-0.9.1-cpp-client.patch 503 BLAKE2B b8127c72ab8830cb0c4ca45c5c7887f194f5cbe0999167f8eadd803df75ecaaaf3b4246d691be1b6106dbede0b3293747fa6d1cfc5f151968dd26065aa9e3b15 SHA512 3b5703614a3afe49cadaf74b2d5e9d436232af62dc60248f929961806ab058ed8b06df0fd9ec0f958e2b454e3be75028117fc9c7a071bef1f9d2aa5496c448c5
 AUX xmms2-0.9.1-faad.patch 437 BLAKE2B 832db481404d470d347ee73ae04064d5ce423aca2a4a7681a80301e33522245429306e26eb200f9e111de60e2fa5341478f51282ee8c2264cf3b60a79b83a797 SHA512 7b5380762e311e1479073ca922343ce5d0dbfe2b3ab0f9218e2d85d52d8a37e301a6bb7bdfc0603b3f72578421df0ff335edb8bd9ea20e485cc1037a2197c62c
-DIST xmms2-0.9.3.tar.xz 1741548 BLAKE2B 19a99d66d3b6991811c1124b76becaa05d04602a84725ca166141947272a3a033545a2e315a70751e8fab83a9b3b16235f1e408dd13caac0a8e7cbf9e8101e34 SHA512 03f2f6b66a35a8e80fdba3afb2a550c19ce2b7b6d53c63c7a735eb787f79b27a325b0715a31544e87c86e386f54a5a9a89aa3a9e81ae5ed29e362bd7b5bfa1ad
 DIST xmms2-0.9.4.tar.xz 1741996 BLAKE2B edb8dfb78d9a4cba19a209f9f5740fcf43c2b295ff3907ad8fa36689f19142e3b86e57ea9bd3ce97a04bd2284c4dd7be45c94510f3004f5ee655f6c5b88a898f SHA512 71075d41a49983624b87d5c80b0d58283fe53146ecad9b8d37d96545881bfec4e6de30eb1463fad37a8f8a3f3ebb58c12e10eecd998d9aaff7f3c1bdaef83bc9
-EBUILD xmms2-0.9.3-r1.ebuild 5288 BLAKE2B cfbac959fb59e252871e14849262def05faf2d85150c066512c44c7f0c8e2a33b98fdc3b263d923c6e08535d47cc19882c908e25f636b4ed118c03591bff7a73 SHA512 e6b3ad9435927e4479004b48a324420c0cf37bccfe09b3658e274ec588f0976c7811c3d55f2d9796939f487d8cec724730b03e70773173a05b7ab5ec7f137b0e
 EBUILD xmms2-0.9.4.ebuild 5293 BLAKE2B 1a49199f211f7aff30fe238cc80c3350fc64ab5147d66e975ab815f5cb80d8081aea0fbc3e9c07cd0d82a16072fca6828e08a24a4d7de35aa0c7e51d25b4036c SHA512 da8e62490641e700678ff2824c297219626c6f74d09cd24d4c19761a0cc927a8c2e483a6ff5a1d92a5ccae2f5ab5b413b043131ed252e1b7a37b34fdfc028f2a
 MISC metadata.xml 1313 BLAKE2B ccb64de086998cdc0e8e71a44d0e84107ac7effae08b8628aa872b9ce85a11f465f2501bf4ef1bb13a1e10e92a6caa281c885bfb46673c16d4ab1117871908b2 SHA512 0882de8a7c5bdc4e9289bc03c582d8a8a627090dfaa9658d9ab174ceae000faad92044466ca7517b3214ddd475509131c432f5008778de41a8bec5b7250c737b
diff --git a/media-sound/xmms2/xmms2-0.9.3-r1.ebuild b/media-sound/xmms2/xmms2-0.9.3-r1.ebuild
deleted file mode 100644
index eda60ca94541..000000000000
--- a/media-sound/xmms2/xmms2-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="threads(+)"
-inherit flag-o-matic optfeature perl-functions python-single-r1 waf-utils
-
-DESCRIPTION="X(cross)platform Music Multiplexing System, next generation of the XMMS player"
-HOMEPAGE="https://github.com/XMMS2"
-SRC_URI="https://github.com/xmms2/xmms2-devel/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~loong ppc ~riscv x86"
-
-# IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
-# flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`
-# (if have a use for some of these disabled features, please file a bug)
-XMMS2_OPTIONALS=(
-	cxx:xmmsclient++,xmmsclient++-glib :launcher mlib-update:medialib-updater
-	:nycli perl :pixmaps python server:s4 test:tests libvisual:vistest
-	# disabled: et,mdns,migrate-collections,ruby,sqlite2s4,xmmsclient-cf,xmmsclient-ecore
-)
-XMMS2_PLUGINS=(
-	aac:faad airplay alsa ao :asx cdda :cue curl :diskwrite :equalizer
-	ffmpeg:apefile,asf,avcodec,flv,tta :file flac fluidsynth:fluidsynth,mid1,midsquash
-	gme :html ices :icymetaint :id3v2 jack :karaoke :m3u mac +mad modplug
-	mp3:mpg123 :mp4 musepack :normalize :null :nulstripper opus oss :pls
-	pulseaudio:pulse :replaygain samba sid sndfile speex tremor vocoder +vorbis
-	:wave wavpack :xml xml:rss,xspf zeroconf:daap
-	# disabled: coreaudio,gvfs,mms,nms,ofa,sc68,sun,waveout
-)
-
-IUSE="
-	${XMMS2_OPTIONALS[@]%:*}
-	${XMMS2_PLUGINS[@]%:*}
-	+server
-"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( server )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	sys-libs/readline:=
-	libvisual? (
-		media-libs/libsdl[opengl,video]
-		media-libs/libvisual:0.4
-	)
-	server? (
-		aac? ( media-libs/faad2 )
-		airplay? ( dev-libs/openssl:= )
-		alsa? ( media-libs/alsa-lib )
-		ao? ( media-libs/libao )
-		cdda? (
-			dev-libs/libcdio-paranoia:=
-			dev-libs/libcdio:=
-			media-libs/libdiscid
-		)
-		curl? ( net-misc/curl )
-		ffmpeg? ( media-video/ffmpeg:= )
-		flac? ( media-libs/flac:= )
-		fluidsynth? ( media-sound/fluidsynth:= )
-		gme? ( media-libs/game-music-emu )
-		ices? (
-			media-libs/libogg
-			media-libs/libshout
-			media-libs/libvorbis
-		)
-		jack? ( virtual/jack )
-		mac? ( <=media-sound/mac-4.12 )
-		mad? ( media-libs/libmad )
-		modplug? ( media-libs/libmodplug )
-		mp3? ( media-sound/mpg123 )
-		musepack? ( media-sound/musepack-tools )
-		opus? ( media-libs/opusfile )
-		pulseaudio? ( media-libs/libpulse )
-		samba? ( net-fs/samba )
-		sid? ( media-libs/libsidplay:2 )
-		sndfile? ( media-libs/libsndfile )
-		speex? (
-			media-libs/libogg
-			media-libs/speex
-		)
-		tremor? ( media-libs/tremor )
-		vocoder? (
-			media-libs/libsamplerate
-			sci-libs/fftw:3.0=
-		)
-		vorbis? ( media-libs/libvorbis )
-		wavpack? ( media-sound/wavpack )
-		xml? ( dev-libs/libxml2 )
-		zeroconf? (
-			net-dns/avahi[mdnsresponder-compat]
-			net-misc/curl
-		)
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/glib-perl
-		virtual/perl-Carp
-		virtual/perl-IO
-		virtual/perl-Scalar-List-Utils
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	cxx? ( dev-libs/boost )
-	test? ( dev-util/cunit )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	perl? (	dev-perl/Pod-Parser )
-	python? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]') )
-"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	avcodec_free_frame # succcessfully detects that this is gone in newer ffmpeg
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.1-cpp-client.patch
-	"${FILESDIR}"/${PN}-0.9.1-faad.patch
-)
-
-src_prepare() {
-	default
-
-	# meant to be configured, but give a default for out-of-the-box midi
-	sed -e "s|/path/to/.*sf2|${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2|" \
-		-i src/plugins/fluidsynth/fluidsynth.c || die
-}
-
-src_configure() {
-	filter-lto # `xmms2 add somefile` breaks with lto + fortify=2
-
-	local wafargs=(
-		--boost-includes="${ESYSROOT}"/usr/include
-		--with-target-platform="${CHOST}"
-		--without-valgrind
-	)
-
-	xmms2_flag() {
-		local IFS=:
-		set -- ${1#+}
-
-		if [[ ${1} ]]; then
-			usev ${1} ,${2:-${1}}
-		else
-			echo ,${2}
-		fi
-	}
-
-	local flag optionals plugins
-
-	if use server; then
-		for flag in "${XMMS2_PLUGINS[@]}"; do
-			plugins+=$(xmms2_flag ${flag})
-		done
-	else
-		wafargs+=( --without-xmms2d )
-	fi
-
-	for flag in "${XMMS2_OPTIONALS[@]}"; do
-		optionals+=$(xmms2_flag ${flag})
-	done
-
-	wafargs+=(
-		# pass even if empty to avoid automagic
-		--with-optionals=${optionals:1}
-		--with-plugins=${plugins:1}
-	)
-
-	if use perl; then
-		perl_set_version
-		wafargs+=( --with-perl-archdir="${ARCH_LIB}" )
-	fi
-
-	waf-utils_src_configure "${wafargs[@]}"
-}
-
-src_compile() {
-	waf-utils_src_compile --notests
-}
-
-src_test() {
-	waf-utils_src_compile --alltests
-}
-
-src_install() {
-	local DOCS=( AUTHORS README.mdown *.ChangeLog )
-	waf-utils_src_install --without-ldconfig --notests
-
-	use libvisual && dobin _build_/src/clients/vistest/xmms2-libvisual
-
-	use python && python_optimize
-
-	# to avoid editing waftools/man.py (use find given not always installed)
-	find "${ED}" -type f -name '*.gz' -exec gzip -d {} + || die
-}
-
-pkg_postinst() {
-	use fluidsynth && optfeature "the default MIDI soundfont" media-sound/fluid-soundfont
-}