gentoo auto-resync : 07:12:2024 - 02:07:26

26 files changed, 135 insertions, 408 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 21aed473fc69..da3a7a8e029b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index be6c8b9a100b..b8120052b443 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -2,5 +2,5 @@ DIST audacious-4.4.1.tar.bz2 636301 BLAKE2B 875b214e3372ce000684d4e9a2868062bc0a
 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.4.1.ebuild 1444 BLAKE2B 72c87c2c0dc339f1c0dcfec88d9e90737b7ede7be3aa7892b4ef6f98ad2274608d1584fa403a496694c616a0283b0973d7891d5f8d7b95dd7258cd827ed66d7f SHA512 2b8572d465f7caa3705b2cd10407be67b400555932ea73bee5f55d8730e985bccf4a9732374a71663d51eb2184bd503e04fb34f0abac3023cee9aaf85ed8ff6c
-EBUILD audacious-4.4.2.ebuild 1446 BLAKE2B 326ce08ebcde56a551c4b0ee5522b567712f8449db0bb47ad846751d6147c1e95b7087106612369236c9583516c10e102ded6fcb451ad214053ca058097dc981 SHA512 ee9aa71b07ee22551db5b42d37752f6628a9c4fcf6ea52b93084ded71c114322fdf140876bb054a3efbe048d8134e63765e0cb28fa498f9244c04152d1c67c09
+EBUILD audacious-4.4.2.ebuild 1444 BLAKE2B 72c87c2c0dc339f1c0dcfec88d9e90737b7ede7be3aa7892b4ef6f98ad2274608d1584fa403a496694c616a0283b0973d7891d5f8d7b95dd7258cd827ed66d7f SHA512 2b8572d465f7caa3705b2cd10407be67b400555932ea73bee5f55d8730e985bccf4a9732374a71663d51eb2184bd503e04fb34f0abac3023cee9aaf85ed8ff6c
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/audacious/audacious-4.4.2.ebuild b/media-sound/audacious/audacious-4.4.2.ebuild
index 67b9613808c7..bd3ede1e88ee 100644
--- a/media-sound/audacious/audacious-4.4.2.ebuild
+++ b/media-sound/audacious/audacious-4.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="gtk qt6"
 
 BDEPEND="
diff --git a/media-sound/cava/Manifest b/media-sound/cava/Manifest
index a433612e3633..63b4e0b85ebd 100644
--- a/media-sound/cava/Manifest
+++ b/media-sound/cava/Manifest
@@ -3,5 +3,5 @@ AUX cava-0.8.0-gentoo-iniparser4.patch 702 BLAKE2B 9ea8f952f0a9673d7348b4abeb46e
 DIST cava-0.10.2.tar.gz 130036 BLAKE2B 155a0152571a6b1b847340fe438389f58b963af047d4136595a8b2933a4ac5b1fff87600110765c7c1500072ebd8b730d971918b8701598526052d137465ac81 SHA512 c28ef5a89668b8f90a3b4cbf71b208dd067268d5ed9eca35ff3881bfab0fd7bf72efe2164f29af47ca7972637d8f1d6a86ff2b2e0c9c9221a1856d8dfa960065
 DIST cava-0.10.3.tar.gz 297550 BLAKE2B fbe4146aeeb07c99b37efd08a65e381e2cfc8800429fe3e144db76fc53c47f747f644d9d01146c7ec300d6b3d886492ab2cef44c1511691ec35b748f3fa188a2 SHA512 35ee4821e094c2ea567012329c21a8283450100eada4f7e33f7decd935db94adbefd2a2a41801e0ef49eea0dcd859c397c5b3dc7316f0640394d67e3b658876c
 EBUILD cava-0.10.2.ebuild 2759 BLAKE2B 35fe2f5bf2a8e30475742cc631a49245807893eab47c9cff13849e1abf2c15c0b430757f8461ada941b223f5b8f0307859c4f2cc765fa584bae2b857022bc6d3 SHA512 43b14d84e242a038d192ee22558b3a44fefd999562d9a5a7d40316126d5698632785153b6fed54234d5da28ce0baf8027bab2e2b20acae652fef9966c08a98db
-EBUILD cava-0.10.3.ebuild 2657 BLAKE2B ec4145d33ad96b3dd369f129027c05d6b39a5bf75648a78f5be18e83115b8c6c6c307e2ba424f7e024b4621a53550b2500a37e511112b9bc8125c81dd85c4b5a SHA512 6d8bc19e541d8e8b476e5c6decbbd1e54decb3b5f15a0797de715d482b47b721d04370a3d8822e4a8bc65e4edd179d44ce637c5362de8484d5f82bb841d7b33c
+EBUILD cava-0.10.3.ebuild 2656 BLAKE2B 5ec2a2c5a48249d5abc7f90e6dced467f016b99b1a88afb83f0f8d31150ba469fd5d4962118cb90f35268e78a74f79ed77768bea542f03910823eaf3f9e57906 SHA512 eeb917bb8824401b6ff5330003d25eedf541437553b256f293201bec9c3720c95522597619e9f501bf44c6ae3bead2af243a688c18f63de6a5b71946c691fbcc
 MISC metadata.xml 521 BLAKE2B 9b5fc566431d23ee6c56ed429d3337a6fbccddde718487bf9e1cac36e5fc70173e20a070669a8c85179443af12bc032eecfa4b9829d96422170ff4cdd92518ee SHA512 57cdabe9b70f97abb5bd5e64b3b0f25ec113ce80f8b1eaa45682f814b20fa120fe0efc38552aed23c3cb4d918ba9f0d67030d18b4a307fbf0f81a8b962e35c87
diff --git a/media-sound/cava/cava-0.10.3.ebuild b/media-sound/cava/cava-0.10.3.ebuild
index 1e4d9e6579e9..a84de68609b1 100644
--- a/media-sound/cava/cava-0.10.3.ebuild
+++ b/media-sound/cava/cava-0.10.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa jack +ncurses pipewire portaudio pulseaudio sdl sndio"
 
 RDEPEND="
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 5f0f2debf7be..77af7c7a3c4c 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -4,7 +4,9 @@ AUX chuck-1.5.3.2-makefile.patch 567 BLAKE2B e860079107526b090d592fadf0652dd26b2
 DIST chuck-1.4.1.1.tgz 14940362 BLAKE2B 21cd9d30d471c87e35e479dabede5a8ec5c9c8952a24636768aaabddd2bbd6fb00f45bf1394fc218a3fddd9c771473a7b52da779a9e89690cf0eb0ed2801c604 SHA512 8202c9275c6341f35f87fb5140b507936183f3365839f5ba240cd758b6e9b12138e4669ab37f84e218010b49cfcbed777352ba7b69e02b5efc3b800e1977a360
 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.4.1.1.ebuild 1856 BLAKE2B 3ac1450b0a819d7d2c4a7e3daf0f3eec0b24bf5671813ccaac0b31792c8091898a60c39354037f0840c0d988b4cfd1eb5ee172074a66ab354d030db576523f1e SHA512 3c7edb4e92c43fb7ebe9d2ff8fa105423e5b7e62839cedecd8ab8e20408726628b8611627ce97e211387f44a5eda7e0519842c53592f09825108567f34b61c12
-EBUILD chuck-1.5.4.1.ebuild 1855 BLAKE2B 0cd25e5032ce928c1bff8969d383a14722275667ed03b10c57c70726b57347263ade552ac558a4699af82bf812f19928e2d1aa5d32fe67bfd2c24b01b2f432e6 SHA512 1e0faac1cc0ba109609fdc27c14bd40e18e92797e7d764104fbf66bccaf1265590aa4b14873a7811b18ce9923c0a16cd0cf78e68de7c6fca3c9e31f2f5f26684
+EBUILD chuck-1.5.4.1.ebuild 1853 BLAKE2B 95b698e790e022be54b16657aa25b6bf5461f9fabd77feaa5a565beb1ee203882c8076cfd90e52e57f991eb714d4568fc65610648112ac660489c739bb3cc405 SHA512 b1ec557443d943ef4efa0b7dcd29a74259cb43e9c6eef95aa1d2fe872f1b50383d2e720e52a9b345f5f6473e5bdeec517cf5320593632c7d04f19084fcc7a55f
 EBUILD chuck-1.5.4.2.ebuild 1855 BLAKE2B 0cd25e5032ce928c1bff8969d383a14722275667ed03b10c57c70726b57347263ade552ac558a4699af82bf812f19928e2d1aa5d32fe67bfd2c24b01b2f432e6 SHA512 1e0faac1cc0ba109609fdc27c14bd40e18e92797e7d764104fbf66bccaf1265590aa4b14873a7811b18ce9923c0a16cd0cf78e68de7c6fca3c9e31f2f5f26684
+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
index 70115f4d5785..a9df37bf63c1 100644
--- a/media-sound/chuck/chuck-1.5.4.1.ebuild
+++ b/media-sound/chuck/chuck-1.5.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack examples"
 REQUIRED_USE="|| ( alsa jack )"
 
diff --git a/media-sound/chuck/chuck-1.5.4.3.ebuild b/media-sound/chuck/chuck-1.5.4.3.ebuild
new file mode 100644
index 000000000000..70115f4d5785
--- /dev/null
+++ b/media-sound/chuck/chuck-1.5.4.3.ebuild
@@ -0,0 +1,70 @@
+# 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/cmus/Manifest b/media-sound/cmus/Manifest
index 7fd243237d72..4680cc9bf278 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,7 +1,5 @@
 AUX cmus-2.9.1-atomic.patch 554 BLAKE2B 1a5e2b4497ed3ccc95bf5345607a8f4efedbff6852cb0abc40d0665180e0e74a25e17ba8bb121e1343f1964cf7523abdf987595c1eefc1486fd459bfb0b6a696 SHA512 9e64c6ff6184862e02c248b9a26cbde785740d622370bf761df949824ed8759825ad9bb208180f0d5d1aacd3c506994561c98690902b25cc34cbb87929e3c886
-DIST cmus-2.11.0.tar.gz 335367 BLAKE2B 69584b929afcf82e540e8a4382bc3b3ee4a24dc00fe27d0956941ceb0d446395f824068405c52732c4f684d7b32b5436b246cf7b97c73ba9ebbabbb479e2326f SHA512 370c8eea6e67b328befb24d98ef3945fabc65b33d0bb9ae09cedd1c453b18a307061c042b2119f37f3684a4a39b86b3535efaa2c955e58c8e680628ef0a03452
 DIST cmus-2.12.0.tar.gz 348685 BLAKE2B 44cc3acf676faa9deb4496351154b597a6ef079e4fb07b2a316988c2b84d414e61032ddc787f3d8d8b4f117fb2439c0f1012f4bfca5c735116c98fd043a7a045 SHA512 95dc35e76bb220476986470977d4affc3b7d81a4d057057d62d3f8015abb3c24ec371ece8d3d77fd0e59062c9f3b1bd73dd438ace1eadf3ce39aa86b209a7de5
-EBUILD cmus-2.11.0.ebuild 3741 BLAKE2B f133f30b2fe66e1afd931951ba3e8b3b161121c7d23a4e7cd918943d6f27d339e2305c58df4b4e646a01f79b16a84232b5c329866eafa96d3992088e105761f5 SHA512 b15f692e4a141a5b9efac5760c1bd2f029377306ff553c8974e50277c1ee25fbba024fb26ac537738cb6f3627741041ccf08fe26dce1936d9d088b243877a1b0
 EBUILD cmus-2.12.0.ebuild 3770 BLAKE2B 6faf9c570d34d78b2607e349920f1681081970cc0d17f7cdbca1ab73f7707434c8b3e2d9311b62b6ed08b091828fd447e0ed86b7ef3f3bfe31a2ae45fb6b4ba6 SHA512 f753baaab50999039500065ca62abbd6f8012a84f18e79f8cddbfc7eebf2d97ba96ab26f054a10a0dd2a396ec7d93abb0d93e956c90a252f21dcbd65daf17c8e
 EBUILD cmus-9999.ebuild 3775 BLAKE2B 21b0bc674ba30b50dc43bc871e30eec95e53386f2c4ad335b2eea521739cb67b1db8f608da699d8a67d4c0d2ab11f878402e873ddd59bef6928af33dfc36b2da SHA512 f8eb07a2ba5b5dce250a6f1c2ba8c5faa577e22751d789fe8c9c5980a3d609ed63a68b3a50c08818ab4a1ba04de1a0d107f041488e23b98282a8e7c10e7a3739
 MISC metadata.xml 958 BLAKE2B b211738ed9ee8dd733e05e877b1cdcd5c16531cb9e36339168be39eabe6ea8d187152b07865be002dc153c21b6f826e254824169aa650ef7c9b8d094e608b24f SHA512 54123e923ff9451c5ee495d7672386e205add00907270bafb011e3c1e384169ab04ffbdf15b5a72db196ed327e57ef668ab704a67cef97f10805e08da0900558
diff --git a/media-sound/cmus/cmus-2.11.0.ebuild b/media-sound/cmus/cmus-2.11.0.ebuild
deleted file mode 100644
index f92745566c40..000000000000
--- a/media-sound/cmus/cmus-2.11.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/cmus/cmus.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Ncurses based music player with plugin support for many formats"
-HOMEPAGE="https://cmus.github.io/"
-
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
-	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio sndio systemd tremor +unicode
-	+vorbis wavpack"
-
-# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
-REQUIRED_USE="
-	?? ( elogind systemd )
-	tremor? ( vorbis )
-	mp4? ( aac )" # enabling mp4 adds -lfaad
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	sys-libs/ncurses:=[unicode(+)?]
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	cddb? ( media-libs/libcddb )
-	cdio? ( dev-libs/libcdio-paranoia )
-	discid? ( media-libs/libdiscid )
-	elogind? ( sys-auth/elogind )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac:= )
-	jack? ( virtual/jack )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	modplug? ( media-libs/libmodplug )
-	mp4? ( media-libs/libmp4v2:0 )
-	musepack? ( media-sound/musepack-tools )
-	opus? ( media-libs/opusfile )
-	pulseaudio? ( media-libs/libpulse )
-	sndio? ( media-sound/sndio )
-	systemd? ( sys-apps/systemd )
-	tremor? ( media-libs/tremor )
-	!tremor? ( vorbis? ( media-libs/libvorbis ) )
-	wavpack? ( media-sound/wavpack )
-"
-RDEPEND="${DEPEND}
-	pidgin? (
-		dev-python/dbus-python
-		net-im/pidgin
-	)
-"
-
-DOCS=( AUTHORS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.9.1-atomic.patch"
-)
-
-src_configure() {
-	my_config() {
-		local value
-		use ${1} && value=a || value=n
-		myconf+=( ${2}=${value} )
-	}
-
-	local debuglevel=1
-	use debug && debuglevel=2
-	local myconf=(
-		CONFIG_CUE=y
-		CONFIG_ARTS=n
-		CONFIG_SUN=n
-		CONFIG_SNDIO=n
-		CONFIG_WAVEOUT=n
-		CONFIG_VTX=n
-		CONFIG_ROAR=n
-	)
-
-	my_config cddb CONFIG_CDDB
-	my_config cdio CONFIG_CDIO
-	my_config discid CONFIG_DISCID
-	my_config flac CONFIG_FLAC
-	my_config mad CONFIG_MAD
-	my_config modplug CONFIG_MODPLUG
-	my_config mikmod CONFIG_MIKMOD
-	my_config musepack CONFIG_MPC
-	my_config vorbis CONFIG_VORBIS
-	my_config tremor CONFIG_TREMOR
-	my_config opus CONFIG_OPUS
-	my_config wavpack CONFIG_WAVPACK
-	my_config mp4 CONFIG_MP4
-	my_config aac CONFIG_AAC
-	my_config ffmpeg CONFIG_FFMPEG
-	my_config pulseaudio CONFIG_PULSE
-	my_config alsa CONFIG_ALSA
-	my_config jack CONFIG_JACK
-	my_config sndio CONFIG_SNDIO
-	my_config libsamplerate CONFIG_SAMPLERATE
-	my_config ao CONFIG_AO
-	my_config oss CONFIG_OSS
-
-	if use elogind || use systemd; then
-		myconf+=( CONFIG_MPRIS=a )
-	else
-		myconf+=( CONFIG_MPRIS=n )
-	fi
-
-	./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \
-		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
-		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
-}
-
-src_compile() {
-	tc-export_build_env BUILD_CC
-	emake V=2 \
-		CC="$(tc-getCC)" LD="$(tc-getCC)" \
-		HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_CC}" \
-		HOST_CFLAGS="${BUILD_CFLAGS}" HOST_LDFLAGS="${BUILD_LDFLAGS}"
-}
-
-src_install() {
-	default
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/_cmus
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use pidgin; then
-		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
-	fi
-}
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 1b80d017d3de..49a0029207bc 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -2,6 +2,6 @@ DIST fluidsynth-2.3.7.tar.gz 1777056 BLAKE2B b6a4fcf430f5e89a66d80faf61af3e00505
 DIST fluidsynth-2.4.0.tar.gz 1780676 BLAKE2B 9814d8ac133ab18650b7f3b6ef0cdec6da76a59ef2dd2af9471311e7e7850604376d3d135e13c5b6e01a93d70bd5f266ad9df2a270cd9f3482738bb3d8f81747 SHA512 57770597e26140011324cac14dd81aa1f5fc52ec0c256a4e16f629b81b8d477279ad714cc9d1e375d74aabb348e1436eafd06746cdf10fa29196468645bf7600
 DIST fluidsynth-2.4.1.tar.gz 3298564 BLAKE2B 15ed3a808d0c0123226a087520564c2833d43c20fd8b6aa273a7467a74d92b8a67159fc960ad2f3a5d764b8e95ec25c1ec045c203058ceb83bfc276408d96b58 SHA512 d01d18c42ce98d0daa4e137118fc41f0a59047013870c09bacd9014baadf747e8e73571046781e34bc03eef454f2ef12ee59cf9b2c7f9517c586c08041ebe081
 EBUILD fluidsynth-2.3.7.ebuild 4006 BLAKE2B e465cd63547a239b6b94a659f70426da4b6db65c0599e9600fb5b055cce959ff8c8021e0dc9dab161e7b6edc92d869c334fa93c5a42ab04d88c6c4397f71f476 SHA512 6eb564fd2b1b44a5a69026d40e194be65d5ab497ad2263a9b2960d8414a242ff03ff279a2ba59cf19cdc237e1a39b442bac581f9377d0c44f30050bd7c01bfc9
-EBUILD fluidsynth-2.4.0.ebuild 3852 BLAKE2B af2d4abf0e1f3e9ae9e49d2c2f9096880a5876ad6668f11ca55001003e3f04f78d6f4af34a789113c9efa97e92adabdcf68ab843da5eaf2a07e21da4b3792a8e SHA512 22eaa8848c005ff49558fcb94fa976570ae8562df19fb16a2aafb4a7a28ad16097fd94f67ecf4fda7a4055fe95025ecda945a31bb2be5b785baf36e32a7eb355
+EBUILD fluidsynth-2.4.0.ebuild 3846 BLAKE2B 57a443ab0c08fd409244b3423c76bf501a1a685c4667a212f638527d67b1508565191d8696e23e1a2999f9c1fcb4e9dc1096ef32139d667fee3000333849b7fb SHA512 38204bd0ca5b70fd1582c7620005013813ee7e28c4f26020ef50d42ddf7b3bdf7f0e32fd3ac6bdee73f8365aff0f55789daec7581bd8c888fdf1023ac3999216
 EBUILD fluidsynth-2.4.1.ebuild 3852 BLAKE2B af2d4abf0e1f3e9ae9e49d2c2f9096880a5876ad6668f11ca55001003e3f04f78d6f4af34a789113c9efa97e92adabdcf68ab843da5eaf2a07e21da4b3792a8e SHA512 22eaa8848c005ff49558fcb94fa976570ae8562df19fb16a2aafb4a7a28ad16097fd94f67ecf4fda7a4055fe95025ecda945a31bb2be5b785baf36e32a7eb355
 MISC metadata.xml 509 BLAKE2B f94b91d9486a14757aa47e69269d6321fb330556f24ac0d2d47d7734bc28164d9cff5d7ff7728aa6d59606006bc4bfa090662b9dd087a6bf36ae23660604938a SHA512 7bf5aeb69570ef736dc6a1a3d652449b0142978ee5e6ed9902d4f851deea87c8fb94bee821ee9ae93bc529411f336288021718490e86c2815de5d30111bd3b28
diff --git a/media-sound/fluidsynth/fluidsynth-2.4.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.4.0.ebuild
index e1cbe51ff8bc..20fd15c5dd04 100644
--- a/media-sound/fluidsynth/fluidsynth-2.4.0.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.4.0.ebuild
@@ -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/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index c7a21684469b..af90023e4ebc 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,12 +1,8 @@
-AUX hydrogen-1.2.1-gnuinstalldirs.patch 1725 BLAKE2B e6b4b0f00b3a155d391ee21ad031b3a12882e652914b9ab40550bade3fc2465c327abe2edb9a4a9ff8e7d15d6700a16ba3e081bba696110ce96f21b91c90ed98 SHA512 d81f04c4f66d860832d767cdb0ef85fbfd05c4846c38ea1b4128ed1bb7e384b54e9844f91236b8fa39af50691334f22efcbea348fc48fc71e844a5b9bd03acab
-AUX hydrogen-1.2.2-cflags.patch 282 BLAKE2B 9535b11fe3d29d5a2ae621aa25084d3cf1540143a3c17979ef9f088b99a7ace4a7e0307f06582f660cb3e7820f27486d130d0f9738670d84e2892a5553043021 SHA512 07d1d0fad5d018507fbf533d71f38ba2325fefb2e51973e3b032fe029b4688695388e7962556d57d9f128178c05235a0aad2281d4b4bd5c293f2f8e10eb51815
 AUX hydrogen-1.2.2-no-pch-include.patch 293 BLAKE2B 11c8990480cbab309736e922d6fd87234865779685a619e9e912359474329d4b0b214f9a37cd29eaad67487418803c9c3e9b261ac72d127c57631dcb3a37869d SHA512 63b9e2bd89d8cacd9f953aff993de9b6aebf4242957e8fd67bfb1715658d192e6864012ededa67a9348616f73f8d12182f2756c39b8751e85095a1b55855c1d1
 AUX hydrogen-1.2.3-cflags.patch 357 BLAKE2B 262d80509abc010bf5844c03736fc4ee6e2d8442d08f1a4d30cc95d367e18e9c4d49d0a8cdc844d37c84220854ae22726962ab953c76426b10da37fa9acd99dc SHA512 789738584d28ebe872aca545e585b28a10c9c1c93a39bd733e98540f31809bfeb3a1b3f161addbf038d4696f45cf65108ad0fba134c3f22b75c10aee3dc5aec6
 AUX hydrogen-1.2.3-gnuinstalldirs.patch 1677 BLAKE2B 3346a4043f26f7cb9eb65ecb2f42c996b14fc9eab6ba87ace41e928868248e1ed12c00eef55b4d6ea54205d8fb561e42cdb39a6f7e21ca1e3e6497571c17055f SHA512 0e675e6fa839aa0451bdf1caf6fee66b973092ef5ac32ff301f8e9d5f114461d0d95b836012da5cc2fcf756c38eed33ff7233bb44ff83f6275f439eecdd247f5
 AUX hydrogen-1.3.0-cflags.patch 276 BLAKE2B 69c498f23394f4c29f46c48462f6454d294683e79a809f451d8c080684bb2e5b519f82ba2c31f1f324412c45dbafe335bb59c056c510b33dcb7ba5c6960d7933 SHA512 405d6851db83229fdaf1ff7c4534f7477555e583aad91bb2148947a40303ae1d1b44efa780d56c635854984c87f44b8caa438a8c8cc2ad068a8f7f74b1294a37
-DIST hydrogen-1.2.2.tar.gz 12948890 BLAKE2B 30d8624078a29a0514aee01d56865e5923f755de02acfddde45a26d6ffbd68cf3c8c774827fe4538b7d03faefaabb9ddcfd9a28bb404c535ad7f6734eb5b1aff SHA512 bd6b102b14d30a8e2f4ea7e405199bb34f9b7691b57c3f9f3096c9e30c25c158e3bfd40bcfdd2d449bc153b7d3d9717df401f1e7a086e33dc953247870f1dee0
 DIST hydrogen-1.2.3.tar.gz 13692726 BLAKE2B 0860b10569506d868e8238196ecefbee080e74af41137d45b49c1032185c320ca3cb637fae71c0b6797d333699434a54919189153069877f10c77446deb2a007 SHA512 0dad3ac25e7c867b3141450faf2affeac2165b7593a2cafb61885434520d1726eaee85d11689be0304bc8a037fbc0737c8130d4ba59bd1ed4e7f1addc56cc25d
-EBUILD hydrogen-1.2.2-r1.ebuild 2155 BLAKE2B 8b5ff3f837d6b08c8c1fbc3ba45ee9ff3c017788685bc08fbf8474322602c150be59da7e134b9c64acae54e190f3105e923ab1c9f76e94997bf84541dce02f94 SHA512 5a94e68f6efd31b6ef051e927c180ad39609b2ee5716c673cd0f16dcb6a144e50e291d4dba2585d86d1e2273d8810f05b91e764ce8b8e9d1a2da2a638ad15410
 EBUILD hydrogen-1.2.3.ebuild 2162 BLAKE2B 4dc563d8924a771eee5a377176b1cd7fb261b82ae0c18207e436fe69226b669b9a39777fded8db68110e5460f4a6ba418637edd1d0a48c6d90d7e772a885f9b6 SHA512 a1db269caec6d2b53912eac707e6d757846792472e2dd5b38af108221c077f28e089f31297e7906e0b5ce93f8898b69f7669f4e08c94087c5ce3fccd3f36a599
 EBUILD hydrogen-9999.ebuild 2121 BLAKE2B 1fa910c07551350f7b7cc2a8f98d142bd53f33cc9ce350f130285d91f7161fe6769d0ca0ab02deb531a4b8eda1a55613e060465110c919e4a72b8d40b1e12636 SHA512 5d8fb6829419ec3bc733d6406585efca1de6113bd5686746341d69fbe92181d0b7e2a07d0c77799b0ec2cd30ac56d0bac2a20decd8f91f7d65bab0152f48b4dc
 MISC metadata.xml 478 BLAKE2B bd59feef45263e2f2440696d657c0845f70498b64dec764dc4fff3e0c837a725195f55a2a651498f5c38448ae7c45fdc50def9a8068fe58e93332ad66de7e1ab SHA512 757c7766697ad73293ed281df0079de5775068bc6b899a9dc6bd3a41a36ed024646e01d242177948be1756d407e44cacd2bb2ed7ec0e4698fd358ec0031db3c4
diff --git a/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch
deleted file mode 100644
index 61f94d84bfc7..000000000000
--- a/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -418,10 +418,10 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/data/doc/CMakeLists.txt)
- ENDIF()
- INSTALL(DIRECTORY data DESTINATION ${H2_DATA_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
- IF(NOT MINGW AND NOT APPLE)
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.metainfo.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.metainfo.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
- 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "org.hydrogenmusic.Hydrogen.svg")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
- ENDIF()
- 
- #
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -77,5 +77,5 @@ ENDIF()
- 
- IF(NOT APPLE AND NOT WIN32)
-     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/core DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
--    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
-+    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
- ENDIF()
diff --git a/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch b/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch
deleted file mode 100644
index 13bd531df885..000000000000
--- a/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,7 +141,7 @@ ENDIF()
- IF(WANT_DEBUG)
- 	SET(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O0")
- ELSE()
--	SET(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O3 -ffast-math")
-+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- ENDIF()
- 
- IF(WANT_APPIMAGE)
diff --git a/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild b/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
deleted file mode 100644
index 71df9f243599..000000000000
--- a/media-sound/hydrogen/hydrogen-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://hydrogen-music.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-fi
-
-LICENSE="GPL-2 ZLIB"
-SLOT="0"
-IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
-
-REQUIRED_USE="lash? ( alsa )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-CDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	!archive? ( dev-libs/libtar )
-	doc? ( dev-texlive/texlive-fontutils )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lash? ( media-sound/lash )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-libs/libpulse )
-"
-DEPEND="
-	${CDEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.1-gnuinstalldirs.patch"
-	"${FILESDIR}/${PN}-1.2.2-cflags.patch"
-	"${FILESDIR}/${P}-no-pch-include.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_CPPUNIT=OFF
-		-DWANT_DEBUG=OFF
-		-DWANT_JACK=$(usex jack)
-		-DWANT_LADSPA=$(usex ladspa)
-		-DWANT_LASH=$(usex lash)
-		-DWANT_LIBARCHIVE=$(usex archive)
-		-DWANT_LRDF=$(usex ladspa)
-		-DWANT_OSC=$(usex osc)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PORTAUDIO=$(usex portaudio)
-		-DWANT_PORTMIDI=$(usex portmidi)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_RUBBERBAND=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	cmake_src_install
-}
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 28864e78fd5e..23ca06fd0605 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,7 +1,5 @@
 AUX qjackctl-0.9.13-disable-git.patch 503 BLAKE2B d46a307dd6fcf62b51b4172a7e88ff71cf632646e28fd26857cb0bc4b9cdcd5c11260a197b10ffc4362d77bd319524bac2985bef2faf03e97d0c899dd24fcd16 SHA512 0bdc675bd9c82a45f3633342a1669bfa4d545e31122c915ff21256e7653bb1b5f33fc77341c1a9ca568912327e7f5380b27278f63914e123484d80935a27f3d9
-DIST qjackctl-1.0.2.tar.gz 1319207 BLAKE2B f5af834b39d48dd5a10b970bc90cfd25470c91210b295727fb03bf6a277361bd67f54c3a841ee9aa7d419020500906ad41cbea490d6b223a7fc4c6357a523f0e SHA512 617760310eed763c813bf2ff95b72bd7c76bdc68bf2f997333eb9769e55eec6c02ff0e0813f576b5f06cdb856756cbf36017a6d1c578d493ceed7aa082470f25
 DIST qjackctl-1.0.3.tar.gz 1324619 BLAKE2B 78d0f35184dfa5cbd137340615c21c3dc576da8875aed6a7ab0104b8aab4cebe8c1e1a8551e529ddba51965b4d110ac42c5c6232ae0d4681c92a34a137792e42 SHA512 32ea26307efc22c0e4a6db91675c65237f654fd3f58150545170e70cb13d25a609a09c053ffec382e2f706059832ff765f9f62ab8eae5e704101a41cb2745ee5
-EBUILD qjackctl-1.0.2.ebuild 1008 BLAKE2B 1ec2ffb41f8547db96bb48b4d76b852d1113f1412a6da07f97caf2dce6087999ad51e4b369716362c98cbcb506e5c16b5c9853b06d0df8cacfdd48fa83739ead SHA512 462f339e40a8302f9838e51d8f1241ca6d8d82185d8f0f2171fb73d87822b852f25dafd3f26deaff618ae2d5682565ee274d0d158552eff44f46b39304200d2e
 EBUILD qjackctl-1.0.3.ebuild 1008 BLAKE2B 1ec2ffb41f8547db96bb48b4d76b852d1113f1412a6da07f97caf2dce6087999ad51e4b369716362c98cbcb506e5c16b5c9853b06d0df8cacfdd48fa83739ead SHA512 462f339e40a8302f9838e51d8f1241ca6d8d82185d8f0f2171fb73d87822b852f25dafd3f26deaff618ae2d5682565ee274d0d158552eff44f46b39304200d2e
 EBUILD qjackctl-9999.ebuild 926 BLAKE2B e7d605b036d205a43319d6559c0a918e347436e3e932d8002f3dffe6e56ef8563ca32efb6bd731802e8c1c066716f3e21a0896ac8b107f6c9361656f7ac3b556 SHA512 eceec774ffc46b565ad7398844febfee6c6c3ba65bc523072d81de91f84065f9507c93b4b18f9e63abc794a2814aa0f2bfab2a70f48afbaec07484d9530892e9
 MISC metadata.xml 338 BLAKE2B 74efc1853779388695ea14b6ccbe8e22d88941b8fcb845f553c02bd9e052f5638b2f4629dd238272a20b76db17f0d1f30a454a4b9a27333eb1e80b8d826c0dfd SHA512 bf18f336710191bc34b33b34f3f39435a9f3c9d7c45cef4e5b0ad39c19f4a9b27ee032dd2dbf6c57daaa90ad5f9adce40c49230850b6c1d746d0691eaf5ebb10
diff --git a/media-sound/qjackctl/qjackctl-1.0.2.ebuild b/media-sound/qjackctl/qjackctl-1.0.2.ebuild
deleted file mode 100644
index 8b1ca524e452..000000000000
--- a/media-sound/qjackctl/qjackctl-1.0.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg cmake
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="https://qjackctl.sourceforge.io/"
-SRC_URI="https://downloads.sourceforge.net/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa dbus debug portaudio"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.13-disable-git.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
-		-DCONFIG_DBUS=$(usex dbus 1 0)
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
-		-DCONFIG_QT6=no
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 2cb734e33319..ee83bcece7f1 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,5 +1,5 @@
 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.3.0.ebuild 2568 BLAKE2B 3ff74dfde42f08bcccf2fceb8dbe8c69bbdabcfdcbd5025e93043c0dadfb614973679a1c86b99cd77b8f07e21f290b10e7948f65870ed6975241223f3789d5ad SHA512 bb1575ef98d41108910439e1f6d81e5693a11181b6710f9fe0dccb55f804b2f8f053af3a63459a7b2b59b52747f3a03bcb8dc4d2d7c48f0a0d4786075a3e20b9
-EBUILD qtractor-1.4.0-r1.ebuild 2716 BLAKE2B 3018edd88c136c2c5cc61f8066968dbd2821dd540ec410975b22b2a88de4aa2456ccdae916389daf65a4c1c765b3d7a865f92a402ce3f7bfeafc78f78f351ff7 SHA512 79bec57a3c285ac19ece151bffcec3acafabeb1888b62023525f6b4177a9c583144ce3062413fb68f80fe6d03a27c2727698028617d8542fe5b2f9f8d47d862a
+EBUILD qtractor-1.4.0-r1.ebuild 2714 BLAKE2B 1e082566e65ca109197664bd0564416f203c394fde6cbbb5c905616a296e4b0cef38793f5221b2386e72f533e3b663d7f1c05bfe548fa8f9d92220eb7874b02d SHA512 6a2838cde8e1e0ca87387221c5593f1e6d4a604677b897cc470ea931f9edf14e8ac67648f24c62055f1f49e8f029d52018691fc18ab0af67a81034febf8767c3
 MISC metadata.xml 945 BLAKE2B 4f88a28c83ce8b2874664ad8bf6a08d5a575a609fab948c47471ed226e284453f87da5b1ae034678295e30e5e1dce357ced317ef5d3ab793e04fb17120ce55b4 SHA512 5ab11543fa297253f5cb15515c16caf967fc69e9cccccb9ac6a6ba26fffce1f8539414edf3b065a61ddce0ff8ce3f04b90a68fd5bb79e0a498ca14c275753947
diff --git a/media-sound/qtractor/qtractor-1.4.0-r1.ebuild b/media-sound/qtractor/qtractor-1.4.0-r1.ebuild
index eb8b13d4e22f..ec453a670328 100644
--- a/media-sound/qtractor/qtractor-1.4.0-r1.ebuild
+++ b/media-sound/qtractor/qtractor-1.4.0-r1.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 qt5 rubberband vorbis zlib"
 REQUIRED_USE="dssi? ( ladspa )"
diff --git a/media-sound/sidplayfp/Manifest b/media-sound/sidplayfp/Manifest
index 5373a6e17321..1dbdeb953261 100644
--- a/media-sound/sidplayfp/Manifest
+++ b/media-sound/sidplayfp/Manifest
@@ -3,6 +3,6 @@ DIST sidplayfp-2.10.0.tar.gz 244263 BLAKE2B 62406febe1ba9074779b3ed77e5ceddea35d
 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.10.0.ebuild 1005 BLAKE2B 3cc6a183340649a7337349e230c5416c6a627b8fc176a105b5788ceb191463d9b74164e106bc5167b70513dcd736ba8159635043df25eda0390495fb28937764 SHA512 a279069fad8ca3d7a410e76122888edec9f0d50a42403a19fb6e34a3c7eae8bfdeec851dc7f68f5d7d7cc970bbf85f377957805b85d3dfcf86074756cea42d0f
-EBUILD sidplayfp-2.11.0.ebuild 1006 BLAKE2B 944a4fc8f5de733504aaf5fdafa395053761892926fe4b905c445ca7e805c500b84a4cda1eadcad944bce9ee6598a09cdde896bdf09b25b47b8ead7e68ac4032 SHA512 9190d731ace9ff9f42e36b5bebfc21fba44b9d4ece391e12fe08fcd92266cb287e0f76617910ef8aa7e277dcdb117272cdff991642cc666f09100038c2f2d62f
+EBUILD sidplayfp-2.11.0.ebuild 1005 BLAKE2B 3cc6a183340649a7337349e230c5416c6a627b8fc176a105b5788ceb191463d9b74164e106bc5167b70513dcd736ba8159635043df25eda0390495fb28937764 SHA512 a279069fad8ca3d7a410e76122888edec9f0d50a42403a19fb6e34a3c7eae8bfdeec851dc7f68f5d7d7cc970bbf85f377957805b85d3dfcf86074756cea42d0f
 EBUILD sidplayfp-2.12.0.ebuild 1006 BLAKE2B 944a4fc8f5de733504aaf5fdafa395053761892926fe4b905c445ca7e805c500b84a4cda1eadcad944bce9ee6598a09cdde896bdf09b25b47b8ead7e68ac4032 SHA512 9190d731ace9ff9f42e36b5bebfc21fba44b9d4ece391e12fe08fcd92266cb287e0f76617910ef8aa7e277dcdb117272cdff991642cc666f09100038c2f2d62f
 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
index 2d76084b9af7..451012e6ce4e 100644
--- a/media-sound/sidplayfp/sidplayfp-2.11.0.ebuild
+++ b/media-sound/sidplayfp/sidplayfp-2.11.0.ebuild
@@ -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/vmpk/Manifest b/media-sound/vmpk/Manifest
index 43d8296a6b6a..19972083fbe1 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,5 +1,3 @@
-DIST vmpk-0.8.7.tar.bz2 483742 BLAKE2B 788c70034fcfb53edfb4c6b0faf80c06e2ae096c06819bc727359d4597cb217ca60efc9ebbbb19b223dc0d7106ddd9083abbce881f175b98203f3b6acc9b44e2 SHA512 83867aed8be8e620e18070d5eba9f5e4026b1f39ff9d7fe55e342d4a040c96e2353844296191c0efb46483254b1d2d30824894077562a165f7474d02a882cfc6
 DIST vmpk-0.9.0.tar.bz2 449608 BLAKE2B 80827907ac32788c687ff71170afec2de32a02cc9f1096b5af5e1cc6a43c513efbbd5f9dc443cf2d56a536c158b343a362fccb57814c99d9891a5a5b7c83d5ff SHA512 7e84daa0664bc9d403df6c7bd5a226ea37c4804c49e4bcfb2e4f141e257e0081b752e9c2bddc29a9d2eda8bcb06b8ed1c79d129e55d601dfb58951449ebf454f
-EBUILD vmpk-0.8.7.ebuild 934 BLAKE2B 907a534de6bd16af45c2731cc3a65a491249b0dce6b21638b752c3b617f81e88bc45f2d3aa95e219f95e8cac62ad8e42efc4c3400082f88b74af437549383965 SHA512 cc80bd7fba94b8e9c365d8e9777ba4c6cc95e44baeadcf4ce87538e6b541b8580c7cd6de9127a999c9d7b884404cff54abdb59a7b3efab567ed66d9ea9d64a81
 EBUILD vmpk-0.9.0.ebuild 870 BLAKE2B becf3e5a24a4863dbc7f2ba270d33a779db0afa87d85805e888aaf7ad686cf11e6154de04779068e0c80b819ec193c90041c2c141a4f37d6d8f5c6d894cdc019 SHA512 45ed15be8f3429a919f2091065fbbcf8532a2f1ed314eae23d3d1bea1f1a2c4b7d52a839d5231f0641b50fc20ed04c958cb58a5a5ac56402dd15154be5915d40
 MISC metadata.xml 858 BLAKE2B 20b44d6c38d0f95fdc8bc98493ebb2526ccfb6459f1b8b2e9d10d3b81753945d0387d11bbb71e7bc6f9364eb7c6da9d3795c09fbf077e5a4d97c96ae944ed1b6 SHA512 1721098bd213eed29139ee33f4a715f975f66cd8e7efc9d733c34b6ba44d729be4f6475b807304b3e81968065ea15bcb0131f405aed3b67e1e747c4b44f9403a
diff --git a/media-sound/vmpk/vmpk-0.8.7.ebuild b/media-sound/vmpk/vmpk-0.8.7.ebuild
deleted file mode 100644
index da5a0f3d7dc2..000000000000
--- a/media-sound/vmpk/vmpk-0.8.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Virtual MIDI Piano Keyboard"
-HOMEPAGE="https://vmpk.sourceforge.io/"
-SRC_URI="https://downloads.sourceforge.net/vmpk/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus"
-
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=media-sound/drumstick-2.6.0
-	x11-libs/libxcb
-	dbus? ( dev-qt/qtdbus:5 )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DBUS=$(usex dbus)
-		-DUSE_QT=5
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodir /usr/share/doc/${PF}/html
-	mv "${D}"/usr/share/vmpk/*.html "${D}"/usr/share/doc/${PF}/html/ || die
-}
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 4cb186dc415d..de5910f22c5e 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,3 +1,5 @@
 DIST yoshimi-2.3.3.1.tar.gz 8874525 BLAKE2B e69a34a597256eae95a4787524c75db009c5224750c8d3f9da2a5fe3a93b8a8077ec6999e7d31dba63e08f593707ed04c3e9dfce95511b533aa96de40132b731 SHA512 d49c8cce203d11a5bffc9cbf6bc94033d7504e9d653551f2774a5daf6a438d6f0bd7747f375d7fe950e2b0e466d1fafb503c5a44ae8a7feba6af8303baac3788
+DIST yoshimi-2.3.3.2.tar.gz 8879649 BLAKE2B aa5e354470cd22bb2547ca69042fdd667792b607bcc61a57b2e3da764758f2ceb67d93d1049bcb104dcd5077c80e3013d7f1cc7edfe0495c8cde44b71d4a1cb3 SHA512 169a59cf306422441ea0937d7465de116406051a8a31423672d296c0d95156e02d5db5557d00c4eff356e5671753655ab51877cc0f37394c5c9835ae2b681563
 EBUILD yoshimi-2.3.3.1.ebuild 1004 BLAKE2B 26dc7e9a70aeb881fb66a469912fbd822646b5b2c29f636367a43890b8a57041488f3d762cdf6b45cad2206087a3bd28fe27ba013baa42956130c7fab99ac042 SHA512 be88ae507f3b826ac728ca6f13e35fab8cec79059905b8ac4fd850c918caa25c0b798b8692a4ccc8927e6fc555fa6f901bbe0549a8402fecd29cafb49b8e51db
+EBUILD yoshimi-2.3.3.2.ebuild 1006 BLAKE2B d7a9f77daffc919307db3c3779caabb815735c721472721c9b8adfa151db3ae0816481a125b8a60cd0683ef133173484995fb224739881cea436ad81cd9fc504 SHA512 8beb46e67d37d4fb852ba9f974589bc7ef53db4f886793fccf586c39fad1cf0f419e2d3a226dac2c93f76764e59826af144a11b32a13dfdc33f0c9cf722f5b0d
 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61
diff --git a/media-sound/yoshimi/yoshimi-2.3.3.2.ebuild b/media-sound/yoshimi/yoshimi-2.3.3.2.ebuild
new file mode 100644
index 000000000000..42acb9b39317
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-2.3.3.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Software synthesizer based on ZynAddSubFX"
+HOMEPAGE="https://yoshimi.github.io/"
+SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lv2"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-libs/mxml:0
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/libsndfile
+	sci-libs/fftw:3.0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/jack
+	x11-libs/cairo[X]
+	x11-libs/fltk:1[opengl]
+	lv2? ( media-libs/lv2 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( ../Changelog ../README.txt )
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die
+	append-cxxflags -lpthread
+	append-cppflags -lpthread
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLV2Plugin=$(usex lv2)
+	)
+	cmake_src_configure
+}