gentoo auto-resync : 02:01:2025 - 06:31:11

34 files changed, 109 insertions, 753 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 574f8230972c..e80644dcca3f 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index ee2e97af8eff..c09827824fb0 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,9 +1,7 @@
 AUX chuck-1.4.0.0-hid-smc.patch 2887 BLAKE2B e02129a2f3e550fa383a691a3e55870d152c89386703e01d134ef345efadadcccf190d07b191f096995b9df2f27e85ccc3e26cb7e73052432c44e43bf82c8d5a SHA512 fb15c2c5e0cfe1e8326c71fe11a72bd3d04996890e7a466111d0360e6f8050408c7ba61f23ab57ae8d3d21fa009ac3afbba002b63819c321d6a55e83e000fe0a
 AUX chuck-1.5.3.2-makefile.patch 567 BLAKE2B e860079107526b090d592fadf0652dd26b29139cb081eaf43071544ac6f23cde2ddc50db59b57370b09aad19fc595b12b75341908716a0faf13ebedf0c437da0 SHA512 363dce64af8dded1115473d5268f69a0a4a391a0825a1f0811d8f490ec6181118b6f34af5934ffcd02a5ac9459faee1aef3ff4a2e06b0291bae473173dba99cf
-DIST chuck-1.5.4.1.tgz 22311510 BLAKE2B adfc00bf7b5e828d5b5668b703919d4a4b9e7890a9a59c6d5d1caf2600c9638e14366d4d1fbd417d4fbffbc31003386212d30e1e22f47349c62c36a3b6c8dea4 SHA512 8d372a20c7c98273ac0941a0a59f8e91dbafc9ac290d2454aa23411b4eb515bc7ac12f9635d2f25e2cbf8faca52c67a6ea874bbae52ad24fd44544bd977693aa
 DIST chuck-1.5.4.2.tgz 22311827 BLAKE2B 1215211c837fa55c132742a9a4edef97446304fffb6a6e9f4de0d1da66c634c81398870fbd30ba864939f7e3a54bd0f2125bd6c4c9634edb51da43fa25fd05a9 SHA512 c4ce1e3e04d33fbd516f41eebfbc3b71399c587c0ea7b5d16b4d8a8fe5efb3e244ea0e8860f7331aa740f68f96f6b8f92d37104e6b71f0b6e0cb704acc14715b
 DIST chuck-1.5.4.3.tgz 22318954 BLAKE2B 83fffaa811fb9ba73f2000ea7a6d5e133c42964571340877a4080e2a6360ac3a7df8bda01a7c0a4acbdbe2f64d97310dbcff237d935b5598ba5ca0e1a312cd2f SHA512 a8324c7dcd5d031cc256d0a5e87d69ae728d008735c81d977911695ec9e93ff6e647cbc4ef36f7fabf84674c468fcaf7df3350f4898436267344f44f8e4089c7
-EBUILD chuck-1.5.4.1.ebuild 1853 BLAKE2B 95b698e790e022be54b16657aa25b6bf5461f9fabd77feaa5a565beb1ee203882c8076cfd90e52e57f991eb714d4568fc65610648112ac660489c739bb3cc405 SHA512 b1ec557443d943ef4efa0b7dcd29a74259cb43e9c6eef95aa1d2fe872f1b50383d2e720e52a9b345f5f6473e5bdeec517cf5320593632c7d04f19084fcc7a55f
 EBUILD chuck-1.5.4.2.ebuild 1853 BLAKE2B 95b698e790e022be54b16657aa25b6bf5461f9fabd77feaa5a565beb1ee203882c8076cfd90e52e57f991eb714d4568fc65610648112ac660489c739bb3cc405 SHA512 b1ec557443d943ef4efa0b7dcd29a74259cb43e9c6eef95aa1d2fe872f1b50383d2e720e52a9b345f5f6473e5bdeec517cf5320593632c7d04f19084fcc7a55f
 EBUILD chuck-1.5.4.3.ebuild 1855 BLAKE2B 0cd25e5032ce928c1bff8969d383a14722275667ed03b10c57c70726b57347263ade552ac558a4699af82bf812f19928e2d1aa5d32fe67bfd2c24b01b2f432e6 SHA512 1e0faac1cc0ba109609fdc27c14bd40e18e92797e7d764104fbf66bccaf1265590aa4b14873a7811b18ce9923c0a16cd0cf78e68de7c6fca3c9e31f2f5f26684
 MISC metadata.xml 968 BLAKE2B 5f7c72834133fedc3ffb54f563dc80552668484628029f8d205444cd69f89f91081ed6a71aae4d542dae09bcfc729ad88c6701df450313275e6d1c1f522fd7a6 SHA512 c548e0d3c701497e696626f46c010aea9a90bb1b52bd5f2e1ebe0f4189b171dc21c0848b90a6a23cc44ae2ba5e98d8671529fe6b14c957ad73202191c2915c0f
diff --git a/media-sound/chuck/chuck-1.5.4.1.ebuild b/media-sound/chuck/chuck-1.5.4.1.ebuild
deleted file mode 100644
index a9df37bf63c1..000000000000
--- a/media-sound/chuck/chuck-1.5.4.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language"
-HOMEPAGE="http://chuck.cs.princeton.edu/"
-SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa jack examples"
-REQUIRED_USE="|| ( alsa jack )"
-
-RDEPEND="app-eselect/eselect-chuck
-	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )"
-DEPEND="${RDEPEND}
-	app-alternatives/yacc
-	app-alternatives/lex"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0.0-hid-smc.patch
-	"${FILESDIR}"/${PN}-1.5.3.2-makefile.patch
-)
-
-compile_backend() {
-	backend=$1
-	pushd "${S}/src" &>/dev/null || die
-	einfo "Compiling against ${backend}"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" linux-${backend}
-	mv chuck{,-${backend}} || die
-	emake clean
-	popd &>/dev/null || die
-}
-
-src_compile() {
-	# when compile with athlon or athlon-xp flags
-	# chuck crashes on removing a shred with a double free or corruption
-	# it happens in Chuck_VM_Stack::shutdown() on the line
-	#   SAFE_DELETE_ARRAY( stack );
-	replace-cpu-flags athlon athlon-xp i686
-
-	use jack && compile_backend jack
-	use alsa && compile_backend alsa
-}
-
-src_install() {
-	use jack && dobin src/chuck-jack
-	use alsa && dobin src/chuck-alsa
-
-	dodoc AUTHORS DEVELOPERS QUICKSTART README.md THANKS VERSIONS
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Chuck now can use multiple audio engines, so you can specify"
-		elog "the preferred audio engine with chuck-{jack,alsa}"
-		elog "Or you can use 'eselect chuck' to set the audio engine"
-	fi
-	eselect chuck update --if-unset
-}
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index 24a9ca603717..f5f680d9eef4 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -1,6 +1,4 @@
 AUX flacon-11.3.0-no-man-compress.patch 1401 BLAKE2B 29b6454a0e34e031c0bbd36990ea11cc37bc8e4923a26c3edb587a78ccdb969ff6577490bd01756d6b9e198bac833a2f6e949aef9f76e0f3e4070db066365763 SHA512 9b966f1abd557f5b2f02c198963f79d83ab8592e40ff9c30e3a45f5b46beade43afde2fcf617cba50f3bdea8a1971c80f3960bc3de8c37062667d56a328579cd
-DIST flacon-11.3.0.tar.gz 4081613 BLAKE2B 791628fe40f49548d65b2a49f259d4ffaf42ba97f9674649669ceded7073fb805f277fefca1d3fffaae86438f9d7cff443dccbb6c8bef5e40f0eb60554c11db9 SHA512 e4b4f3876f4f647dafa21118c13482678c2766dce94b650142d7b2b21897d6e8f1f85601877b388c7f8554d5e57778de9a6db82ae38c1f089e7c2f88b1c497b8
 DIST flacon-11.4.0.tar.gz 4095740 BLAKE2B 078bded28f114939ee2a003885e85a6259122ae0de95265a52de525202645d872550a773b49b7d37e3b479912bc6b31245532f71bd2020a954b227082c856589 SHA512 321f80c40b61e60e91b32d19a1f14dbdc9738aacd54e7ea8bf0a969daeeec3f663b119fd3973a2722b14b836bc8d6c16cd3f4b831c003a906f1d110db5caaeee
-EBUILD flacon-11.3.0.ebuild 2301 BLAKE2B 37abcf7220382bec39ec60ce157e2d89a4db6c413afd7cd16ac52214fd98492f0021ba8939dff0aad4ce9637253fbd9e1003ae4e13ab773bf100c6a86786b192 SHA512 16cfd59d37263b244bf990c15fffe4bfc374ff1f5f424ad7a8d48ea40d9af9b87e6c7f16fc4773d4910f624ceb660108d0a40dcc7fa8ee00dc115412e60d6f92
-EBUILD flacon-11.4.0.ebuild 2279 BLAKE2B b8ae312aae2ae6f9e9900ce39a11461161aee6a254074954cdfabbdc5905aff89ba6a727951dc7058b2931c05143e14725295593032b2273b4635ce1422fc2d0 SHA512 bdb33bbfc7042a5d38727eb7577a9d7fc4ab664be37cbd70a236529b96cbf77d9e53cbd9022fefca2ea42689fa84c80829bed91c5615eaf8410da4ba3e10df68
+EBUILD flacon-11.4.0.ebuild 2278 BLAKE2B c11f83d2c852de234c6b2f595e273fb38021d1c69ae25029bd662e7acfc6d4cb0e5b955a0c5996eb01259f6269059844d1a1d9926ca9a6c1fc8c330d7c4a25e0 SHA512 364c061edd7f73407ee00f5c6f3570f9902361e58ec9df1b5b41f0526982848e25b07bd86d16440ab46bd83d56cbb55dbca9d736fb17f9650d2c9010bdd6a87d
 MISC metadata.xml 483 BLAKE2B 795d557d1298374afb1a7b7e944258091e5a1a33cbba44ffb89d2b41545a13bc079ea406012351256e9aa3be08aa0277adb6757e68ac5d55e3fd636bce5efca9 SHA512 3d744c253befad102285251d40d891aef8ddab615f095a717951706fd64ac12f4fc7191d1b5ce0c4e9c3870eec5b427fcf5158771349a4a8c5219f7b797386ac
diff --git a/media-sound/flacon/flacon-11.3.0.ebuild b/media-sound/flacon/flacon-11.3.0.ebuild
deleted file mode 100644
index 9edb7111612a..000000000000
--- a/media-sound/flacon/flacon-11.3.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Tests require lots of disk space
-CHECKREQS_DISK_BUILD=10G
-inherit check-reqs cmake optfeature virtualx xdg-utils
-
-DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks"
-HOMEPAGE="https://flacon.github.io/"
-SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-i18n/uchardet
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg]
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/taglib
-	media-sound/sox[flac,wavpack]
-	media-video/mediainfo
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	test? (
-		dev-cpp/yaml-cpp
-		dev-qt/qttest:5
-		media-libs/faac
-		media-libs/flac
-		media-sound/alacenc
-		media-sound/alac_decoder
-		media-sound/lame
-		<=media-sound/mac-4.12
-		media-sound/opus-tools
-		media-sound/shntool
-		media-sound/ttaenc
-		media-sound/vorbis-tools
-		media-sound/wavpack
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-man-compress.patch
-)
-
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# All tests fail with enabled sandbox
-	# TODO: Get all tests to pass
-	# See bug: #831592
-	local -x SANDBOX_ON=0
-
-	virtx "${BUILD_DIR}/tests/${PN}_test" || die
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} optionally supports formats listed below."
-	optfeature 'FLAC input and output support' media-libs/flac
-	optfeature 'WavPack input and output support' media-sound/wavpack
-	optfeature 'APE input support' media-sound/mac
-	optfeature 'ALAC input support' media-sound/alacenc
-	optfeature 'ALAC output support' media-sound/alac_decoder
-	optfeature 'TTA input support' media-sound/ttaenc
-	optfeature 'AAC output support' media-libs/faac
-	optfeature 'MP3 output support' media-sound/lame
-	optfeature 'Vorbis output support' media-sound/vorbis-tools
-	optfeature 'Opus input/output support' media-sound/opus-tools
-
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/flacon/flacon-11.4.0.ebuild b/media-sound/flacon/flacon-11.4.0.ebuild
index cdb7c74e776d..2bac0621ee7d 100644
--- a/media-sound/flacon/flacon-11.4.0.ebuild
+++ b/media-sound/flacon/flacon-11.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 7cdf5af2d07f..2be49d6b3169 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,9 +1,7 @@
-DIST fluidsynth-2.3.7.tar.gz 1777056 BLAKE2B b6a4fcf430f5e89a66d80faf61af3e005057f6254912a0a8af4eabd92d8b46ff9bc5a072e09eac3782f99ea26900150f5eda5eefe514a2c95f9229558ce560bb SHA512 f5fd5ddbc4d30ded258ae3d04ba5981ce8da1132c5d93faf1e8745a9d9f89c9fb3365f0447b94e0fe0e9b032c789fcbd6e647a65a50d1f76179b53a76683d004
 DIST fluidsynth-2.4.0.tar.gz 1780676 BLAKE2B 9814d8ac133ab18650b7f3b6ef0cdec6da76a59ef2dd2af9471311e7e7850604376d3d135e13c5b6e01a93d70bd5f266ad9df2a270cd9f3482738bb3d8f81747 SHA512 57770597e26140011324cac14dd81aa1f5fc52ec0c256a4e16f629b81b8d477279ad714cc9d1e375d74aabb348e1436eafd06746cdf10fa29196468645bf7600
 DIST fluidsynth-2.4.1.tar.gz 3298564 BLAKE2B 15ed3a808d0c0123226a087520564c2833d43c20fd8b6aa273a7467a74d92b8a67159fc960ad2f3a5d764b8e95ec25c1ec045c203058ceb83bfc276408d96b58 SHA512 d01d18c42ce98d0daa4e137118fc41f0a59047013870c09bacd9014baadf747e8e73571046781e34bc03eef454f2ef12ee59cf9b2c7f9517c586c08041ebe081
 DIST fluidsynth-2.4.2.tar.gz 1785003 BLAKE2B d514e595b6e902dc54ef94575701c8aa0b6b1d84d92f57874b163319076cb85c38b7c97bce70f66f55f3ef8e791608e7e29add6cb92c768e4f6ba2a4a89a1481 SHA512 8c43e4e86f364f42115a51311231d9926325d7e519c2ddd087a9ed421c9a94cc0dfc5cfbfdfffe9401c634cce14c6e442523550114ac887096dde22ab0c63d98
-EBUILD fluidsynth-2.3.7.ebuild 4006 BLAKE2B e465cd63547a239b6b94a659f70426da4b6db65c0599e9600fb5b055cce959ff8c8021e0dc9dab161e7b6edc92d869c334fa93c5a42ab04d88c6c4397f71f476 SHA512 6eb564fd2b1b44a5a69026d40e194be65d5ab497ad2263a9b2960d8414a242ff03ff279a2ba59cf19cdc237e1a39b442bac581f9377d0c44f30050bd7c01bfc9
 EBUILD fluidsynth-2.4.0.ebuild 3845 BLAKE2B 8cf7c2a64aa7538c6f3317f96536a2aeec63ace62086bd90ec43dff742551839788d943dfe38f2b2e3c3bb9657c200d369bfde2d2cb1a872f2100f7c5d72cc23 SHA512 3f0ecae6ec91b6cea2e9ca6d88537aad9a94c76308ce6b0dbf4eeb848ff0c44b3fbdb54a843b3546a332c468be4ddfe813e637e7c9930e452eb136129e88572c
-EBUILD fluidsynth-2.4.1.ebuild 3852 BLAKE2B af2d4abf0e1f3e9ae9e49d2c2f9096880a5876ad6668f11ca55001003e3f04f78d6f4af34a789113c9efa97e92adabdcf68ab843da5eaf2a07e21da4b3792a8e SHA512 22eaa8848c005ff49558fcb94fa976570ae8562df19fb16a2aafb4a7a28ad16097fd94f67ecf4fda7a4055fe95025ecda945a31bb2be5b785baf36e32a7eb355
+EBUILD fluidsynth-2.4.1.ebuild 3848 BLAKE2B 98889ad4862e2bc4c24759ad2d944f68fb2ccdf78213621039f9b2027c9c42e343358c67c933986137c117c505c5bc612051df4a03d48e33c99ea2e396d3300e SHA512 7dc6d56a715ead55bf037ef54a5d5e6a3c8dd56ce5da7d34949208f1a36ed199b1aec1a2c37aad1757a5388aaff116d69fb355eac96b7c6438d2ba2b03882f7e
 EBUILD fluidsynth-2.4.2.ebuild 3852 BLAKE2B af2d4abf0e1f3e9ae9e49d2c2f9096880a5876ad6668f11ca55001003e3f04f78d6f4af34a789113c9efa97e92adabdcf68ab843da5eaf2a07e21da4b3792a8e SHA512 22eaa8848c005ff49558fcb94fa976570ae8562df19fb16a2aafb4a7a28ad16097fd94f67ecf4fda7a4055fe95025ecda945a31bb2be5b785baf36e32a7eb355
 MISC metadata.xml 509 BLAKE2B f94b91d9486a14757aa47e69269d6321fb330556f24ac0d2d47d7734bc28164d9cff5d7ff7728aa6d59606006bc4bfa090662b9dd087a6bf36ae23660604938a SHA512 7bf5aeb69570ef736dc6a1a3d652449b0142978ee5e6ed9902d4f851deea87c8fb94bee821ee9ae93bc529411f336288021718490e86c2815de5d30111bd3b28
diff --git a/media-sound/fluidsynth/fluidsynth-2.3.7.ebuild b/media-sound/fluidsynth/fluidsynth-2.3.7.ebuild
deleted file mode 100644
index fb0215dc13a8..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.3.7.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib systemd toolchain-funcs
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="https://www.fluidsynth.org"
-SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="alsa dbus debug doc ipv6 jack ladspa lash network oss pipewire portaudio pulseaudio +readline sdl +sndfile systemd threads"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen
-		dev-libs/libxslt
-	)
-"
-DEPEND="
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
-		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
-	)
-	pipewire? (
-		media-video/pipewire:0=[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
-
-src_prepare() {
-	# https://bugs.gentoo.org/833979#c17
-	sed -i "/CONFIGURE_COMMAND/{n;s/$/ -DCMAKE_C_COMPILER=$(tc-getBUILD_CC)/}" \
-		src/CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-alsa=$(usex alsa)
-		-Denable-aufile=ON
-		-Denable-dbus=$(usex dbus)
-		-Denable-dsound=OFF # Windows
-		-Denable-floats=OFF # loat instead of double for DSP samples
-		-Denable-fpe-check=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-libinstpatch=OFF # https://github.com/swami/libinstpatch
-		-Denable-midishare=OFF # http://midishare.sourceforge.net/
-		-Denable-network=$(usex network)
-		-Denable-opensles=OFF
-		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-profiling=$(usex debug)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-pipewire=$(usex pipewire)
-		-Denable-readline=$(usex readline)
-		-Denable-sdl2=$(usex sdl)
-		-Denable-systemd=$(usex systemd)
-		-Denable-threads=$(usex threads)
-		-Denable-trap-on-fpe=$(usex debug)
-		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
-		-Denable-waveout=OFF # Windows
-		-Denable-winmidi=OFF # Windows
-		$(cmake_use_find_package doc Doxygen)
-	)
-
-	if use alsa; then
-		mycmakeargs+=( -Denable-lash=$(usex lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	if use systemd; then
-		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-compile_doxygen_doc() {
-	multilib_is_native_abi && cmake_build doxygen
-}
-
-src_compile() {
-	cmake-multilib_src_compile
-	use doc && multilib_foreach_abi compile_doxygen_doc
-}
-
-install_doxygen_doc() {
-	if multilib_is_native_abi; then
-		docinto .
-		dodoc -r "${BUILD_DIR}/doc/api/html"
-	fi
-}
-
-install_systemd_files() {
-	if multilib_is_native_abi; then
-		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
-		insinto /etc
-		doins "${BUILD_DIR}/fluidsynth.conf"
-	fi
-}
-
-multilib_src_test() {
-	eninja check
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	docinto examples
-	dodoc doc/examples/*.c
-
-	if use doc; then
-		multilib_foreach_abi install_doxygen_doc
-	fi
-	if use systemd; then
-		multilib_foreach_abi install_systemd_files
-
-		elog "When using fluidsynth as a systemd service, make sure"
-		elog "to configure your fluidsynth settings globally in "
-		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
-	fi
-}
diff --git a/media-sound/fluidsynth/fluidsynth-2.4.1.ebuild b/media-sound/fluidsynth/fluidsynth-2.4.1.ebuild
index e1cbe51ff8bc..4c34bdf3cb48 100644
--- a/media-sound/fluidsynth/fluidsynth-2.4.1.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="alsa dbus debug doc ipv6 jack ladspa network oss pipewire portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index d39050cac279..130e723eb04b 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -7,6 +7,6 @@ DIST mac-10.76.zip 1674982 BLAKE2B 8e32b6804df1c7f551100a5e05458cf0e88c48cf5d818
 DIST mac-10.82.zip 1675437 BLAKE2B 1915a8154873d972998f11b0f6b233150ede890bbe82b124f9e5c90caad716971c63069724fe5b38fd410c1f2e6a8e96156ed608b3a00839b6741a94c59a95b8 SHA512 9d29b52112a6511dda04bd49d365bd564cba63923abe4bfa72d5af292e01ce3fe330ad71833113692e7e675d44a4bc8edd43e8eab4aeb4c3178debbdb2750a88
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
 EBUILD mac-10.76.ebuild 574 BLAKE2B 6a1bdccfa47fa8c8471e1d3174805ffb2c3b3686d8a4c07d294a8a5aa30fc0d6c40747ca203f02636d8e2562a4bfde494326f32dd42d7dcfdce762d58ba0b5ca SHA512 104257c36fb682cde45e261b4c6e7247afa5256ededf8e9f10ec99376e39a8b38b2a2e85cb20e736fff38a90d80a3d6e82af1ce34f4bbd504650f596601a3dfc
-EBUILD mac-10.82.ebuild 579 BLAKE2B c06ecc6c3cc271a5cea551956079e8d60724fcb30ff22e4d69ba90ac53a351dbc673bd35f2bc38ffc84749eb8fac965857ce58e2eb99d7a08b3993176ed4dfc5 SHA512 06d18cf486dabc94d9fd8a3143216875c4e6d546ae8ee05f0839429716e333b797692dc7f627a5281bf85e8922fcce8cb1c07e3596e786aa5eac8f4677680c0a
+EBUILD mac-10.82.ebuild 575 BLAKE2B a3b52e56edd02a585c1c13d49b299b41b7b039d558ca66fb89e5007938c2121b03a63a7fbe467cff8ddb2d98d430b2064824cff73688f945e9ed27514834acf2 SHA512 ca3db33a0b4514b090b584c9007b5df522fe147ed5bd7131602370242cfd867c044b8b594c2f3f81047ac8f9fabbe73d1606b8783ef5a288026f6c69cd7fdd5f
 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.82.ebuild
index 5ac419cab724..54f360b9106d 100644
--- a/media-sound/mac/mac-10.82.ebuild
+++ b/media-sound/mac/mac-10.82.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest
index 4e423d015dd9..b0d5b479eb84 100644
--- a/media-sound/mikmod/Manifest
+++ b/media-sound/mikmod/Manifest
@@ -1,4 +1,6 @@
 AUX mikmod-3.2.8-macro-strict-prototypes.patch 387 BLAKE2B 22cffe9663cc35a88146c176d14c1cd2146ac96c83e911627869e703f11237da723787d4af435f823f5ceb6e79494a3f276b17eada027926301297ef084cf118 SHA512 1e989ac777f5d9e99fa0d268729a873e4562f5218464e6d1cbf9693ac957b1a558159ff9786525b998adee8e52603d2c7636fb5a9597c175c37ad58ce21eb6cb
 DIST mikmod-3.2.8.tar.gz 279763 BLAKE2B 27731a143d3483289ed0d6809c3ecf0ce504f8c4271e20d4405a99c39e605dc6c0b50c3cd4e689f7c417646f51141b2a8634e74cd55164e9b0e88be750db1a27 SHA512 fbccfd31c49fc1faa159e7174fb0886dc3742ef935b596176fafeb953498ceb04475bebf9b0a948f1e2de1b11a01b130d2f11f4f034199b501ca08823a3ea620
+DIST mikmod-3.2.9.tar.gz 277032 BLAKE2B df903946538891622208b41e8ae6287a33eb79c740912c7e046113e1fd053bf6a5025b3b7d8b8a5494e477cf822dc3ccfde9a93b73cc8dbc9db52f4dff45e655 SHA512 0740f0dcc05f9d8ce9697e5a141c1525fd5c6baa7102bfb3b9fcb16f1257f0829e06ee4e8638af82230e34035e87bb24ebc05728d5cb0ae33ddb7695df242c32
 EBUILD mikmod-3.2.8-r1.ebuild 537 BLAKE2B 89e0cfc9bc3d08c90c454e45d58f86433e602396c0ed85792ec270571ff01b6c04cfc5d3debfd63ada49ae350583dfa520b83cd41671ce308f1a9cffff354e46 SHA512 0ba2597a0109edb334dd272c0eee766bf9ad5b35630219f196195897a04e3275a1e69806f1f0a1016b5517121d9326bab2c64c96e6ebca7e836aded79af63ecb
+EBUILD mikmod-3.2.9.ebuild 477 BLAKE2B 0ab04bf29a08e7b394c071be96365de06204cba3a92921f667718072ace33e6070a934f31a484aa40a6960ce13e0204b092224848e1888f026d1dc0149495234 SHA512 813316ba963f8da033bcc3f2f527490b17d1388fe3463433eb769b215de4ad71b585ac27d21f639cd55b95af042c0dbb3890286198cd9d515bb9633d5103993e
 MISC metadata.xml 383 BLAKE2B 3408c0da413bc90c9844dbc990a4a781340cc5d7908cb5719daed4723ac1342204d1d24f6eb00b11db59e2df3ee647018ea406db22dce1f7dc99f395fe6019b5 SHA512 f736a46a9850dc0476ca6b4b68cae123b55153615428ed6dd68f38c2636628665789829ba40ec7f5d391eeb62873344ab8de1ade4dbac5c8cb279d3bb6f8a491
diff --git a/media-sound/mikmod/mikmod-3.2.9.ebuild b/media-sound/mikmod/mikmod-3.2.9.ebuild
new file mode 100644
index 000000000000..dc51cc05200a
--- /dev/null
+++ b/media-sound/mikmod/mikmod-3.2.9.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Console MOD-Player based on libmikmod"
+HOMEPAGE="https://mikmod.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/mikmod/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	>=media-libs/libmikmod-3.3
+	>=sys-libs/ncurses-5.7-r7:=
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README )
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index 3091739b631e..b0ca9fab52bb 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,7 +1,4 @@
 AUX milkytracker-1.04.00-cxx-std.patch 386 BLAKE2B aef166a31fcb3c0db8f4739f5789a1bf2497ed6d4cf12375ee1fc99cbbb46c208fe53bbf0d5cf5855a704d31295253595edb9494e8bec281cd22220cf95862b5 SHA512 da98472656f267c46c8d3bc804c5520e4d08dd96b938d2406c81a2214963c97b466892442f565aa915039efeba3b97dacaa1aa2794434a1d619761e9b7fe1133
-AUX milkytracker-1.04.00-wreturn-type.patch 684 BLAKE2B e008c191ad72a462e479602ced070ee461e8708ffa144209c2b7a8055e967840de21169252811682709e4414b4abf28f1dd4d50ddb88365883bce62ed173baa6 SHA512 2ab3beeb779cc8135207136fcfa50e8c12186eaac3c8558758936e05bc37905a9ff6e77403e8dd7db1f34db9d05dea05f7fc29468c8f0ce64baefea575df98a9
-DIST milkytracker-1.04.00.tar.gz 3756275 BLAKE2B da4885592ae4aae87080c8979f92a77b05cb3cc4594fe328346deef949375ad3abb1910f5cc834f41b6d7278312deff45550300b96e3afbd89eedebe1fadd854 SHA512 5a41fa07d51880e220f15ff3f50e73b999931c875d31e627233669f5a07dfd38621478b8ec27b2242aa4ae6143a0d2ad51627a366fd366256331b71c47ad25da
 DIST milkytracker-1.05.01.tar.gz 3787738 BLAKE2B 447d0fd939d6def41223f4d65afedbf4f98e49dde77d0f94e959d0444f3c133a376613c8dfcc0b8b76184fa1db4a1317c04078512bbc9984149fd6267ef8641f SHA512 a5782c0cade594089c98987d2673988a62985e68b8727459f2f799ad5a76d7706cb2e9d55c21cea800587a19c7b84d3bbb4b2f99cd04bf22ff27e58a8ca16663
-EBUILD milkytracker-1.04.00-r1.ebuild 1235 BLAKE2B 0f42c65ddeb77e1a7f584938338b56de84b9481afe6d6512b48155aa8caba09be5504e9acafa239dc0b4a377396439d7922ef19324a40b886ebbaafa13ccb9dc SHA512 6dcef1f87e9b315d51eae301be4e488a25f6ae2c6260bf16c2d55155a199f55a9d307db3331c17bf9756e6fe41940e18b771bd43f3dba5a18eacb00551023864
 EBUILD milkytracker-1.05.01.ebuild 1196 BLAKE2B 4cf1f3cd515d1a0301dfa6b9d3edfc187131de3175150757d947b7a37e265240887a623f60d00dead175c607a7420617e1ee141573b6de7ad9023d7314093775 SHA512 7d2d35cb850dd85826e48d2265070b83edd5565ce58c291f04419373d3dad5b6aefa231a31206f63a25b81c6e8025f7ed4f9be895151a201aeba1b9f3e2083ca
 MISC metadata.xml 337 BLAKE2B 3dd35a6e9cd890d3274998d7836d0eeb44badf77ffce449e4bd6cde3118e8c6c0fbbea369afe7fc04116b3a378bda752e5fe30d02c7528369f889d001daf4c5a SHA512 0df3c694d72b46f4183f0ac5eced5245466736099479f9456c96094fa0074311978e50c2682553c2e88786c8528f077beb467bae786411d9d22abc26476a5854
diff --git a/media-sound/milkytracker/files/milkytracker-1.04.00-wreturn-type.patch b/media-sound/milkytracker/files/milkytracker-1.04.00-wreturn-type.patch
deleted file mode 100644
index 977264a8f37b..000000000000
--- a/media-sound/milkytracker/files/milkytracker-1.04.00-wreturn-type.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/910283
-https://github.com/milkytracker/MilkyTracker/commit/7e9171488fc47ad2de646a4536794fda21e7303d
-https://github.com/milkytracker/MilkyTracker/issues/316
-https://github.com/milkytracker/MilkyTracker/issues/318
-
-From 7e9171488fc47ad2de646a4536794fda21e7303d Mon Sep 17 00:00:00 2001
-From: Leon van Kammen <leonvankammen@gmail.com>
-Date: Thu, 6 Jul 2023 14:38:20 +0200
-Subject: [PATCH] possible bugfix: return nPorts
-
---- a/src/midi/posix/MidiReceiver_pthread.cpp
-+++ b/src/midi/posix/MidiReceiver_pthread.cpp
-@@ -145,4 +145,5 @@ unsigned int MidiReceiver::countPorts()
- 	}
- 	delete midiin;
- 	midiin = NULL;
--}
-\ No newline at end of file
-+  return nPorts;
-+}
diff --git a/media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild b/media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild
deleted file mode 100644
index 78160baf76fe..000000000000
--- a/media-sound/milkytracker/milkytracker-1.04.00-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop flag-o-matic xdg
-
-DESCRIPTION="FastTracker 2 inspired music tracker"
-HOMEPAGE="https://milkytracker.titandemo.org/"
-SRC_URI="https://github.com/milkytracker/MilkyTracker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/MilkyTracker-${PV}"
-
-LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="alsa jack"
-
-RDEPEND="
-	dev-libs/zziplib
-	media-libs/libsdl2[X]
-	sys-libs/zlib
-	alsa? (
-		media-libs/alsa-lib
-		media-libs/rtmidi
-	)
-	jack? ( virtual/jack )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-wreturn-type.patch
-	"${FILESDIR}"/${PN}-1.04.00-cxx-std.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/860870
-	# https://github.com/milkytracker/MilkyTracker/issues/340
-	filter-lto
-
-	local mycmakeargs=(
-		$(cmake_use_find_package alsa ALSA)
-		$(cmake_use_find_package jack JACK)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newicon resources/pictures/carton.png ${PN}.png
-	make_desktop_entry ${PN} MilkyTracker ${PN} \
-		"AudioVideo;Audio;Sequencer"
-}
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index f8b299c96b03..478afa31a2cc 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,4 +1,4 @@
 DIST qsampler-1.0.0.tar.gz 219812 BLAKE2B f5e66edb92d24208e4cce9efcc0b84166fdd23180e47c5b136d9749908565400d6b3d201eda7287e89153c98042d69b2e0e4742a1e7b39d9b104cc45d21e0d46 SHA512 3414da88a5924206017d1829928281c345bc036244c38ccce84de080ab2a8f992ab3dec7391f52334ed47fa122315f47562739e7a12c488d0e38e944fa79ef6a
-EBUILD qsampler-1.0.0.ebuild 1139 BLAKE2B f5228ee61fe4946a0f116db47237151eb697135fc52b52105f7ac123fc3306c2f37e936860d0c310895e3f362259755dba497bf33bffcfa48a7c767adf888ed9 SHA512 486623f328d732f9d8cf1f21bed737212b7b17ce277715be10441a6d775a1456eb7e6d72489746c18af816b33bf81179438cb52872fa2da3ffd3e1333d591935
-EBUILD qsampler-9999.ebuild 1140 BLAKE2B cbcc56ea839a1c69cd32179146b50be84ae49dc4ab3013416a3e8eb2575fa55a07eff45caa82249432c166e4fb04b1c1108625edb172e8a4ad515f5a39a934e7 SHA512 473c5f4189110b028222f9dcd728c3d391af1516c0bf55ffb5c6f22f504f71e464686989013b12cb7b67bbbb10f455c5ac6594d6f143656b5699589c311d6905
+EBUILD qsampler-1.0.0-r1.ebuild 955 BLAKE2B 9843f368a2504e36473ba4188ca4bbad28d4146261af3158f6445c5bf19382c6169d6f4f3458e49c208552d918163804cce058d68693d4323c037194e02ef82c SHA512 0922e4e09f6c5232e3c1f786a658e3ec8d196aaa48aab45523707d49b8962c7359a20059aaa519852795766dd1c3c16007a633d2adff7d0d7993a247581ffc0f
+EBUILD qsampler-9999.ebuild 956 BLAKE2B 298a87fe635da0df09cf05f19d5500c0de83777dae61d853762b69d6ee25965ba640e1bdb339aa662fe4005f35644ca72685f819300e206d24329ed299d8ae7e SHA512 7da2c3654cf52e64dfba7bece587894306ac939532309f2f9d854280f75133330a7bd261cd10b31196a6301f732de97b5afc5aab93c2bc6caa73889ed69dba46
 MISC metadata.xml 494 BLAKE2B e15f94a046f20f6430b293d548b1b9694e172b083d51542d398abf2de7beea5aa5915b670ac335bc31f797dbba71e82db55b72a93e88bfbdca8d862d9840975e SHA512 b136da53c09415395c0529c6d02d328520617737bce205ba1089725c3705ddea4be61e8208d814479976a420673498fba53caba64b5e0cb49ffe79694045f25a
diff --git a/media-sound/qsampler/qsampler-1.0.0.ebuild b/media-sound/qsampler/qsampler-1.0.0-r1.ebuild
index d07c734a28c1..4b341cc7ed61 100644
--- a/media-sound/qsampler/qsampler-1.0.0.ebuild
+++ b/media-sound/qsampler/qsampler-1.0.0-r1.ebuild
@@ -18,32 +18,20 @@ HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug +libgig qt6"
+IUSE="debug +libgig"
 
 DEPEND="
+	dev-qt/qtbase:6[gui,network,widgets]
+	dev-qt/qtsvg:6
 	media-libs/alsa-lib
 	media-libs/liblscp:=
 	x11-libs/libX11
 	libgig? ( media-libs/libgig:= )
-	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
-	)
 "
 RDEPEND="${DEPEND}
 	media-sound/linuxsampler
 "
-BDEPEND="
-	qt6? ( dev-qt/qttools:6[linguist] )
-	!qt6? ( dev-qt/linguist-tools:5 )
-"
+BDEPEND="dev-qt/qttools:6[linguist]"
 
 DOCS=( ChangeLog README TRANSLATORS )
 
@@ -51,7 +39,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DCONFIG_DEBUG=$(usex debug 1 0)
 		-DCONFIG_LIBGIG=$(usex libgig 1 0)
-		-DCONFIG_QT6=$(usex qt6 1 0)
+		-DCONFIG_QT6=1
 	)
 	cmake_src_configure
 }
diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index f0a0b110d46b..2e0afc0face5 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -18,32 +18,20 @@ HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug +libgig qt6"
+IUSE="debug +libgig"
 
 DEPEND="
+	dev-qt/qtbase:6[gui,network,widgets]
+	dev-qt/qtsvg:6
 	media-libs/alsa-lib
 	media-libs/liblscp:=
 	x11-libs/libX11
 	libgig? ( media-libs/libgig:= )
-	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
-	)
 "
 RDEPEND="${DEPEND}
 	media-sound/linuxsampler
 "
-BDEPEND="
-	qt6? ( dev-qt/qttools:6[linguist] )
-	!qt6? ( dev-qt/linguist-tools:5 )
-"
+BDEPEND="dev-qt/qttools:6[linguist]"
 
 DOCS=( ChangeLog README TRANSLATORS )
 
@@ -51,7 +39,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DCONFIG_DEBUG=$(usex debug 1 0)
 		-DCONFIG_LIBGIG=$(usex libgig 1 0)
-		-DCONFIG_QT6=$(usex qt6 1 0)
+		-DCONFIG_QT6=1
 	)
 	cmake_src_configure
 }
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index e5b22db6ad8f..7ef7e242f802 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,4 +1,4 @@
 DIST qsynth-1.0.2.tar.gz 337605 BLAKE2B 8b1911c8baa7d1b73a18061628044b4b428c2c01a0bdbac9b37388bf6cb65e872272af002d943f062b64bb275cb675b91d2a50e3fc0c970fb4eeb631734a6b9b SHA512 a5585481ca88f65a38da75cb6355e5b0e23b04da70ac9ab8e55abafe2b0fac83905a873a990e4de8adcf3cf484b48088d83a7aec99252a48a004158504a7e137
-EBUILD qsynth-1.0.2.ebuild 1446 BLAKE2B ac188db2357400e302959fae3e13def93ecc2ed37364233f5120369b2d0391dd36127a21d05f7bf06d443141e65b155f86681acc4d4563e1252486dda581ed68 SHA512 c871fd5c08a346bc9e6292442db4622401fa8dbf4bbea76eee9eb997179715d1b711de3ddba6323362c95a82621800c88191dd1c5e8c53778944cd020323dbf5
-EBUILD qsynth-9999.ebuild 1450 BLAKE2B 89489add82e60db13848dd37e80966790ab9c697ae293b74a3c73bb84cf35e53c045e5cb3f1b56a8cd58993d7d12b5a1aa282561a4e773921f5c24fd7dc03086 SHA512 76a7e85715aa5df34219ee005e802cab0459a044653a63a1c70863d296c0e07389d02c6cf6e24b73649c2524eb5f1fb3ea5ccb148d9c98b74691706197a1aec1
+EBUILD qsynth-1.0.2-r1.ebuild 1262 BLAKE2B b61c1a77a5d1aac400903c3d7b76334506a0b842ff59ca03c141fce66167a6e71dc47b9cd777a1c94f6db70019aab74eb1e9b10a3a1d8966623c711c76f7a3a5 SHA512 3b05b2663ad28698f0b44278bc1650a0b3358ea29af18d7ff0e67d2cc38574d2ea82d9e5fa3b5110f2a331b497d484e3b04d8f3974340b8c5836196ea72c86d0
+EBUILD qsynth-9999.ebuild 1266 BLAKE2B 1a8c53b588f3a8eb628c827d65d83c0b1c9cd49cba2380b6641d35159993debd2ff482f99e55e3a04dfec0b0d05e5eaa9827eb56b1da8a625def4e458ac42e4d SHA512 4aafcaa36f00aaa197280a19a2d6850e4d5ea64f8e453399189bde068307743147570ddc7cd33b2e876807b06b46f2d8ffcf312f8ac9d545f7b1b9f6acb9cb70
 MISC metadata.xml 763 BLAKE2B 871d9e5edd0dcd434d496c2d40f997717d424502a5d7072264886477eaaf4bf460e32746bc899a124d97f5cadf116c0cdd198d017ebd4e9cbd769ba2af8a8512 SHA512 147e494f3b468283759a06d361d286e211e95cabbfc6daef67c406e5f19a9eb04ec611f41273ddb0c712dd1fd9afa3a71922bd9cfe749c388ab61d550dc86def
diff --git a/media-sound/qsynth/qsynth-1.0.2.ebuild b/media-sound/qsynth/qsynth-1.0.2-r1.ebuild
index e030f127d687..e10bee8f4374 100644
--- a/media-sound/qsynth/qsynth-1.0.2.ebuild
+++ b/media-sound/qsynth/qsynth-1.0.2-r1.ebuild
@@ -18,34 +18,22 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa debug jack pulseaudio qt6"
+IUSE="+alsa debug jack pulseaudio"
 
 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
-	)
+	dev-qt/qtbase:6[gui,network,widgets]
+	dev-qt/qtsvg:6
 	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
 "
 RDEPEND="${DEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
 
 src_configure() {
 	local mycmakeargs=(
 		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_QT6=$(usex qt6 1 0)
+		-DCONFIG_QT6=1
 	)
 	cmake_src_configure
 }
diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild
index 496e8129a1ca..1a8dd2a8ac2b 100644
--- a/media-sound/qsynth/qsynth-9999.ebuild
+++ b/media-sound/qsynth/qsynth-9999.ebuild
@@ -18,34 +18,22 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa debug jack pulseaudio qt6"
+IUSE="+alsa debug jack pulseaudio"
 
 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
-	)
+	dev-qt/qtbase:6[gui,network,widgets]
+	dev-qt/qtsvg:6
 	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
 "
 RDEPEND="${DEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
 
 src_configure() {
 	local mycmakeargs=(
 		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_QT6=$(usex qt6 1 0)
+		-DCONFIG_QT6=1
 	)
 	cmake_src_configure
 }
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 124531821441..43d3448c0198 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,7 +1,5 @@
 DIST qtractor-1.4.0.tar.gz 2662656 BLAKE2B 52a40439e498a3316964ad181c95b0f18ebf89b246553af30f490ce229fedbea8195b0e88518216622833e1dd8d5ad253179cb9d3d86065f10ff5f6e24377adf SHA512 23fc7922f63a31f7e8483c4d90f08e6852778edfe365e40086d3a9aa350ba75fed93d25f153e261a522615fd43515926abac913b8ee106efa5680c51100a992a
-DIST qtractor-1.5.0.tar.gz 2661608 BLAKE2B 33daaba7fcf38805850332c2db390686961cec7e5b265432efe338366d8c572715dbd0fcf099553fc356d527e37b81b9ee43cbf64d97988369c9034305f3adf3 SHA512 beafe4f0f7cc4956a23e97fa1a31f9fd1ff7a95c92cd6235f1bae688dd96a84bab7fbf7b2b6009184b3307fee7979ca72297dc76828876c30158c4092dd24a2b
 DIST qtractor-1.5.1.tar.gz 2662704 BLAKE2B 258eb392299b0fcec0c8d9d4f6cb17b3a934a6b266dc538ccb34fbaac810f58d4c20ad1fa093f5417f0f04f4511415773d46f697a20c7c1c57eb126a8ee702f4 SHA512 05807b4371ac6355e401f7153578c00736a51ebff96ea351a55ed0e9d4383d4ed05b20f6e65cca3ceaf3df883156d0a49e1a5a3c110daf8d85133cc7100659af
 EBUILD qtractor-1.4.0-r1.ebuild 2714 BLAKE2B 1e082566e65ca109197664bd0564416f203c394fde6cbbb5c905616a296e4b0cef38793f5221b2386e72f533e3b663d7f1c05bfe548fa8f9d92220eb7874b02d SHA512 6a2838cde8e1e0ca87387221c5593f1e6d4a604677b897cc470ea931f9edf14e8ac67648f24c62055f1f49e8f029d52018691fc18ab0af67a81034febf8767c3
-EBUILD qtractor-1.5.0.ebuild 2478 BLAKE2B ebe063e9f2760c3f368b22bdd5df34abeed970e0920504df79e463d51b3c69857461c99e7364d18eb68f1bdd9ff6829ab36dad662db49023f83b8c074c8a5aed SHA512 24b536815d7efef002de93edd5bd3375c3a828ed88a3f60446ff6188af737e09e7aa993c247d58a20a31a004dae0556d70ec2f56004a4ddbaf33bf85bd78224b
-EBUILD qtractor-1.5.1.ebuild 2716 BLAKE2B 3018edd88c136c2c5cc61f8066968dbd2821dd540ec410975b22b2a88de4aa2456ccdae916389daf65a4c1c765b3d7a865f92a402ce3f7bfeafc78f78f351ff7 SHA512 79bec57a3c285ac19ece151bffcec3acafabeb1888b62023525f6b4177a9c583144ce3062413fb68f80fe6d03a27c2727698028617d8542fe5b2f9f8d47d862a
+EBUILD qtractor-1.5.1-r1.ebuild 2477 BLAKE2B f5134fd97a0993cebb6602a670c2d3a6371f5f87883b9e58242b56759935c0f31cd31b146e6431b6a1baf3ee8e55e591ff41ad3ab17a416bc775c193a2d04254 SHA512 0216ceed946eb08a8d98fc19ab0d01f6778861ae73479bc2c38868a369819d7498764d82645b970093e2335a689a5a6c7c98beb156b5b3cc7a804c5822e2fef8
 MISC metadata.xml 945 BLAKE2B 4f88a28c83ce8b2874664ad8bf6a08d5a575a609fab948c47471ed226e284453f87da5b1ae034678295e30e5e1dce357ced317ef5d3ab793e04fb17120ce55b4 SHA512 5ab11543fa297253f5cb15515c16caf967fc69e9cccccb9ac6a6ba26fffce1f8539414edf3b065a61ddce0ff8ce3f04b90a68fd5bb79e0a498ca14c275753947
diff --git a/media-sound/qtractor/qtractor-1.5.0.ebuild b/media-sound/qtractor/qtractor-1.5.1-r1.ebuild
index 9238fcb7b0f5..9eaef0bd86ed 100644
--- a/media-sound/qtractor/qtractor-1.5.0.ebuild
+++ b/media-sound/qtractor/qtractor-1.5.1-r1.ebuild
@@ -12,15 +12,12 @@ 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="
-	virtual/pkgconfig
-	dev-qt/qttools:6[linguist]
-"
 DEPEND="
+	dev-qt/qtbase:6[gui,widgets,xml]
+	dev-qt/qtsvg:6
 	media-libs/alsa-lib
 	media-libs/libsndfile
 	media-libs/lilv
@@ -34,8 +31,6 @@ DEPEND="
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
 	osc? ( media-libs/liblo )
-	dev-qt/qtbase:6[gui,widgets,xml]
-	dev-qt/qtsvg:6
 	rubberband? ( media-libs/rubberband )
 	vorbis? (
 		media-libs/libogg
@@ -44,6 +39,10 @@ DEPEND="
 	zlib? ( sys-libs/zlib )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-qt/qttools:6[linguist]
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-sound/qtractor/qtractor-1.5.1.ebuild b/media-sound/qtractor/qtractor-1.5.1.ebuild
deleted file mode 100644
index eb8b13d4e22f..000000000000
--- a/media-sound/qtractor/qtractor-1.5.1.ebuild
+++ /dev/null
@@ -1,116 +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 qt5 rubberband vorbis zlib"
-REQUIRED_USE="dssi? ( ladspa )"
-
-BDEPEND="
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-	!qt5? ( dev-qt/qttools:6[linguist] )
-"
-DEPEND="
-	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 )
-	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
-		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=$(usex qt5 0 1)
-		-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/quimup/Manifest b/media-sound/quimup/Manifest
index 038da8e1c276..2ccbf60dc06b 100644
--- a/media-sound/quimup/Manifest
+++ b/media-sound/quimup/Manifest
@@ -1,7 +1,9 @@
 AUX quimup-1.4.4-fix-build-taglib2.patch 2400 BLAKE2B cf8714c2a7b810ff83cfcc00d60f7bb96bbc2a6d84d928b9b1f83dd0077189e9be63bdbf6e66d1d239e6de445c5b37257164dca51cddadf19b9297ff7b6102a7 SHA512 78deda1fb599cd94227fcef12b673b76103aa9ff29e3515c09d4b12cd2282007ba114f7ef1a537fddeb3c0d8f6d934041a23da4a2ae1fcec85d0a2daf2b879a1
 DIST Quimup-2.1.0.source.tar.gz 697565 BLAKE2B 78b950d0134041becac0d2eb6786db90797127882279bd078da332df5cc3d1bfea8da256cfc49f6a83eefb8b25a3beb60af0d7bf3e1e8394b46956ba72fd6dc8 SHA512 c7d86deaa6483ea9467e2bc8dd7e413f67ebf271713cab939cda8c9689a52651b45724d99cdec7d72350273fb59e2542acf82ebc9da1cea8e0210f575351e686
+DIST Quimup-2.1.1.source.tar.gz 2423998 BLAKE2B 342e7bf6682fcba5f6c5c2ebaabb8b475d2ec8d37f32cbdd2c3deebe32cd3bea022bf33176fe523869c0562f7256aea687e5056649684033019f67297ecd4ba3 SHA512 4adec84bcd6e9825a1610fb74be5768d1d3eeeb641fdb57b64db6904a0b8cfad48fc9cb53732f169710528085d9433e35f936a519a8128b822a89fa971b5533b
 DIST Quimup_1.4.4_source.tar.gz 240902 BLAKE2B a411653b1c5ced5dc7f4b9ebe6244380d23cd165eaf2b14760a3f87946094f7ffad3df73afe500c0f8ea8f6d77e690391e78a0403b9436485b4c670de3c3b0da SHA512 4fac921df6e7157952536e1cdda0e468b72f70f8f938ccfd5d1a7d286f4b7d7ac063ca2c6111f38fb76b2a6235a323858f2f898165c80702b2c0aaeaff8869c9
 EBUILD quimup-1.4.4-r1.ebuild 835 BLAKE2B 14d8180ea1c3e8d3669594a6d1a2f51e7527eb3ba44bf9c712d6789beb4b8004630914302511ea83b54942f68ce2c3b17ff5d369ba6d4bbcc05b2da96288a433 SHA512 9e8fbfbdb794f4548fe52f4759c37e4b7d76ed2196a64188a9984cf4a30e1f6181c40f37f95a4ab8132e97b12452fa0b1f03bde74931d5b93cc4270a618de820
 EBUILD quimup-1.4.4.ebuild 781 BLAKE2B c20730b29e50e101ac3be6fb2f6c4c0d2dad2f01e058059b6ce76030a2d13298644e829e05fbcdffc6df76c50af65abed00ea991e9adf4b51bd9d865b269a095 SHA512 3e7f3c24ae8a74ea56f755b5328b1f739e9164d5a041963bf7458aa112ce62d1770a843bbd71b13b3b7e2ba571cb6fe38b3866dc9f04dd6cdd5143ace81db56c
 EBUILD quimup-2.1.0.ebuild 774 BLAKE2B 47ae5ef84e17adfe0fa011c441547d375a62e7954248202f0b0958dc52102c12639845219a6fedf7caa45f2118947864541c8c2024abe933d26d002ce6537655 SHA512 8ceb664eb536aa98d9014eeb7fea3254c388938088e8f66a5c247cc1d7092d61fe9f4117de82e7ebbdf2db9ed52a5831f9ab080332cfe0dc9dd5dee0214c7ec8
+EBUILD quimup-2.1.1.ebuild 774 BLAKE2B f783f66b5d4488d2f43c2505a5171e76b48a73662f6f91ab5c4b617eb7a4b36f49cf6e5ab4fcd290c3c45147a53b3be25041043c012282ef1b84a1686ddacc25 SHA512 f165f9c8ea816a9fde94e9d6639ee821ebc7312e763a2d3184607764c16695b49d11713f79f9f7a9796f935ac3af4e7adb1844da956787f141e4a1f3295ae64c
 MISC metadata.xml 340 BLAKE2B 4dde137fc76457df7ae4756ce9e67c9bc6828fe5dfc77fa4f61e1ecb04805204cc227c4cff7b76f54541f73c46e05db111c3b2882df5e40512118092df182d1f SHA512 23e3cb8ae1ebe521e59122bc3c210483d0cef828d79187820c0c247386f5ff8e65dc2b41fd9d2b664efd21fb9ddcc2ef89f4f54696004d5d9319f9c8df7caff9
diff --git a/media-sound/quimup/quimup-2.1.1.ebuild b/media-sound/quimup/quimup-2.1.1.ebuild
new file mode 100644
index 000000000000..23b0f08e7cb6
--- /dev/null
+++ b/media-sound/quimup/quimup-2.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop qmake-utils xdg
+
+DESCRIPTION="Qt client for the music player daemon (MPD)"
+HOMEPAGE="https://quimup.sourceforge.io"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P^}.source.tar.gz"
+S="${WORKDIR}/${P^}.source"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,network,widgets]
+	media-libs/libmpdclient
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( changelog faq readme )
+
+src_configure() {
+	eqmake6
+}
+
+src_install() {
+	default
+	dobin ${PN}
+
+	for x in 32 64 128 scalable; do
+		doicon -s ${x} RPM_DEB_build/share/icons/hicolor/${x}*/*
+	done
+
+	domenu RPM_DEB_build/share/applications/${PN^}.desktop
+}
diff --git a/media-sound/sidplayfp/Manifest b/media-sound/sidplayfp/Manifest
index 646e8056ed13..af4213e3ba82 100644
--- a/media-sound/sidplayfp/Manifest
+++ b/media-sound/sidplayfp/Manifest
@@ -2,5 +2,5 @@ AUX sidplayfp-1.4.4-musl-limits.patch 263 BLAKE2B bd9c7d93bb0743d94451d4379baa59
 DIST sidplayfp-2.11.0.tar.gz 252126 BLAKE2B 0ef141ca32c3f91dad67a54bf253da806242fb30294be97b44ded23490bb30d05dfc63593bb3c5b05a1bae48228d0ce3c31c35dba15dea1db70ed36692ef060d SHA512 455e8a81e7540f7fa5b97a11c5ab45cb87d77210569dd62ea3bfee8149d56b884eafb23ae404e806b92bf62f40bbf560ecfda76073477caf3fa960a1f52933be
 DIST sidplayfp-2.12.0.tar.gz 251994 BLAKE2B 9b3416504d7488e05c127a2b9c112118bf1283f0a022cc82e353c8f16f61a4d87779712d7faa591dca1a145c060d8a8afada1050a1766c654df7d9055e04d95f SHA512 1e511d2847d774bb8b64757b0c83ae1c5d3e794d05998600ba6f68b79eb29f6f970854d00be84572b5622495099211af7fc2e166d135b6447dc0eba163b68ec3
 EBUILD sidplayfp-2.11.0.ebuild 1005 BLAKE2B 3cc6a183340649a7337349e230c5416c6a627b8fc176a105b5788ceb191463d9b74164e106bc5167b70513dcd736ba8159635043df25eda0390495fb28937764 SHA512 a279069fad8ca3d7a410e76122888edec9f0d50a42403a19fb6e34a3c7eae8bfdeec851dc7f68f5d7d7cc970bbf85f377957805b85d3dfcf86074756cea42d0f
-EBUILD sidplayfp-2.12.0.ebuild 1006 BLAKE2B 944a4fc8f5de733504aaf5fdafa395053761892926fe4b905c445ca7e805c500b84a4cda1eadcad944bce9ee6598a09cdde896bdf09b25b47b8ead7e68ac4032 SHA512 9190d731ace9ff9f42e36b5bebfc21fba44b9d4ece391e12fe08fcd92266cb287e0f76617910ef8aa7e277dcdb117272cdff991642cc666f09100038c2f2d62f
+EBUILD sidplayfp-2.12.0.ebuild 1005 BLAKE2B 90dc02d72e92f427e3caa3bbf50fb4d4b6cabf5aa3c4608dce3a2ccae2f08294a6a64382030541e63fabfab75e55534f224e7ee46a9d069bfa63f1a7f638cf54 SHA512 529054e64c89382b0979a5c94322a0b663757646df0e6593c30ea13f873e303f93af912d92b0231a47e2ea4c65bb5387fe26e5f9054b99ae9f35271e0f587595
 MISC metadata.xml 339 BLAKE2B 79d766f101909c202affb7cc72bbefdfb8d5b44fcbf74f17f98e665351384a8110aec7ddec0c685fb328198d29ae4953ce341cda3dd4abd2a67f157d90628175 SHA512 172879da9ed0be1ff48d75d23d3b23e3070247b4ef1decb291b020f7bc1522dd033e78f92d38511eedaae7c1944edc5bb05ff763f4d20a6b7015198ebd38f16f
diff --git a/media-sound/sidplayfp/sidplayfp-2.12.0.ebuild b/media-sound/sidplayfp/sidplayfp-2.12.0.ebuild
index 2d76084b9af7..a1f1fbb95d1b 100644
--- a/media-sound/sidplayfp/sidplayfp-2.12.0.ebuild
+++ b/media-sound/sidplayfp/sidplayfp-2.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/sidplay-residfp/${PN}/$(ver_cut 1-2)/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+alsa oss pulseaudio"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 013183bcc6d7..c07462e7bde0 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -4,5 +4,5 @@ AUX sonic-visualiser-5.0.1-meson.build.patch 4556 BLAKE2B 7a9ed3ba375c3bd5767f63
 DIST sonic-visualiser-4.5.tar.gz 6652200 BLAKE2B a5e39a755e991663390370c06ce5d54b2ff9422081f8b9046097645f1f747972d270233a0d4fe05d4e6adde5239ca6d2d0210a8a67d9ef6ede60089471ce6452 SHA512 eca7f7b2a56a4c70f38c8fafdd20d5c0e773dc1a99a75189998dd1f50ae777df4999e1a4b3431f9202edfb8ce2686d05cf6448493c263c52ab5f068169a7385d
 DIST sonic-visualiser-5.0.1.tar.gz 6583441 BLAKE2B 8c3b87aaae14d2ec3284c75b7a4c7a977bd54ede14a6c8c6d8a4f1bd679d051c6abc12045003940537d2ce86f20c33103fee6a90b56947b17f917e7deff7faad SHA512 eb58403b3d680bbe9b6b30a2ee1899db71f245d6b7b153caa04953268bff1bb52da069d63d2e062ebb14e01a4474214de6770e389b6d611990db7fab8fd6ecc6
 EBUILD sonic-visualiser-4.5.ebuild 1682 BLAKE2B 5b7b6c61571fbcab561d7bc43900fbd241d7ee3d128c85df3c9a0a95b9b5aba87aa61b0819d77b8e51a80eb6e3f22fd8a8d8c6b11b8e0289dc5327480376f84f SHA512 ef6f2a581bda1142361de337ac8f52a4987fb8b1f33edad8611dfbcf8771d62139c48e6f60a0d4d689aea260d37068de57abfc82fc0081a7857d981d9406a2bc
-EBUILD sonic-visualiser-5.0.1-r1.ebuild 1619 BLAKE2B 4ba16918278e572614802366fecb32044350629325155f35aff7a735bea765250c738921d28ee6f860236aefdb6c602f058e8c7ee6e6d5e4a5fddc8a4dd40056 SHA512 40183bb853411fe28735239bba65eab4e3a564616091d271ec57bbfe212f51d947bf0e3f462fb92b81a2a51e4fa4b51330d061b0468a219bd70c1038acd80dfb
+EBUILD sonic-visualiser-5.0.1-r1.ebuild 1617 BLAKE2B 38ffd67e2379ea6eeca6d28ecff9bbb9b6bf748598705c9d613c75b56ba0d349bdf5ce4cf23a9c429202d78186932e1ea78c36a0f4072db50217273ddadaf00b SHA512 d67d84fce6fdaf438170522b53cda43f013a829edb3895012249fd9ef037e2c083946c7fd691ff360ebf5da80809ae8133e4ff66a30fae47dfd45eb1246fe9b3
 MISC metadata.xml 457 BLAKE2B fee1474516a395ba251de868c533ab4f88ac346a169a71e1513593f0ffa99f3365f0a7d87c24c31e73cf4f06d500b8bafe83f02230e6f24ebf8c0a23b43cd662 SHA512 58c25ca412527ef47411204f5ce579c3731c5b19922c43c13f069dae0c498e63879cc209e1f93e3487a2c32972df8ac45af690b4d470bfea9e497a3b9699c3a7
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-5.0.1-r1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-5.0.1-r1.ebuild
index 9c2965ea5308..778e5ec721e8 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-5.0.1-r1.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-5.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2866/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
 
 BDEPEND="
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 24c4cb5c1b4d..e333e9ce53e0 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,8 +1,6 @@
-DIST strawberry-1.1.3.tar.xz 11347368 BLAKE2B 38e6de5e2723f14973ca922d2bcf593cc445b711e3c437fa425959555b1f942657e32ba62259383720becb945664a60f06fee7468fc03ef4492209e1b0cb6e78 SHA512 666c52f5b912aebc09d86465ee9ac464b8c87e1d20d1650204e305a5d5d1c5b34f97bcbd60ef9bd8c50ed927fe55595ade56c1c5202665931f1a1c58fb7118d3
 DIST strawberry-1.2.2.tar.xz 11460012 BLAKE2B bf0edcec29b85cd33b8f2ee883979e6056f776b039e265f63e9b1f7c04cd5193531477f4a52d1eb6f520e380078eee13d3b8d9823f78806527712c09b7a445aa SHA512 f61029de969c47c10c4353d2613a111e0103d1fa0f2e968e3b3c0ce8679f4eaeb302ff24e4bbe28af4513b88b73ca8d02e8e0418fc1150a3144316d5441e996c
 DIST strawberry-1.2.3.tar.xz 11460484 BLAKE2B 7fc1313a496a4f19ca2853b3cc21ba0ceab8dfa2a4916271fd073e7171e4705f232c244598df550574c57bd73cf1446e384d0d563cf9281be32f2d01ef996d65 SHA512 3efe5c8245376731a0558493f6153d312badad21553502d9a876c0d00c74c157aa3b7549815d9925457cedf87f1c94dca25588ae4ece1cf442b9a29f056dc447
-EBUILD strawberry-1.1.3.ebuild 3374 BLAKE2B 441ff1c297048bcdaa94fd2d7be1cd5291d6e8ff86775f75043db44277857cf8e3f83fb3a7b245a481a8e171c8635933557af0cc136fe0dd47e78ea1f3c473bb SHA512 5320f1429991cff0c20e1279554f83f6346599251d183cb6e253a2d83aaecfa1ba111c10c9d5efc096a9310f39047256686a6417fa63ed4783bab9f929cafd7e
 EBUILD strawberry-1.2.2.ebuild 2988 BLAKE2B ec5b1da66303a1dfccaf4a71025f022ed4a7c4b704be7e4e3e7eb8b5a15d1966031218dfdf58f278ec5d553b838a6cfa4d3ff64a1db3fc893aec711407f716df SHA512 46a647ad4779c4cbf85f9b4570d55045751b4185a1bad6669296f429de5945679976656d95100ce88955bf1c43bde7f81dd6d338f42cdecad36198913a3279f6
 EBUILD strawberry-1.2.3-r1.ebuild 2992 BLAKE2B d979cf90a9e1a54d37b0538f192762bc4554f048731b35c74a13bfdd0382d15a6230f948aac8df31c293481ec5dd86b7438a0baef1b836c342c61fdbf877296e SHA512 ec85d3363fba9f85c744a01458c4a43f05e1c193b43ba67f47be0cee5d676ca331efb3cce39744834388a9db4ed8001c25cc71962ae2bfb638a3a70d7dba4424
 EBUILD strawberry-9999.ebuild 2992 BLAKE2B d979cf90a9e1a54d37b0538f192762bc4554f048731b35c74a13bfdd0382d15a6230f948aac8df31c293481ec5dd86b7438a0baef1b836c342c61fdbf877296e SHA512 ec85d3363fba9f85c744a01458c4a43f05e1c193b43ba67f47be0cee5d676ca331efb3cce39744834388a9db4ed8001c25cc71962ae2bfb638a3a70d7dba4424
-MISC metadata.xml 886 BLAKE2B 3be6ba12b734f2b3dc93d42ea20be3bfd0b2a534c683ae5a9e332b538e2e7044b9ffbd8528242bd904c48d8e279e3e05292232af38cee91cfb9c8e12e618b67e SHA512 c0d2c35d46cfe96ba8cab89f0cba8946cf8dc65bf14d87ea46f483df5bdb302eb14eaae85f1a99bb88c69629a7a2df0b9b8acdc3dedcfb5fe512dd6d18307c76
+MISC metadata.xml 728 BLAKE2B b7ab9edb0af1e79c745a473737ae407d34e83da3f98f1ee795e2cd1b8ecf59d9f017345f39e8ec806abb46a6b70c08689af559ba2d0fd7e02dc5a406a332838d SHA512 5e4c7062543aa86f92ef09a3d2997a6b55d205c088d6daafec1b63d6146e0f26cdd545bf0709624fee14c115082d29d397a4d6300d3b2417c8612b59fa4c86a7
diff --git a/media-sound/strawberry/metadata.xml b/media-sound/strawberry/metadata.xml
index 0f4c08885dfa..466d6bb678cb 100644
--- a/media-sound/strawberry/metadata.xml
+++ b/media-sound/strawberry/metadata.xml
@@ -9,9 +9,7 @@
 		<flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg></flag>
 		<flag name="loudness">Enable loudness normalisation according to the EBU R128 standard using <pkg>media-libs/libebur128</pkg></flag>
 		<flag name="moodbar">Enable moodbar support</flag>
-		<flag name="soup">Allow streaming with <pkg>media-plugins/gst-plugins-soup</pkg></flag>
 		<flag name="streaming">Enable Online Streaming Support</flag>
-		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> backend</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">strawberrymusicplayer/strawberry</remote-id>
diff --git a/media-sound/strawberry/strawberry-1.1.3.ebuild b/media-sound/strawberry/strawberry-1.1.3.ebuild
deleted file mode 100644
index 6785fe0dffa3..000000000000
--- a/media-sound/strawberry/strawberry-1.1.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic plocale xdg
-
-PLOCALES="ca_ES cs_CZ de_DE es_AR es_ES es_MX et_EE fi_FI fr_FR hu_HU id_ID it_IT ja_JP ko_KR nb_NO nl_NL pl_PL pt_BR ru_RU sv_SE tr_CY tr_TR uk_UA zh_CN zh_TW"
-
-DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawberrymusicplayer.org/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio qt6 soup +udisks vlc"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	!qt6? ( dev-qt/linguist-tools:5 )
-"
-COMMON_DEPEND="
-	dev-db/sqlite:=
-	dev-libs/glib:2
-	dev-libs/icu:=
-	dev-libs/protobuf:=
-	media-libs/alsa-lib
-	media-libs/taglib
-	!qt6? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-	)
-	qt6? (
-		dev-libs/kdsingleapplication[qt6(+)]
-		dev-qt/qtbase:6[concurrent,dbus,gui,network,ssl,sql,sqlite,widgets]
-	)
-	cdda? ( dev-libs/libcdio:= )
-	gstreamer? (
-		media-libs/chromaprint:=
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	ipod? ( media-libs/libgpod )
-	moodbar? ( sci-libs/fftw:3.0 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( media-libs/libpulse )
-	vlc? ( media-video/vlc )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-RDEPEND="${COMMON_DEPEND}
-	gstreamer? (
-		media-plugins/gst-plugins-meta:1.0
-		soup? ( media-plugins/gst-plugins-soup:1.0 )
-		media-plugins/gst-plugins-taglib:1.0
-	)
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gtest
-	dev-libs/boost
-	!qt6? ( dev-qt/qttest:5 )
-"
-
-DOCS=( Changelog README.md )
-
-REQUIRED_USE="
-	cdda? ( gstreamer )
-	|| ( gstreamer vlc )
-"
-
-src_prepare() {
-	plocale_find_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_GIO=ON
-		-DLINGUAS="$(plocale_get_locales)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_GSTREAMER="$(usex gstreamer)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
-		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
-		-DENABLE_SPOTIFY="$(usex gstreamer)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_VLC="$(usex vlc)"
-		-DBUILD_WITH_QT6="$(usex qt6)"
-		-DBUILD_WITH_QT5="$(usex !qt6)"
-		-DQT_VERSION_MAJOR="$(usex qt6 6 5)"
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use gstreamer ; then
-		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-		elog "depending on your preferences"
-	fi
-}