gentoo auto-resync : 09:06:2024 - 00:08:13

27 files changed, 48 insertions, 1028 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 843a83f60162..94b903c8be9f 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 27e538e99c8f..113d95dbad1f 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -4,4 +4,4 @@ DIST alsa-tools-1.2.11.tar.bz2 1882262 BLAKE2B 2c429cb0dceb1dcb186578e2109a1b3b6
 DIST alsa-tools-1.2.5.tar.bz2 1880907 BLAKE2B 1ecd7d24771e3f5899a7084a69196c9301b549dd331cbbbc55b6f0c694566147a9d5642cf94f0ad5ca5fcedb77daa1cb4615ce0ec0be157b32c9d756611a7cca SHA512 1c4ff947d9f2424056a6748e04a1250fb73443a3f470f61d0b563c91be082bc42d56e550d6cc27eaed3edcea2066a107e20455c959b053b5deafa2d811b7e498
 EBUILD alsa-tools-1.2.11.ebuild 3467 BLAKE2B 3ebcda84fdd90eac1d7dd1b4e56f88289dc2511198d9f7ab017b3b94e3964099a7331aca1e40267030028ed0623670014812e2f9437ee12034630bdb8e2f2c1f SHA512 dc23b25934369588ed72f912f16dbb5c2b52103ba9bc937317ab0592640cfa27e1b5b721b0a410d5f2360889130972976daab7fe6f696e01e01c0c793d8e753f
 EBUILD alsa-tools-1.2.5-r1.ebuild 3516 BLAKE2B 8780357680d18848374abdebc71e898c0c988018b68252607efad314e0b6160651ac9e3e041f23d771f582866ecceeaab6b267fdeeb0e48696411a07c131aa99 SHA512 cb8e0426ecb1270b771c58978b5a40be18afed5ed3f8894921fab4b7174274b1740255acfb1ab314642d3de99daff94d830efc1d5f3604a4a69e3926074414d8
-MISC metadata.xml 310 BLAKE2B 1e82b52e947ac2e811104c837f168f7020c2864c5ece3b1da5e06578a3e63b39b06bdb4993ac7d5cbd90d5e359df63c49aba4a4f309bf8f9c003190942b0d9b3 SHA512 45fc98227626d78099dfae8b44df697c436d1df13e61e6e05bbd29ec63218961aadc5124c813c6d076f29da6617f2c901b73ff8a021817973d13a809d0240f4d
+MISC metadata.xml 256 BLAKE2B 3be321130aefff26e604c89e89b7dea5ea5744a30f6f8562ef4a0354c39af70378da523cbc08ea0aaa41d16684e50adc34e4b861744d6b566ce5c714ab3afca4 SHA512 5570207ba0cd9ac093d943bb7899c750a923dec6a39580e3e3efff2d584037457d3e35f6d3fd1b507d70a9c0fe20e5ba9c479345bddf2714dd7d4f07b87d858e
diff --git a/media-sound/alsa-tools/metadata.xml b/media-sound/alsa-tools/metadata.xml
index d2e8313dec39..414e9d96bf06 100644
--- a/media-sound/alsa-tools/metadata.xml
+++ b/media-sound/alsa-tools/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>alsa-bugs@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">alsa-project/alsa-tools</remote-id>
 	</upstream>
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 8a84e77733ce..1a21fc77241a 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -6,4 +6,4 @@ DIST alsa-utils-1.2.10.tar.bz2 1625707 BLAKE2B 077b4ad090c1ab40dd4fa22db01ae2a08
 DIST alsa-utils-1.2.11.tar.bz2 1627148 BLAKE2B dcf96705f9e3f1b4abaa7e1f107d1154a05500bf1cd07c821e0fe8c4ba7d7f08de0cf126be8c9c8dda3980d85c144318c12ffc8a95d5da4e98c49a6e9c2ee8ef SHA512 5ce76807b53357584bfb4ace5acfdac4db9168ffaf5cdd1e499738eec046c36112bf84a99970f66368063a9baf73bad93af2d439630572f3eba5c9321071172d
 EBUILD alsa-utils-1.2.10-r1.ebuild 2628 BLAKE2B 6b1c439edc348b1bb8b524d0d6c7c058bb7ecda79852216239702c58a8f3e5a211c9e6876a3880b258129784ef29ccf120af329f94f8abd216f8904024ed448d SHA512 51ca9240f7cb66f4e565247d1db509bc5c4105ebea3a593271d59a29e9883d09bbb466772fb1e40d1ed7d6ec84e7b02630ffb0ab3945bb4630c132b419d32bae
 EBUILD alsa-utils-1.2.11.ebuild 2497 BLAKE2B e76a58d4a4bf567993c82bcfe8a868c923c5212605157bf055e36b63049df45678a2dbde89054281281062523ef16876c930be24b316965bf8401e1b94d97e2b SHA512 86c158709f203a3989ac2efaa314e77bf3f0b271592325d46d846ab59ea8245c4370c5fbce78cd5ad326a6160f1b1585cfd8eb0be157c4be72daa0a77707535e
-MISC metadata.xml 691 BLAKE2B cebd9679a0d61fec11a710b520f51b88190a31d63ccb9215d9b281e948af5c659b99aa2cd21fa15c46eef3820153f869eeda2d12819fc8ee9d5c2ece87eb5e35 SHA512 252c7bbfd582f90a2a93f07db3f2d9ee6a49484415f5557f8a95b37823cf02d20791f46321b91860520c557d84573ca861642bd7805fd70fce698a33b543208f
+MISC metadata.xml 637 BLAKE2B 30aefc9f4259b4f3c7b37196fd59bb4af4dd2e72d140da885a698ebe5e09a44b7bfbd456417d2d29a670adf2b2c65ba7038f29050606d02dc0d50e20f419e4bc SHA512 e5f7739365c0e4f9472ddca00e5de53454875b5bf562c00236dc8540c4c3b0040f69355d4f389ac5fbe4e726a3bbb43dfe34480ce72f69b872d0a0ee7e3641a5
diff --git a/media-sound/alsa-utils/metadata.xml b/media-sound/alsa-utils/metadata.xml
index d5e35b0955b0..130888dda686 100644
--- a/media-sound/alsa-utils/metadata.xml
+++ b/media-sound/alsa-utils/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>alsa-bugs@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="bat">install basic audio tester (BAT) util</flag>
 		<flag name="libsamplerate">install utils that use libsamplerate (e.g. alsaloop)</flag>
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index 5e396872b815..7b0c76bc7027 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,5 +1,5 @@
 AUX cadence-0.9.1-fix-clang.patch 424 BLAKE2B 181975de4d015393cfe9406e3e94c3d984a342b9d3d80aa0caa2151ec3825430a9f1210f3c2f3b104a8d90f83f27483b3a4b8bec10ae5107a2846fb629d57695 SHA512 544eb77db3715a9c2990375aaf77515896ba43f67dbb1572428444a1386ed5aa0cdebd6e24fb3f6f20b8ebc0dfd6982709f39178c39759dce1cfe381116db719
 DIST cadence-0.9.2.tar.gz 2202164 BLAKE2B a5422e4d74618e2e45d9c6f275393a6e918783fc37d60a54142725aa54e691435c41f76dd0346fae7684c452988b07a18d817902abd917dbceaff5fb4aaa6c47 SHA512 d8a1b52c361e3e18a193d1c283bb69abe18ce667b554fc53cb9b752d92747269145144ae512895ffbb5df76efe8671cfc0782f29e59d0d7cd3d97c97240bdecf
-EBUILD cadence-0.9.2-r1.ebuild 2465 BLAKE2B 0dae3b708ce9119097a891417855b8036235aa97d6eac28516330692587e471467320667c968d4160a253b65c78da6e1176b3afb4fee35283807ad8b2a330c80 SHA512 5de5b0a05d596748007cfe3e7e0979a462091715abf31c74f1187876423dc7c7a2a6b60a12b6a9d69138c3cda5bbcab91b374464315cae49e5e8f2279d8f16b3
-EBUILD cadence-9999.ebuild 2385 BLAKE2B 94a6800b1faf541909c3a43f05638045bfdf2b3e505a8f4d52190e6ee55c7cb8ecc777c7f25d5b0920a424ee5cc59d1170ce9016b39d0c703436c4d9f14ec734 SHA512 22a60e284f02a65ebe05e3538a3b8c3aa2312a7acaa60956ef813fd7a245abb25b250531b59941b28215f3a336ae94d26a2295814fb446f648f1b44d81767ee3
-MISC metadata.xml 374 BLAKE2B 8c1a9825ca72eab695ed26a7ba63a501ce927dff3fafd661c4f7f3af61e20e1afb772e2ec15359f41eba09e0dda4e4027237b5214af64f066e5a4577b44d584a SHA512 06db35bcf758806bea248801e8d9080a089ea9d68887d33cf5b4efa5f9f1c323b575d14ba01a304634e0270c8791588328de41b48bdda67914543d85c3662f2f
+EBUILD cadence-0.9.2-r1.ebuild 2414 BLAKE2B 9930703e1c71daf653939b3faffa1c8b627648ca43a9a15fe472462a643eda4dc86dea788297caeac27b83a28a03d5ec6e0876741ea26a8911c870425c74f73f SHA512 8ef814a155d3d472a4f2758c01b330a0c403d26327464e07bd88ebbaa0285a09fa50fff038c581f2d16a9408eac3c600e9660c8d9e466a5cd42ad164a1fc944c
+EBUILD cadence-9999.ebuild 2414 BLAKE2B 119aabfa5fef25792a454610a3acfb12bcbeb47e0cc9fa3b5f8ea708b48db5e57f1494ba8bcfc8f6667e62956d9c6ffbd22f2a0ea1f8aaa9c33aca6017bcfe08 SHA512 0cdc0371f73168c251bd3ad690e6879162109943bf7594a1d0c09837404419ea4ecf838505c3fd734ac4164eda0c131d6fba0f3aeef0c7fd922ae899c2cfd601
+MISC metadata.xml 460 BLAKE2B eead158656fc73334ea67cc6d35fefeb848a3db01a4f053b81e6331176d9ba9eb2e96e1357dc4e84c21b7fb283e156ae75bcd9483b0fdd9df92cce03a4b1c47e SHA512 4977fc2c2e746384496ec249cc0f28d4b89cd941ebd277f48b1bda5d756a84c88d76556fdb3be6b55b7ae18c7655dc84013e6fe569064827f58e83b0dd518d82
diff --git a/media-sound/cadence/cadence-0.9.2-r1.ebuild b/media-sound/cadence/cadence-0.9.2-r1.ebuild
index 45f90c398df0..267bf2c07c73 100644
--- a/media-sound/cadence/cadence-0.9.2-r1.ebuild
+++ b/media-sound/cadence/cadence-0.9.2-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 inherit python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
 HOMEPAGE="https://kx.studio//Applications:Cadence"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/falkTX/Cadence.git"
 else
@@ -36,9 +36,8 @@ CDEPEND="
 	a2jmidid? ( media-sound/a2jmidid[dbus] )
 	pulseaudio? (
 		|| (
-			media-sound/pulseaudio-daemon[jack]
 			media-video/pipewire[jack-sdk]
-			<media-sound/pulseaudio-15.99.1[daemon(+),jack]
+			media-sound/pulseaudio-daemon[jack]
 		)
 	)"
 RDEPEND="${CDEPEND}"
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index 84dc5764486e..def22af01490 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 inherit python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
@@ -24,7 +24,8 @@ IUSE="a2jmidid pulseaudio opengl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+CDEPEND="
+	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
@@ -32,14 +33,18 @@ RDEPEND="${PYTHON_DEPS}
 	media-sound/jack_capture
 	virtual/jack
 	a2jmidid? ( media-sound/a2jmidid[dbus] )
-	pulseaudio? ( || (
-		media-video/pipewire[jack-sdk]
-		media-sound/pulseaudio-daemon[jack]
-	) )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.1-fix-clang.patch )
+	pulseaudio? (
+		|| (
+			media-video/pipewire[jack-sdk]
+			media-sound/pulseaudio-daemon[jack]
+		)
+	)"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.1-fix-clang.patch
+)
 
 src_prepare() {
 	sed -i -e "s/python3/${EPYTHON}/" \
diff --git a/media-sound/cadence/metadata.xml b/media-sound/cadence/metadata.xml
index 2545a82c827c..56363a93c093 100644
--- a/media-sound/cadence/metadata.xml
+++ b/media-sound/cadence/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>proaudio@gentoo.org</email>
-	<name>Gentoo ProAudio Project</name>
-</maintainer>
-<use>
-	<flag name="a2jmidid">Enables support for legacy ALSA sequencer applications in JACK MIDI system</flag>
-</use>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="a2jmidid">Enables support for legacy ALSA sequencer applications in JACK MIDI system</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">falkTX/Cadence</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index 3698b5c64363..c1acbfa3a8af 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -6,6 +6,5 @@ AUX lash-0.5.4-strcmp.patch 252 BLAKE2B f2b002772df6dab5c2942039d36e681697894cc5
 AUX lash-0.5.4-swig_version_comparison.patch 1225 BLAKE2B 92f9fe4ae053dc454f8434b823740c1cdd1bddd3c7a52ed505bc1acea64ddc145e1e7f9ffe7da31b7fd500f296b26c64d07c2a59149c49d18e0e4e0dc4e9e1a2 SHA512 39c3d82372592d6864a2c1e0de94ee150a434e107357ab549cf406cd58b7eb2f79cded6e97775f50e2e602906315aaf167869a53adb1b143eb3b5bb7147705bc
 AUX lash-0.5.4-underlinking.patch 660 BLAKE2B 6f3ca7580a588493610869ae8f2ff58f1c53b8e593e45c8613b1a15e7b97521f01372b493d3f627d878a8f0f6a349460da6fcc1eb48cb2b7e18e283acdc3a81b SHA512 118bccb0da55f0e7808424696143b00784afb18cdf982fdef837bdafa1dea6b55ed912762a964e210c2f0ba4a3bd1469249cad957428cca87da6bd0514751d66
 DIST lash-0.5.4.tar.gz 623469 BLAKE2B 463931a9fcacf806631746c69ccb2e2b795b8983e796835abce6036ed98571c41253fb8236a33c0a8bd1b5d3a910229d4e95f99257c1d82c64495201c64c6414 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c
-EBUILD lash-0.5.4-r5.ebuild 2594 BLAKE2B 06889426765f7151104efe1fde41104f9acc2eb5df774f698a4933bc40ddc4df294f799a07d7630acaf0591124b6abfaffe19b0e92117b54578dd9e198c4fa19 SHA512 6ab198aba02562bd83a1ba255400540b423038765fca417d0d6b300714d80cc51ed735b8161b279a40cd4e9920a0bf9fc34f8fa69785266a50020864a79a2690
-EBUILD lash-0.5.4-r6.ebuild 2650 BLAKE2B 65183c591c8ef96a6bbf162d68fd880d0418b629228f13cebdf60fd24ae2e2305d03e38b8e44b3c64d8339a14de2b4ce28693d636316346c882a3e4dc1bff3da SHA512 7bed9f49d256fcc8130ff3a23436f71561c7ceb9f38dd85e60500bb5afad57b242a35b4a22fdf9dd23dfeeea0994ec8e54e35c0c3d5b835045b3c00163da4fec
+EBUILD lash-0.5.4-r6.ebuild 2649 BLAKE2B 2ed6f9772066f0ef41f888c48e807492eda9c0158454817988a41f6eb7a4b2e01f0c6315c9fbe840b1de7e91b694a6efc24e0c9e3cb1e94fa280b40d332a539e SHA512 e1a8762a8032d11b1ce8f293c6f7d74d87a661f7aa03c436ead5dad9fffbce9b313d03fe106acbd110d10397801851e5783bbaa2dc8b049f290d1e66fd8905cb
 MISC metadata.xml 348 BLAKE2B a5547f7cc6e5cae590b4d49c378f44c3591dd94d0b42a5ba666a2bc72875a1b54db17f8b4b7ad489d1b816d5fd45d82d62ae66916902d5c58007a465337c97c7 SHA512 49464d68db43ca854eeb3774a086d041e688ad0613b5cb4099d90498efb868003aba35afddbb92d2583982d9d8be28340cc26bcd33330a47948b44734e411639
diff --git a/media-sound/lash/lash-0.5.4-r5.ebuild b/media-sound/lash/lash-0.5.4-r5.ebuild
deleted file mode 100644
index 3b74b7b4d2f9..000000000000
--- a/media-sound/lash/lash-0.5.4-r5.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools multilib-minimal python-single-r1
-
-DESCRIPTION="LASH Audio Session Handler"
-HOMEPAGE="http://www.nongnu.org/lash/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="alsa debug gtk python static-libs" # doc
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/libxml2
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	gtk? ( x11-libs/gtk+:2 )
-	python? ( ${PYTHON_DEPS} )
-	|| ( sys-libs/readline dev-libs/libedit )
-"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-"
-# doc? ( >=app-text/texi2html-5 )
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-HTML_DOCS=( docs/lash-manual-html-one-page/lash-manual.html )
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc2.8.patch
-	"${FILESDIR}"/${P}-swig_version_comparison.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-underlinking.patch
-	"${FILESDIR}"/${P}-strcmp.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/texi2html/s:-number:&-sections:' \
-		docs/Makefile.am || die #422045
-
-	default
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-multilib_src_configure() {
-	# 'no' could be '$(usex doc)' but we use the pregenerated lash-manual.html
-	export ac_cv_prog_lash_texi2html=no #422045
-
-	# --enable-pylash would disable it
-	local myconf=()
-	if ! multilib_is_native_abi || ! use python; then
-		myconf+=( --disable-pylash )
-	fi
-
-	if ! multilib_is_native_abi; then
-		# disable remaining configure checks
-		myconf+=(
-			JACK_CFLAGS=' '
-			JACK_LIBS=' '
-			XML2_CFLAGS=' '
-			XML2_LIBS=' '
-
-			vl_cv_lib_readline=no
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable alsa alsa-midi) \
-		$(multilib_native_use_enable gtk gtk2) \
-		$(multilib_native_use_enable debug) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -C liblash
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		# headers
-		emake -C lash DESTDIR="${D}" install
-		# library
-		emake -C liblash DESTDIR="${D}" install
-		# pkg-config
-		emake DESTDIR="${D}" install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-	use python && python_optimize
-}
diff --git a/media-sound/lash/lash-0.5.4-r6.ebuild b/media-sound/lash/lash-0.5.4-r6.ebuild
index 7bfcd922bfa8..50c2e07fd925 100644
--- a/media-sound/lash/lash-0.5.4-r6.ebuild
+++ b/media-sound/lash/lash-0.5.4-r6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="alsa debug gtk python static-libs" # doc
 
 BDEPEND="
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index b6dc512e9ed7..6f41b0dd9249 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -3,17 +3,7 @@ AUX lilypond-2.21.1-fix-font-size.patch 505 BLAKE2B 33f98803eea6a87082a9c724bb88
 AUX lilypond-2.22.1-fix-font-size.patch 567 BLAKE2B 7a2988db6af343f32475e0e49867b09137459765624177fb255ee6ff3b947e9f8bd278929733413ce63759249ea27c83b3547a1fa7ccc415d1c56c6e4e3157ab SHA512 be8b2c1a2173a539c7d58c918056b8768898f14a982df50ed279340f6c6621365176e3dd564e76826ef7bf49c10057ed57f174bb8d23c9cfee0e16c76cd47493
 AUX lilypond-2.22.1-free_font.patch 669 BLAKE2B 49092e7d2a6f8e86d13159af89600cd451abda5a1cca72fc48dc8402cef405c42ec0f4e7d4a886a990a71a22710f4277663188d68c6b363671c237a479bcb69e SHA512 9de0925c442ff412395c5fbb7b8268f6b3e492aad3b5b0305252ea1cac67dfa1c1922e5fde9bb1ff893cffbeb38c1be869d95a596c41622f3e8f7ec017ad4244
 AUX lilypond-2.23.0-fix-font-size.patch 573 BLAKE2B a9b9fe5249b76a92aa6c0f8e4c0002f03785225e081b07d4ab34db459bd8d241b97051273846dd9efee4536e00b37fd0a064302d05b537069e17b6dff834a1b9 SHA512 523e5d1ddf68c07715e791ed9367c836010603369f14ee22ce7ab2979131be1c066dabdd66a942ed9b098c3f535577dded0bb0e1e48c35754d7f9c455d4911f5
-DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9bfb0b65ad565aede9dba983ae8e5fb350e8a53250cd01314b4d032d1bbe7b391bb3acd411dc6665868f4cd04f15011 SHA512 4dcc4da1bd1aa1d10ca802acbe29f2256587cd8e2643651b6d2e42cfce0b9572d0eb1139fbc59cec98ad6b86b86e7a6910becb6be7a4350ee0adfe366daa0a65
-DIST lilypond-2.22.1.tar.gz 18033161 BLAKE2B 41bd0159e8e851a3582c35285d301113e6a50c95c7b5adbe8ab1de3cc4e84a0580fe54e2166372b6640ab3d486b48d40edbcf4eacbf211d4fcb4e5d6defae2ff SHA512 dfe159928afd8592769fe9bf940b35e285465c2103707d855e82dba860e817a195c906fa9bda6fdfabce6f5adeaf49111891e14a822bf9cfb70a98312c6a9d1d
-DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d
-DIST lilypond-2.23.2.tar.gz 17080861 BLAKE2B e27bde3625454dc070e4aeaa8c857c5e62b3e73fd197ba014805f657210942b3d1ef03d2d75594f63e7cc1838fbcbd40e2b42d14707b6b6eeec02cdd3f346754 SHA512 f5713394d7e79dad585e21690d8ac3c057eebe77113f1f307e8e1e117bccc26bdc5370a144505ebd887e653cee114cb9efcf75ec56b9d0320bbdf79e32498269
-DIST lilypond-2.24.0.tar.gz 19430807 BLAKE2B 2915d44e0e61a5756f515d31d11d29c657d763b7d7d84701ba67cb67c8e84faad74b8743a9703c4fe64ea4ef5f7c4ff76ed9675d62bd670aa6ea81b15385d348 SHA512 fc00736ae899519408781a7f1bf83065e493a857073d6f56cdadabc5817d4f41092dad12bfe210ec8a866f454b70f87ede6c7f1ba7aedc901134913b22c1431b
 DIST lilypond-2.24.3.tar.gz 19441299 BLAKE2B 6be6ca1f090869a8d545befe3d1f54122514e7dcf9aff1bcc2d78819820da8cef908c5033039eb231b48ae914c1ebd6d766566862a40721580747f017f1445ad SHA512 5153f6cbe5e68e4b3dfcc03a8299ef6b82fbfb487eb3e4f9d631b9dc5a07a972168c3f141d6d50eac936f5c7aeeacd19837c0c9ab70f11dfd5c7efe085d5b56e
-EBUILD lilypond-2.22.0-r1.ebuild 3271 BLAKE2B a502a9b6a8094bc8e46a00505233066e384b5af73c81b4b970adfdc94acece9e14351926dcfd199c8dd5388719e7ccf2bbad46b936c714418ed68d89b49a608b SHA512 bb415702a34ab43258745bad83f9e1b11616aa03218886043a151114e3379bb3b5b59fe91e88cb99dfd627d64b2f6e1659f9778a497a3fe4d000aa549ad42afb
-EBUILD lilypond-2.22.1-r1.ebuild 3302 BLAKE2B fc29a053a6dffb0eda5fc7e75dec3ba522fcbbc0ce28ce0eae7024712016bc2678c1c31eec84203ceb9c110c1d17ca12926c92c6ae367a04a146f2d9cf827cb7 SHA512 bac4ab7ffc2bf2af0a7012fb952684726d4a6e0cf5a67a50b0ff79ef5f5b7af6205e3dd18dc7f80d91bcc4eef9b1c78dd61d26ae61957abc5c63dfedfa7b4c02
-EBUILD lilypond-2.23.0-r1.ebuild 3181 BLAKE2B becaf30b3d2c29bd705950e3a234ea498a9741ecdd8ed7df372b2e7c9b40092e05c5d51e0d7b9c9108edc918fe06b46fa9fa30035b7f88e95118f65d31e6cdc0 SHA512 3f02ecc3c77f64be2dd14d69e833d74b4511a7b7b7e26b54946db432b4567b016f955e734515978f7c909ce81fa981a5440c91d3b05277ad107746162e0e0cf6
-EBUILD lilypond-2.23.2-r1.ebuild 3196 BLAKE2B 4e2cb0faf2ecaf6868cf7f34ed3b1ef2f47c4f74524281d557c37a7735f9eb13eca7af512e118807505fabd08f747083a7d1fdc564f52334d16331838283f3db SHA512 f10e945a238d43c2abf6b19173db28be1b3d56d01a9fa07e33ed6cc8e82dd29d158fae90194fa3798e3a3e7f2cd48a3137ed8beb035a88353540a1353bf6c55d
-EBUILD lilypond-2.24.0.ebuild 2980 BLAKE2B 6caa96ba2d6f314db5c1ec863c4b09a2272658a0d0ea4c1027fb3b868c366245056aca1328044c43ba04623463027ce9d3a71bbbc17508535bfcf5fcb12b5c73 SHA512 11da7146cbced82eb60c37971ad62e56465570e2d7b04ee5043b6402e2a1754a1a5319dd584bdfbc8fc92146d4a0cba67e34ab540a9982ee08fb7ffaf504899c
-EBUILD lilypond-2.24.3.ebuild 3249 BLAKE2B 1e001b53539ce4ee82b4fbf9c8932efff201fc4be5d543bfa12397b725a7fd7ef9be4d8eea2e0f58960e125f923f8b53395c05dd7fb6190b6d65e26a1769b242 SHA512 c0f13a028f164e5d5104295ebe54af414a1fc1c5cd6e75c8d165a6ddb73b8d7b612f654f2162092fdee5ae1c6a649f9b3618556ae25885ac1ec387c4f48c40e4
-EBUILD lilypond-9999.ebuild 3252 BLAKE2B 67f70a6df5dcab8ebe78464304177b9d38d0d929fa2765808d0b051eb35c66eb96a7af3a1c821a17bbd5ef3bc02647e2f98429f4c5761cd5d518d14c1669b319 SHA512 9fee2ed5c7d29859aa1e7c3e788316a042bf19096a914a2e8f2d1b8cbf814834fe46af5819cddcdbc85367f380b0ed5e2b60eb7636badd3672b60976e0364435
-MISC metadata.xml 527 BLAKE2B b110a46a24ff9f9f8b93e28a17c40ff7d0674e9162e7804b476e9568fc4ddd1afd9c7386a129e9b2c3adf2010221e463cf0a32c720edda7fa31feb8ce806f5d0 SHA512 1f5cb81806c3155895a5a3a2b773c3ebbbfb35d7cafdb37b96961a46f6db11762a25444a868af975183b386bcc8dd8bf665e082a65d1c8423b224ea3185b31cd
+EBUILD lilypond-2.24.3.ebuild 3249 BLAKE2B 85e46059a325bc75259783bf6692e0827fb58ddbbdf5c6380af3ac8924a1f45f24fe697801cd9360f825704868074a26a105ff38e0d8d48de80182893d0abcba SHA512 74add15014a58d2a18a304305a72fdc953f7bec96ee12befc0c48a39a854c1dc94bcead79df71c53a9fc4d00b3cf7e57d0138185e53627cd494252c5b89de36b
+EBUILD lilypond-9999.ebuild 3252 BLAKE2B 359c9bed63e669fb71cb6f20c70cd61435b846e9f329577d16a9ecaf75a0439ce34be515a8c60d99840e7e151ce1c5ae8f9cf5815f4b6d66394bef59ffdfe3c6 SHA512 de7e5270a7d614fbd1d39fe30a6a26bc44e31b31e37851f12835ad520052262b298a5469e69f2ce7b4ecb8faef5234c24174404beea3951ca077a781df987c03
+MISC metadata.xml 443 BLAKE2B a90a4f1d4685d5ca26c5948f10a2a84fc28abf22c89adcc477fab0bb465d2f257007bb22a74c0ebad4e5f2941e43063ff39fe8ae0a9e246f194aef318b7f5668 SHA512 24d3c93b4cceaa00138977e8e6137c1649baee08e96c9cd617b4ed489dfd093219dcb80419ba41c2ee84ad5989528c76c1e5b1203ef0d215e77b441c1d72db7a
diff --git a/media-sound/lilypond/lilypond-2.22.0-r1.ebuild b/media-sound/lilypond/lilypond-2.22.0-r1.ebuild
deleted file mode 100644
index dc2e3093c83e..000000000000
--- a/media-sound/lilypond/lilypond-2.22.0-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
-else
-	MAIN_VER=$(ver_cut 1-2)
-	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa x86"
-fi
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-SLOT="0"
-LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh"
-IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}"
-unset LANG_USE
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-texlive/texlive-metapost
-	sys-apps/texinfo
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-"
-RDEPEND="app-text/ghostscript-gpl
-	dev-scheme/guile:12=[deprecated,regex]
-	media-fonts/tex-gyre
-	media-libs/fontconfig
-	media-libs/freetype:2
-	x11-libs/pango
-	emacs? ( >=app-editors/emacs-23.1:* )
-	guile2? ( >=dev-scheme/guile-2.2:12 )
-	!guile2? (
-		dev-scheme/guile:12=[deprecated,regex]
-		<dev-scheme/guile-2.0:12
-	)
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/t1utils
-	dev-lang/perl
-	dev-libs/kpathsea
-	media-gfx/fontforge[png,python]
-	sys-devel/gettext
-	doc? (
-		dev-texlive/texlive-langcyrillic
-		l10n_cs? ( dev-texlive/texlive-xetex )
-		l10n_ja? ( dev-texlive/texlive-langjapanese )
-		l10n_zh? ( dev-texlive/texlive-langchinese )
-	)
-"
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
-)
-
-DOCS=( DEDICATION HACKING README.md ROADMAP )
-
-src_prepare() {
-	default
-
-	if ! use vim-syntax ; then
-		sed -i 's/vim//' GNUmakefile.in || die
-	fi
-
-	# respect CFLAGS
-	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
-
-	# remove bundled texinfo file (fixes bug #448560)
-	rm tex/texinfo.tex || die
-
-	eautoreconf
-
-	xdg_environment_reset #586592
-}
-
-src_configure() {
-	# fix hardcoded `ar`
-	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
-
-	local myeconfargs=(
-		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--disable-optimising
-		--disable-pipe
-		$(use_enable debug debugging)
-		$(use_enable doc documentation)
-		$(use_enable profile profiling)
-	)
-
-	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
-
-	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
-}
-
-src_compile() {
-	default
-
-	use doc && emake LANGS="${L10N}" doc info
-
-	if use emacs ; then
-		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
-			|| die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
-
-	use doc && emake DESTDIR="${D}" install-doc
-
-	# remove elisp files since they are in the wrong directory
-	rm -r "${ED}"/usr/share/emacs || die
-
-	if use emacs ; then
-		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-	fi
-
-	python_fix_shebang "${ED}"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/media-sound/lilypond/lilypond-2.22.1-r1.ebuild b/media-sound/lilypond/lilypond-2.22.1-r1.ebuild
deleted file mode 100644
index a7c1bdfd17b5..000000000000
--- a/media-sound/lilypond/lilypond-2.22.1-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
-else
-	MAIN_VER=$(ver_cut 1-2)
-	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-fi
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-SLOT="0"
-LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh"
-IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}"
-unset LANG_USE
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-texlive/texlive-metapost
-	sys-apps/texinfo
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-"
-RDEPEND="app-text/ghostscript-gpl
-	dev-scheme/guile:12=[deprecated,regex]
-	media-fonts/tex-gyre
-	media-libs/fontconfig
-	media-libs/freetype:2
-	x11-libs/pango
-	emacs? ( >=app-editors/emacs-23.1:* )
-	guile2? ( >=dev-scheme/guile-2.2:12 )
-	!guile2? (
-		dev-scheme/guile:12=[deprecated,regex]
-		<dev-scheme/guile-2.0:12
-	)
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/t1utils
-	dev-lang/perl
-	dev-libs/kpathsea
-	media-gfx/fontforge[png,python]
-	sys-devel/gettext
-	doc? (
-		dev-texlive/texlive-langcyrillic
-		l10n_cs? ( dev-texlive/texlive-xetex )
-		l10n_ja? ( dev-texlive/texlive-langjapanese )
-		l10n_zh? ( dev-texlive/texlive-langchinese )
-	)
-"
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-font-size.patch
-	"${FILESDIR}"/${P}-free_font.patch
-)
-
-DOCS=( DEDICATION HACKING README.md ROADMAP )
-
-src_prepare() {
-	default
-
-	if ! use vim-syntax ; then
-		sed -i 's/vim//' GNUmakefile.in || die
-	fi
-
-	# respect CFLAGS
-	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
-
-	# remove bundled texinfo file (fixes bug #448560)
-	rm tex/texinfo.tex || die
-
-	eautoreconf
-
-	xdg_environment_reset #586592
-}
-
-src_configure() {
-	# fix hardcoded `ar`
-	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
-
-	local myeconfargs=(
-		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--disable-optimising
-		--disable-pipe
-		$(use_enable debug debugging)
-		$(use_enable doc documentation)
-		$(use_enable profile profiling)
-	)
-
-	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
-
-	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
-}
-
-src_compile() {
-	default
-
-	use doc && emake LANGS="${L10N}" doc info
-
-	if use emacs ; then
-		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
-			|| die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
-
-	use doc && emake DESTDIR="${D}" install-doc
-
-	# remove elisp files since they are in the wrong directory
-	rm -r "${ED}"/usr/share/emacs || die
-
-	if use emacs ; then
-		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-	fi
-
-	python_fix_shebang "${ED}"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/media-sound/lilypond/lilypond-2.23.0-r1.ebuild b/media-sound/lilypond/lilypond-2.23.0-r1.ebuild
deleted file mode 100644
index 1ca508cfa3a1..000000000000
--- a/media-sound/lilypond/lilypond-2.23.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
-else
-	MAIN_VER=$(ver_cut 1-2)
-	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-fi
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-SLOT="0"
-LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh"
-IUSE="debug doc emacs profile vim-syntax ${LANG_USE}"
-unset LANG_USE
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-texlive/texlive-metapost
-	sys-apps/texinfo
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-"
-RDEPEND="app-text/ghostscript-gpl
-	dev-scheme/guile:12=[deprecated,regex]
-	media-fonts/tex-gyre
-	media-libs/fontconfig
-	media-libs/freetype:2
-	x11-libs/pango
-	emacs? ( >=app-editors/emacs-23.1:* )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/t1utils
-	dev-lang/perl
-	dev-libs/kpathsea
-	media-gfx/fontforge[png,python]
-	sys-devel/gettext
-	doc? (
-		dev-texlive/texlive-langcyrillic
-		l10n_cs? ( dev-texlive/texlive-xetex )
-		l10n_ja? ( dev-texlive/texlive-langjapanese )
-		l10n_zh? ( dev-texlive/texlive-langchinese )
-	)
-"
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-font-size.patch
-	"${FILESDIR}"/${PN}-2.22.1-free_font.patch
-)
-
-DOCS=( DEDICATION HACKING README.md ROADMAP )
-
-src_prepare() {
-	default
-
-	if ! use vim-syntax ; then
-		sed -i 's/vim//' GNUmakefile.in || die
-	fi
-
-	# respect CFLAGS
-	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
-
-	# remove bundled texinfo file (fixes bug #448560)
-	rm tex/texinfo.tex || die
-
-	eautoreconf
-
-	xdg_environment_reset #586592
-}
-
-src_configure() {
-	# fix hardcoded `ar`
-	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
-
-	local myeconfargs=(
-		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--disable-optimising
-		--disable-pipe
-		$(use_enable debug debugging)
-		$(use_enable doc documentation)
-		$(use_enable profile profiling)
-	)
-
-	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
-
-	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
-}
-
-src_compile() {
-	default
-
-	use doc && emake LANGS="${L10N}" doc info
-
-	if use emacs ; then
-		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
-			|| die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
-
-	use doc && emake DESTDIR="${D}" install-doc
-
-	# remove elisp files since they are in the wrong directory
-	rm -r "${ED}"/usr/share/emacs || die
-
-	if use emacs ; then
-		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-	fi
-
-	python_fix_shebang "${ED}"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/media-sound/lilypond/lilypond-2.23.2-r1.ebuild b/media-sound/lilypond/lilypond-2.23.2-r1.ebuild
deleted file mode 100644
index 82909b60dbe2..000000000000
--- a/media-sound/lilypond/lilypond-2.23.2-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
-else
-	MAIN_VER=$(ver_cut 1-2)
-	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86"
-fi
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-SLOT="0"
-LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh"
-IUSE="debug doc emacs profile vim-syntax ${LANG_USE}"
-unset LANG_USE
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-texlive/texlive-metapost
-	sys-apps/texinfo
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-"
-RDEPEND="app-text/ghostscript-gpl
-	dev-scheme/guile:12=[deprecated,regex]
-	media-fonts/tex-gyre
-	media-libs/fontconfig
-	media-libs/freetype:2
-	x11-libs/pango
-	emacs? ( >=app-editors/emacs-23.1:* )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/t1utils
-	dev-lang/perl
-	dev-libs/kpathsea
-	media-gfx/fontforge[png,python]
-	sys-devel/gettext
-	doc? (
-		dev-texlive/texlive-langcyrillic
-		l10n_cs? ( dev-texlive/texlive-xetex )
-		l10n_ja? ( dev-texlive/texlive-langjapanese )
-		l10n_zh? ( dev-texlive/texlive-langchinese )
-	)
-"
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch
-	"${FILESDIR}"/${PN}-2.22.1-free_font.patch
-)
-
-DOCS=( DEDICATION HACKING README.md ROADMAP )
-
-src_prepare() {
-	default
-
-	if ! use vim-syntax ; then
-		sed -i 's/vim//' GNUmakefile.in || die
-	fi
-
-	# respect CFLAGS
-	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
-
-	# remove bundled texinfo file (fixes bug #448560)
-	rm tex/texinfo.tex || die
-
-	eautoreconf
-
-	xdg_environment_reset #586592
-}
-
-src_configure() {
-	# fix hardcoded `ar`
-	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
-
-	local myeconfargs=(
-		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--disable-optimising
-		--disable-pipe
-		$(use_enable debug debugging)
-		$(use_enable doc documentation)
-		$(use_enable profile profiling)
-	)
-
-	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
-
-	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
-}
-
-src_compile() {
-	default
-
-	use doc && emake LANGS="${L10N}" doc info
-
-	if use emacs ; then
-		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
-			|| die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
-
-	use doc && emake DESTDIR="${D}" install-doc
-
-	# remove elisp files since they are in the wrong directory
-	rm -r "${ED}"/usr/share/emacs || die
-
-	if use emacs ; then
-		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-	fi
-
-	python_fix_shebang "${ED}"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/media-sound/lilypond/lilypond-2.24.0.ebuild b/media-sound/lilypond/lilypond-2.24.0.ebuild
deleted file mode 100644
index e7321aa8924b..000000000000
--- a/media-sound/lilypond/lilypond-2.24.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
-else
-	MAIN_VER=$(ver_cut 1-2)
-	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv x86"
-fi
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-SLOT="0"
-LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh"
-IUSE="debug doc emacs profile ${LANG_USE}"
-unset LANG_USE
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-texlive/texlive-metapost
-	sys-apps/texinfo
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-"
-RDEPEND="app-text/ghostscript-gpl
-	>=dev-scheme/guile-2.2:12=[deprecated,regex]
-	media-fonts/tex-gyre
-	media-libs/fontconfig
-	media-libs/freetype:2
-	x11-libs/pango
-	emacs? ( >=app-editors/emacs-23.1:* )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/t1utils
-	dev-lang/perl
-	dev-libs/kpathsea
-	media-gfx/fontforge[png,python]
-	sys-devel/gettext
-	doc? (
-		dev-texlive/texlive-langcyrillic
-		l10n_cs? ( dev-texlive/texlive-xetex )
-		l10n_ja? ( dev-texlive/texlive-langjapanese )
-		l10n_zh? ( dev-texlive/texlive-langchinese )
-	)
-"
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch
-	"${FILESDIR}"/${PN}-2.22.1-free_font.patch
-)
-
-DOCS=( DEDICATION README.md ROADMAP )
-
-src_prepare() {
-	default
-
-	# respect CFLAGS
-	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
-
-	eautoreconf
-
-	xdg_environment_reset #586592
-}
-
-src_configure() {
-	# fix hardcoded `ar`
-	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
-
-	local myeconfargs=(
-		--disable-optimising
-		--disable-pipe
-		$(use_enable debug debugging)
-		$(use_enable doc documentation)
-		$(use_enable profile profiling)
-	)
-
-	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
-
-	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
-}
-
-src_compile() {
-	default
-
-	use doc && emake LANGS="${L10N}" doc info
-
-	if use emacs ; then
-		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
-			|| die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
-
-	use doc && emake DESTDIR="${D}" install-doc
-
-	# remove elisp files since they are in the wrong directory
-	rm -r "${ED}"/usr/share/emacs || die
-
-	if use emacs ; then
-		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-	fi
-
-	python_fix_shebang "${ED}"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/media-sound/lilypond/lilypond-2.24.3.ebuild b/media-sound/lilypond/lilypond-2.24.3.ebuild
index 8acc71dc798d..4e54c94b78ae 100644
--- a/media-sound/lilypond/lilypond-2.24.3.ebuild
+++ b/media-sound/lilypond/lilypond-2.24.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..13} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index fb0d6447256b..21f014259fe7 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..13} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
diff --git a/media-sound/lilypond/metadata.xml b/media-sound/lilypond/metadata.xml
index ecc01c28acaf..9e6f97fb7f7f 100644
--- a/media-sound/lilypond/metadata.xml
+++ b/media-sound/lilypond/metadata.xml
@@ -8,7 +8,4 @@
 	<longdescription lang="en">
 LilyPond is an automated engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files.
 	</longdescription>
-	<use>
-		<flag name="guile2">Enable experimental support for Guile 2</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index a2d055f0d9f5..64318b5b9858 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,8 +1,4 @@
-DIST qsynth-0.9.13.tar.gz 333132 BLAKE2B 2d0a388e59f244052b1c3f7e16bda40b3de314d2e8b9316b6f471dcc4869299b56f6234c5cecae2a8105c366d601a28cdb0d5c5ebb0bb9e7eee352d62b5af3d0 SHA512 8249438429191a2beb381af9f6fc6bc0d88711c2590379bfa10c558464c562f28453dacec8edbe1afdc590ee437530cefac211b272553cf8acc266706894f17c
-DIST qsynth-0.9.90.tar.gz 333577 BLAKE2B 33a9f799423a0c93674ed57f2920f810edaada3ef65ec40594ed29654e6de9550b626b4fe17a2d75dc79fa74f8326ad7d7cd197d4c8d2b2b72ebae0ba10586cd SHA512 f84df48a8bb7d9de56c8380e2fdac3381da78b90e472fb344d84cae552541c0021830b83faf848f48ff23989a51db33fbbab1cfb315ed847950df9e408fd27cf
 DIST qsynth-0.9.91.tar.gz 334833 BLAKE2B 057ebf72aab4ea811046fede9df42ef7ccb7b98018544397e67212d694d7d798761340114a6609c230062791c81050f11c77348674008e09b1c1f9a28ea27f47 SHA512 0749195078e223ae7e42f2fc7d7f435bc174290f9d018ed01ec27088599f5e1e39739b20aa1233368e45336fb6ff74c9f634942e34543a7405f02749dc76446b
-EBUILD qsynth-0.9.13.ebuild 1446 BLAKE2B ac188db2357400e302959fae3e13def93ecc2ed37364233f5120369b2d0391dd36127a21d05f7bf06d443141e65b155f86681acc4d4563e1252486dda581ed68 SHA512 c871fd5c08a346bc9e6292442db4622401fa8dbf4bbea76eee9eb997179715d1b711de3ddba6323362c95a82621800c88191dd1c5e8c53778944cd020323dbf5
-EBUILD qsynth-0.9.90.ebuild 1447 BLAKE2B 1573d0ea8119d67a15b97e63d7a4af231420b32112e4fc13ef8b7ad58a610f3ac77cf7a3a04e51180d1f4dea92465a2d0fae418f0b9aac5481fbb244e6450f67 SHA512 e8e683c3a76dcf42dec7951ffbb7d19689ec43f5861e75e4a997604863c6489bc7409207653887ef513d9bb2b5fcd2b8b0f0b588ed3a2ec95be9be944adc7c0f
-EBUILD qsynth-0.9.91.ebuild 1447 BLAKE2B 1573d0ea8119d67a15b97e63d7a4af231420b32112e4fc13ef8b7ad58a610f3ac77cf7a3a04e51180d1f4dea92465a2d0fae418f0b9aac5481fbb244e6450f67 SHA512 e8e683c3a76dcf42dec7951ffbb7d19689ec43f5861e75e4a997604863c6489bc7409207653887ef513d9bb2b5fcd2b8b0f0b588ed3a2ec95be9be944adc7c0f
+EBUILD qsynth-0.9.91.ebuild 1446 BLAKE2B ac188db2357400e302959fae3e13def93ecc2ed37364233f5120369b2d0391dd36127a21d05f7bf06d443141e65b155f86681acc4d4563e1252486dda581ed68 SHA512 c871fd5c08a346bc9e6292442db4622401fa8dbf4bbea76eee9eb997179715d1b711de3ddba6323362c95a82621800c88191dd1c5e8c53778944cd020323dbf5
 EBUILD qsynth-9999.ebuild 1450 BLAKE2B 89489add82e60db13848dd37e80966790ab9c697ae293b74a3c73bb84cf35e53c045e5cb3f1b56a8cd58993d7d12b5a1aa282561a4e773921f5c24fd7dc03086 SHA512 76a7e85715aa5df34219ee005e802cab0459a044653a63a1c70863d296c0e07389d02c6cf6e24b73649c2524eb5f1fb3ea5ccb148d9c98b74691706197a1aec1
 MISC metadata.xml 763 BLAKE2B 871d9e5edd0dcd434d496c2d40f997717d424502a5d7072264886477eaaf4bf460e32746bc899a124d97f5cadf116c0cdd198d017ebd4e9cbd769ba2af8a8512 SHA512 147e494f3b468283759a06d361d286e211e95cabbfc6daef67c406e5f19a9eb04ec611f41273ddb0c712dd1fd9afa3a71922bd9cfe749c388ab61d550dc86def
diff --git a/media-sound/qsynth/qsynth-0.9.13.ebuild b/media-sound/qsynth/qsynth-0.9.13.ebuild
deleted file mode 100644
index e030f127d687..000000000000
--- a/media-sound/qsynth/qsynth-0.9.13.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-DESCRIPTION="Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
-	inherit git-r3
-else
-	SRC_URI="https://downloads.sourceforge.net/qsynth/${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio qt6"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-BDEPEND="
-	qt6? ( dev-qt/qttools:6[linguist] )
-	!qt6? ( dev-qt/linguist-tools:5 )
-"
-DEPEND="
-	qt6? (
-		dev-qt/qtbase:6[gui,network,widgets]
-		dev-qt/qtsvg:6
-	)
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_QT6=$(usex qt6 1 0)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${D}/usr/share/applications/org.rncbc.qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth org.rncbc.qsynth
-}
diff --git a/media-sound/qsynth/qsynth-0.9.90.ebuild b/media-sound/qsynth/qsynth-0.9.90.ebuild
deleted file mode 100644
index d43d29694748..000000000000
--- a/media-sound/qsynth/qsynth-0.9.90.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-DESCRIPTION="Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
-	inherit git-r3
-else
-	SRC_URI="https://downloads.sourceforge.net/qsynth/${P}.tar.gz"
-	KEYWORDS="amd64 ppc ~ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio qt6"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-BDEPEND="
-	qt6? ( dev-qt/qttools:6[linguist] )
-	!qt6? ( dev-qt/linguist-tools:5 )
-"
-DEPEND="
-	qt6? (
-		dev-qt/qtbase:6[gui,network,widgets]
-		dev-qt/qtsvg:6
-	)
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_QT6=$(usex qt6 1 0)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${D}/usr/share/applications/org.rncbc.qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth org.rncbc.qsynth
-}
diff --git a/media-sound/qsynth/qsynth-0.9.91.ebuild b/media-sound/qsynth/qsynth-0.9.91.ebuild
index d43d29694748..e030f127d687 100644
--- a/media-sound/qsynth/qsynth-0.9.91.ebuild
+++ b/media-sound/qsynth/qsynth-0.9.91.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://downloads.sourceforge.net/qsynth/${P}.tar.gz"
-	KEYWORDS="amd64 ppc ~ppc64 x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/streamripper/Manifest b/media-sound/streamripper/Manifest
index 5f53c5d0efd7..f282b6b46a55 100644
--- a/media-sound/streamripper/Manifest
+++ b/media-sound/streamripper/Manifest
@@ -1,6 +1,6 @@
 AUX streamripper-1.64.6-fix-autotools.patch 260 BLAKE2B b216a7a62c3c1ec53e98b85f47c7e3b07746dbb3483de7de0b1f9face420395abc10f1205624e92eede1247e4c75785b3797a6ec373ada26f876d6a8cb45acbb SHA512 49714d3ea1db143771a2ebcfd3ddd08a60e6eb63fd1e2a0b676b2d0c359b25ebd9dd40510c0137e24ef7c44c718cc83843535fae00325a098f4f1542e18e6f67
 AUX streamripper-1.64.6-fix-c99.patch 1123 BLAKE2B 3e9c0e358cdccf7df935e1247a32a1b834ce0494bd210aec20000511085667634656ed9a8b21b3731c963aa7de5805b90ca569e2c4ff67ce1c95c1b47dbdc7d1 SHA512 6569b16e8656e24a2d424fd5a5c013e5dabfae5bf8a9f8025cae9062172a4dd317ce192623c8043a8a9faa3fc6a2853831012717496634049b99f9ff7f7bcc6d
 DIST streamripper-1.64.6.tar.gz 900205 BLAKE2B b316565c786b2005802b24cb441d6ee73c2548a4ac7515633fd92faba143a4708bc49c9de7c3eb9985de14a43ac1f86935ac2c353e3d14a7cbf28e334fa21338 SHA512 8477086d0099f6de861f1c47112476c427073b6e8127bbaaa2dd3e7930fe9a5c6d9b2c68d4a317f1bc0b20c625e665d5c245189049d35468aa83cf51828d4428
-EBUILD streamripper-1.64.6-r1.ebuild 915 BLAKE2B 659e7d1843e74abb543ea3b763141bafc8d6fe37fc3f85a0b9e1e8af6a30325cdc90c961cce09d8fdd0b1cc39c549185b4bc5459c916152ff67d2c7f67940a11 SHA512 6c54cd180d6aa918ec49f85822aac419a68e12a9911838934d569e54592db1b9d7362097cd67c031714c16e5923cf0c77b81c4d991170b8b799311d6787e9883
+EBUILD streamripper-1.64.6-r1.ebuild 911 BLAKE2B ff847ef7c8f6c6bbdd9ea84e61d11f1b48f85a0dd2b52e8e13655a593d8fede2c44a7b8bd4701b5c6573f73ecf65f74dcad95b7a942cc944817eb2145a6cf94e SHA512 8decdbc9eacaf79723d2a7dd14edd20bb1e723de8f8de071ed4db9b42a878adc3e4474d842dfb38da9e8acfe1dc70a65233f27fe7874b9981b3a0ef140ed8bd8
 EBUILD streamripper-1.64.6.ebuild 875 BLAKE2B 9681460e4d97fab1cb862b1cc73735083f9f883d3c99816dbf16ef5595541658658fd02d4c1f5be69957c843ea21660b768910dc7a589d7fa77be3e5b2776cb2 SHA512 ef511d36b8d52fb0afbb8e53b7ebb64160b6512a839160bd74bfb3a5fb33377e462c24c519c125a669ad60f37e17265cae7adb055a89098f2b5c9c05f031a8cc
 MISC metadata.xml 346 BLAKE2B 676b46ee59507f6893d33744c01d5864fa50923718eb8907db92b05b2ee9449ddd2514c378d8dbe715a82e26633c7d370a62fc0414a4c2924c5a6cf950701167 SHA512 71db384aebbce86d8f5c01eeacd3064aa31678026e0d54a57e9eaf0080c0ac450d54fe4f9fc036b7225147b7483def87cd2e29b7dedb921696a59116fc4cce4d
diff --git a/media-sound/streamripper/streamripper-1.64.6-r1.ebuild b/media-sound/streamripper/streamripper-1.64.6-r1.ebuild
index 1efacf79082f..bcca9437797a 100644
--- a/media-sound/streamripper/streamripper-1.64.6-r1.ebuild
+++ b/media-sound/streamripper/streamripper-1.64.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="vorbis"
 
 RDEPEND="